Age | Commit message (Collapse) | Author |
|
* qatar/master:
apedec: check bits <= 32.
cavs: Remove unused code.
oggenc: fix condition when not to flush due to keyframe granule.
oggenc: add pagesize option to set preferred page size
libspeexdec: set frame size in libspeex_decode_init()
smacker audio: sign-extend the initial 16-bit predicted value
Conflicts:
libavcodec/apedec.c
libavcodec/libspeexdec.c
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
The square is always passed as 1 whenever the function is called and
thus the if block never gets executed.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
|
|
This ensures that they dont contain invalid values.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* qatar/master: (27 commits)
ppc: Add ff_ prefix to nonstatic symbols
sh4: Add ff_ prefix to nonstatic symbols
mpegvideo: Add ff_ prefix to nonstatic functions
rtjpeg: Add ff_ prefix to nonstatic symbols
rv: Add ff_ prefix to nonstatic symbols
vp56: Add ff_ prefix to nonstatic symbols
vorbis: Add ff_ prefix to nonstatic symbols
msmpeg4: Add ff_ prefix to nonstatic symbols
vc1: Add ff_ prefix to nonstatic symbols
msmpeg4: Add ff_ prefixes to nonstatic symbols
snow: Add ff_ prefix to nonstatic symbols
mpeg12: Add ff_ prefix to nonstatic symbols
mpeg4: Add ff_ prefixes to nonstatic symbols
lagarith: Add ff_ prefix to lag_rac_init
libavcodec: Add ff_ prefix to j_rev_dct*
dsputil: Add ff_ prefix to inv_zigzag_direct16
libavcodec: Prefix fdct_ifast, fdct_ifast248
dsputil: Add ff_ prefix to the dsputil*_init* functions
libavcodec: Add ff_ prefix to some nonstatic symbols
vlc/rl: Add ff_ prefix to the nonstatic symbols
...
Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/dnxhddec.c
libavcodec/ffv1.c
libavcodec/h263.h
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/nuv.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/proresdsp.c
libavcodec/svq3.c
libavcodec/version.h
libavformat/dv.h
libavformat/dvenc.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Martin Storsjö <martin@martin.st>
|
|
* qatar/master: (29 commits)
cabac: Move code only used within the CABAC test program into the test program.
vp56: Drop unnecessary cabac.h #include.
h264-test: Initialize AVCodecContext.av_class.
build: Skip compiling network.h and rtsp.h if networking is not enabled.
cosmetics: drop some pointless parentheses
Disable annoying warning without changing behavior
faq: Solutions for common problems with sample paths when running FATE.
avcodec: attempt to clarify the CODEC_CAP_DELAY documentation
avcodec: fix avcodec_encode_audio() documentation.
FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside.
vqf: recognize more metadata chunks
FATE test: BMV demuxer and associated video and audio decoders.
FATE: indeo4 video decoder test.
FATE: update xxan-wc4 test to a sample with more code coverage.
Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream.
g722enc: validate AVCodecContext.trellis
g722enc: set frame_size, and also handle an odd number of input samples
g722enc: split encoding into separate functions for trellis vs. no trellis
mpegaudiodec: Use clearer pointer math
tta: Fix returned error code at EOF
...
Conflicts:
libavcodec/h264.c
libavcodec/indeo3.c
libavcodec/interplayvideo.c
libavcodec/ivi_common.c
libavcodec/libxvidff.c
libavcodec/mpegvideo.c
libavcodec/ppc/mpegvideo_altivec.c
libavcodec/tta.c
libavcodec/utils.c
libavfilter/vsrc_buffer.c
libavformat/Makefile
tests/fate/indeo.mak
tests/ref/acodec/g722
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
* 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: Mans Rullgard <mans@mansr.com>
|
|
(cherry picked from commit 2e279598793133ee9c57fd0026d672f076fde4bf)
|
|
|
|
Originally committed as revision 24685 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
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
|
|
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21835 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17138 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17137 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16681 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16642 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16641 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 10023 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9834 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9792 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9533 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
make commonly used tables global
Originally committed as revision 9532 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
make commonly used functions global
Originally committed as revision 9519 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9518 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
are for decoding
Originally committed as revision 9517 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
is now in its own inline function
Originally committed as revision 9516 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
in inter macroblocks is now in its own inline
function
Originally committed as revision 9515 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
its own inline function
Originally committed as revision 9514 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
own inline function
Originally committed as revision 9513 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9512 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9511 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9510 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 8945 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 8944 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 8921 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 8904 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 8903 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 6994 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
This should help building parser without decoder
Originally committed as revision 6993 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 6992 to svn://svn.ffmpeg.org/ffmpeg/trunk
|