Age | Commit message (Collapse) | Author |
|
* qatar/master:
doc/general: update supported devices table.
doc/general: add missing @tab to codecs table.
h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
avconv: reindent
avconv: link '-passlogfile' option to libx264 'stats' AVOption.
libx264: add 'stats' private option for setting 2pass stats filename.
libx264: fix help text for slice-max-size option.
http: Clear the auth state on redirects
http: Retry auth if it failed due to being stale
rtsp: Resend new keepalive commands if they used stale auth
rtsp: Retry authentication if failed due to being stale
httpauth: Parse the stale field in digest auth
dxva2_vc1: pass the overlap flag to the decoder
dxva2_vc1: fix decoding of BI frames
FATE: add shorthand to wavpack test
dfa: convert to bytestream2 API
anm decoder: move buffer allocation from decode_init() to decode_frame()
h264: improve parsing of broken AVC SPS
Conflicts:
ffmpeg.c
libavcodec/anm.c
libavcodec/dfa.c
libavcodec/h264.c
libavcodec/h264_direct.c
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
prediction.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
|
|
* qatar/master: (29 commits)
amrwb: remove duplicate arguments from extrapolate_isf().
amrwb: error out early if mode is invalid.
h264: change underread for 10bit QPEL to overread.
matroska: check buffer size for RM-style byte reordering.
vp8: disable mmx functions with sse/sse2 counterparts on x86-64.
vp8: change int stride to ptrdiff_t stride.
wma: fix invalid buffer size assumptions causing random overreads.
Windows Media Audio Lossless decoder
rv10/20: Fix slice overflow with checked bitstream reader.
h263dec: Disallow width/height changing with frame threads.
rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size.
rmdec: Honor .RMF tag size rather than assuming 18.
g722: Fix the QMF scaling
r3d: don't set codec timebase.
electronicarts: set timebase for tgv video.
electronicarts: parse the framerate for cmv video.
ogg: don't set codec timebase
electronicarts: don't set codec timebase
avs: don't set codec timebase
wavpack: Fix an integer overflow
...
Conflicts:
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/fraps.c
libavcodec/h264.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/msmpeg4.c
libavcodec/pnmdec.c
libavcodec/qpeg.c
libavcodec/rawenc.c
libavcodec/ulti.c
libavcodec/vcr1.c
libavcodec/version.h
libavcodec/wmalosslessdec.c
libavformat/electronicarts.c
libswscale/ppc/yuv2rgb_altivec.c
tests/ref/acodec/g722
tests/ref/fate/ea-cmv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
|
|
prediction.
Fixes Ticket312
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* qatar/master:
w32threads: support for frame multithreading
avcodec: remove stray @deprecated comment
Conflicts:
libavcodec/utils.c
libavcodec/w32thread.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Replace our incomplete w32threads implementation with x264's pthreads
w32threads wrapper.
Relicensed to LGPL with kind permission by Pegasys Inc.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
|
|
is not mbaff at all
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* qatar/master:
swfdec: Add support for sample_rate_code 0 (5512 Hz)
dct-test: factor out some common code and do whas was likely intended
doc: library versions need to be bumped in version.h
Revert "ffmpeg: get rid of useless AVInputStream.nb_streams."
Remove some forgotten AVCodecContext.palctrl usage.
lavc/utils: move avcodec_init() higher in the file.
lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
ac3dec: actually use drc_scale private option
lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros
alsa: add missing header
msmpeg4: remove leftover unused debug variable declaration
Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination.
Fix av_dlog invocations with wrong or missing logging context.
vf_yadif: add support to yuva420p
vf_yadif: correct documentation on the parity parameter
vf_yadif: copy buffer properties like aspect for second frame as well
oma: support for encrypted files
id3v2: add support for non-text and GEOB type tag frames
des: add possibility to calculate DES-CBC-MAC with small buffer
Conflicts:
ffmpeg.c
libavcodec/dct-test.c
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
This fixes build failures with -DDEBUG in CPPFLAGS.
|
|
* qatar/master:
changelog: misc typo and wording fixes
H.264: add filter_mb_fast support for >8-bit decoding
doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
lls: use av_lfg instead of rand() in test program
build: remove unnecessary dependency on libs from 'all' target
H.264: avoid redundant alpha/beta calculations in loopfilter
H.264: optimize intra/inter loopfilter decision
mpegts: fix Continuity Counter error detection
build: remove unnecessary FFLDFLAGS variable
vp8/mt: flush worker thread, not application thread context, on seek.
mt: proper locking around release_buffer calls.
DxVA2: unbreak build after [657ccb5ac75ce34e62bd67f228d9bd36db72189e]
hwaccel: unbreak build
Eliminate FF_COMMON_FRAME macro.
Conflicts:
Changelog
Makefile
doc/developer.texi
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
FF_COMMON_FRAME holds the contents of the AVFrame structure and is also copied
to struct Picture. Replace by an embedded AVFrame structure in struct Picture.
|
|
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
|
|
|
|
Signed-off-by: Diego Biurrun <diego@biurrun.de>
|
|
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
ones based on mb_stride in h264.
about 20 cpu cycles faster overall per MB
Originally committed as revision 22065 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
This eliminates all aliasing violation warnings in h264 code.
No measurable speed difference with gcc-4.4.3 on i7.
Originally committed as revision 21881 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21830 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21829 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21817 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21794 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21791 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21790 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21789 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
is closer at the top.
50-130 cpu cycles faster depending on which kind of direct MBs are meassured.
Originally committed as revision 21788 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
A little faster and needed for future optimizations.
This sadly leads to some code duplication (which i hope i can factor out
again after the optimizations on the direcr mv code are done)
Originally committed as revision 21787 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
a little less than 200 cpu cycles faster with the cathedral sample.
Originally committed as revision 21785 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
and is a bit faster (5-10 cpu cycles depending on what is meassured).
Originally committed as revision 21784 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21694 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
11cylcles slower MV generation
98cycles faster MC
Originally committed as revision 21691 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
as 16x16 (except ones changing interlacing relative to the colocated MB).
20 cycles slower during MV generation
175 cycles faster during MC
Originally committed as revision 21690 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
19 cycles slower MV generation
575 cycles faster MC
Originally committed as revision 21689 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
7 cpu cycles faster.
Originally committed as revision 21685 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21684 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
and simplify cases that cannot happen away.
8 cpu cycles faster
Originally committed as revision 21683 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21681 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21679 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
a bit more than 10 cpu cycles faster.
Originally committed as revision 21678 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21677 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
true partitioning.
Originally committed as revision 21675 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21674 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21669 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21667 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21664 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21663 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21662 to svn://svn.ffmpeg.org/ffmpeg/trunk
|