Permalink
Browse files

FFmpeg resync to FFmpeg release/1.1 at SHA1 7c8beec48ce7fa7380e8aab70…

…0c7d5f2b579a58e
  • Loading branch information...
jyavenard committed Mar 6, 2013
1 parent b239b0b commit a817da2006521f920ac96ce93113823caa7fa2aa
Showing with 594 additions and 376 deletions.
  1. +14 −3 mythtv/configure
  2. +62 −1 mythtv/external/FFmpeg/Changelog
  3. +1 −0 mythtv/external/FFmpeg/README.sync
  4. +1 −1 mythtv/external/FFmpeg/RELEASE
  5. +1 −1 mythtv/external/FFmpeg/VERSION
  6. +14 −3 mythtv/external/FFmpeg/configure
  7. +166 −166 mythtv/external/FFmpeg/doc/APIchanges
  8. +1 −1 mythtv/external/FFmpeg/doc/Doxyfile
  9. +2 −2 mythtv/external/FFmpeg/doc/Makefile
  10. +2 −2 mythtv/external/FFmpeg/doc/developer.texi
  11. +1 −1 mythtv/external/FFmpeg/doc/ffmpeg.texi
  12. +3 −3 mythtv/external/FFmpeg/doc/filters.texi
  13. +4 −2 mythtv/external/FFmpeg/libavcodec/4xm.c
  14. +14 −20 mythtv/external/FFmpeg/libavcodec/Makefile
  15. +6 −0 mythtv/external/FFmpeg/libavcodec/aacdec.c
  16. +7 −9 mythtv/external/FFmpeg/libavcodec/ac3dec.c
  17. +10 −3 mythtv/external/FFmpeg/libavcodec/bink.c
  18. +5 −0 mythtv/external/FFmpeg/libavcodec/flicvideo.c
  19. +17 −9 mythtv/external/FFmpeg/libavcodec/h264.c
  20. +1 −1 mythtv/external/FFmpeg/libavcodec/h264_ps.c
  21. +3 −0 mythtv/external/FFmpeg/libavcodec/lagarithrac.h
  22. +51 −47 mythtv/external/FFmpeg/libavcodec/libopencore-amr.c
  23. +8 −4 mythtv/external/FFmpeg/libavcodec/loco.c
  24. +5 −0 mythtv/external/FFmpeg/libavcodec/mlpdec.c
  25. +1 −1 mythtv/external/FFmpeg/libavcodec/mpegvideo.h
  26. +4 −8 mythtv/external/FFmpeg/libavcodec/pngdec.c
  27. +17 −5 mythtv/external/FFmpeg/libavcodec/pngenc.c
  28. +1 −1 mythtv/external/FFmpeg/libavcodec/qdm2.c
  29. +5 −5 mythtv/external/FFmpeg/libavcodec/qtrle.c
  30. +4 −3 mythtv/external/FFmpeg/libavcodec/roqvideodec.c
  31. +7 −2 mythtv/external/FFmpeg/libavcodec/sanm.c
  32. +1 −0 mythtv/external/FFmpeg/libavcodec/shorten.c
  33. +1 −1 mythtv/external/FFmpeg/libavcodec/targa.c
  34. +15 −5 mythtv/external/FFmpeg/libavcodec/tiff.c
  35. +1 −1 mythtv/external/FFmpeg/libavcodec/utils.c
  36. +16 −5 mythtv/external/FFmpeg/libavcodec/vorbisdec.c
  37. +4 −2 mythtv/external/FFmpeg/libavcodec/vqavideo.c
  38. +8 −0 mythtv/external/FFmpeg/libavcodec/x86/h264_deblock.asm
  39. +8 −1 mythtv/external/FFmpeg/libavfilter/libmpcodecs/mp_image.c
  40. +2 −0 mythtv/external/FFmpeg/libavfilter/libmpcodecs/mp_image.h
  41. +1 −1 mythtv/external/FFmpeg/libavfilter/vf_kerndeint.c
  42. +6 −0 mythtv/external/FFmpeg/libavfilter/vf_mp.c
  43. +1 −1 mythtv/external/FFmpeg/libavformat/Makefile
  44. +3 −1 mythtv/external/FFmpeg/libavformat/avio.c
  45. +13 −7 mythtv/external/FFmpeg/libavformat/flvdec.c
  46. +9 −0 mythtv/external/FFmpeg/libavformat/latmenc.c
  47. +0 −1 mythtv/external/FFmpeg/libavformat/loasdec.c
  48. +1 −1 mythtv/external/FFmpeg/libavformat/matroska.c
  49. +1 −1 mythtv/external/FFmpeg/libavformat/mov.c
  50. +5 −2 mythtv/external/FFmpeg/libavformat/movenc.c
  51. +6 −2 mythtv/external/FFmpeg/libavformat/rtmpproto.c
  52. +5 −1 mythtv/external/FFmpeg/libavformat/swfenc.c
  53. +1 −1 mythtv/external/FFmpeg/libswresample/Makefile
  54. +10 −0 mythtv/external/FFmpeg/libswresample/swresample.c
  55. +8 −8 mythtv/external/FFmpeg/tests/ref/lavf/mov
  56. +22 −22 mythtv/external/FFmpeg/tests/ref/seek/lavf-mov
  57. +2 −2 mythtv/external/FFmpeg/tests/ref/vsynth/vsynth1-dnxhd-1080i
  58. +2 −2 mythtv/external/FFmpeg/tests/ref/vsynth/vsynth1-mpeg4
  59. +2 −2 mythtv/external/FFmpeg/tests/ref/vsynth/vsynth2-dnxhd-1080i
  60. +2 −2 mythtv/external/FFmpeg/tests/ref/vsynth/vsynth2-mpeg4
View
@@ -1708,6 +1708,7 @@ HAVE_LIST="
CONFIG_EXTRA="
aandcttables
ac3dsp
+ audio_frame_queue
error_resilience
gcrypt
golomb
@@ -1979,7 +1980,7 @@ mpegvideoenc_select="mpegvideo"
# decoders / encoders
aac_decoder_select="mdct sinewin"
-aac_encoder_select="mdct sinewin"
+aac_encoder_select="audio_frame_queue mdct sinewin"
aac_latm_decoder_select="aac_decoder aac_latm_parser"
ac3_decoder_select="mdct ac3dsp ac3_parser"
ac3_encoder_select="mdct ac3dsp"
@@ -2067,13 +2068,13 @@ msmpeg4v3_decoder_select="h263_decoder"
msmpeg4v3_encoder_select="h263_encoder"
mss2_decoder_select="vc1_decoder"
nellymoser_decoder_select="mdct sinewin"
-nellymoser_encoder_select="mdct sinewin"
+nellymoser_encoder_select="audio_frame_queue mdct sinewin"
nuv_decoder_select="lzo"
png_decoder_select="zlib"
png_encoder_select="zlib"
qcelp_decoder_select="lsp"
qdm2_decoder_select="mdct rdft mpegaudiodsp"
-ra_144_encoder_select="lpc"
+ra_144_encoder_select="audio_frame_queue lpc"
ralf_decoder_select="golomb"
rv10_decoder_select="h263_decoder"
rv10_encoder_select="h263_encoder"
@@ -2174,7 +2175,9 @@ vc1_parser_select="error_resilience mpegvideo"
libaacplus_encoder_deps="libaacplus"
libcelt_decoder_deps="libcelt"
libfaac_encoder_deps="libfaac"
+libfaac_encoder_select="audio_frame_queue"
libfdk_aac_encoder_deps="libfdk_aac"
+libfdk_aac_encoder_select="audio_frame_queue"
libgsm_decoder_deps="libgsm"
libgsm_encoder_deps="libgsm"
libgsm_ms_decoder_deps="libgsm"
@@ -2183,24 +2186,30 @@ libilbc_decoder_deps="libilbc"
libilbc_encoder_deps="libilbc"
libmodplug_demuxer_deps="libmodplug"
libmp3lame_encoder_deps="libmp3lame"
+libmp3lame_encoder_select="audio_frame_queue"
libopencore_amrnb_decoder_deps="libopencore_amrnb"
libopencore_amrnb_encoder_deps="libopencore_amrnb"
+libopencore_amrnb_encoder_select="audio_frame_queue"
libopencore_amrwb_decoder_deps="libopencore_amrwb"
libopenjpeg_decoder_deps="libopenjpeg"
libopenjpeg_encoder_deps="libopenjpeg"
libopus_decoder_deps="libopus"
libopus_encoder_deps="libopus"
+libopus_encoder_select="audio_frame_queue"
libschroedinger_decoder_deps="libschroedinger"
libschroedinger_encoder_deps="libschroedinger"
libspeex_decoder_deps="libspeex"
libspeex_encoder_deps="libspeex"
+libspeex_encoder_select="audio_frame_queue"
libstagefright_h264_decoder_deps="libstagefright_h264"
libtheora_encoder_deps="libtheora"
libtwolame_encoder_deps="libtwolame"
libvo_aacenc_encoder_deps="libvo_aacenc"
+libvo_aacenc_encoder_select="audio_frame_queue"
libvo_amrwbenc_encoder_deps="libvo_amrwbenc"
libvorbis_decoder_deps="libvorbis"
libvorbis_encoder_deps="libvorbis"
+libvorbis_encoder_select="audio_frame_queue"
libvpx_decoder_deps="libvpx"
libvpx_encoder_deps="libvpx"
libx264_encoder_deps="libx264"
@@ -5510,6 +5519,7 @@ elif enabled gcc; then
check_optflags -fno-tree-vectorize
check_cflags -Werror=implicit-function-declaration
# check_cflags -Werror=missing-prototypes
+ check_cflags -Werror=return-type
check_cflags -Werror=vla
elif enabled llvm_gcc; then
check_cflags -mllvm -stack-alignment=16
@@ -5518,6 +5528,7 @@ elif enabled clang; then
check_cflags -Qunused-arguments
check_cflags -Werror=implicit-function-declaration
check_cflags -Werror=missing-prototypes
+ check_cflags -Werror=return-type
elif enabled armcc; then
# 2523: use of inline assembler is deprecated
add_cflags -W${armcc_opt},--diag_suppress=2523
@@ -2,9 +2,70 @@ Entries are sorted chronologically from oldest to youngest within each release,
releases are sorted from youngest to oldest.
version <next>:
+- h264: fix deadlocks with broken/fuzzed files
+- flvdec: make decoder more robust
+- vorbisdec: fix buffer overflow (CVE-2013-0894)
+- ac3dec: validate channel output mode against channel count
+- doc: minor improvements
+- loco: check that there is data left after decoding a plane.
+- mov: use the format context for logging.
+- lagarith: avoid infinite loop in lag_rac_refill() with corrupted files
+- flicvideo: avoid an infinite loop in byte run compression
+- av_memcpy_backptr: avoid an infinite loop for back = 0
+- mlpdec: do not try to allocate a zero-sized output buffer.
+- qtrle: add more checks against pixel_ptr being negative.
+- 4xm: check the return value of read_huffman_tables().
+- cavs: initialize various context tables, avoids crashes with corrupted files
+- x86/H.264: Don't use redzone in AVX h264_deblock on Win64
+- VQA video: check chunk sizes before reading chunks
+- RoQ video decoder: check dimensions validity
+- QDM2: check array index before use, fix out of array accesses
+- mpegvideo: Do REBASE_PICTURE with byte pointers
+- SVQ3: unbreak decoding
+- libopencore-amrwb: Make AMR-WB ifdeffery more precise
+- libopencore-amr: Conditionally compile decoder and encoder bits
+- arm: Fall back to runtime cpu feature detection via /proc/cpuinfo
+- xxan: properly handle odd heights
+- msrledec: check bounds before constructing a possibly invalid pointer,
+- qtrle: fix the topmost line for 1bit
+- aasc: fix output for msrle compression
+- yop: check for input overreads
+- yop: check that extradata is large enough
+- fraps: fix off-by one bug for version 1
+- vf_delogo: fix copying the input frame
+- vf_delogo: fix an uninitialized read
+- dnxhdenc: fix invalid reads in dnxhd_mb_var_thread()
+- ATRAC3: use correct loop variable in add_tonal_components()
+- MLP: store the channel layout for each substream
+- MLP decoder: TrueHD: use Libav channel order
+- x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly
+- arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht
+- lavr: call mix_function_init() in ff_audio_mix_set_matrix()
+- rtpenc_chain: Use the original AVFormatContext for getting payload type
+- rtp: Make sure the output format pointer is set
+- rtp: Make sure priv_data is set before reading it
+- videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
+- get_bits: change the failure condition in init_get_bits
+- mpegvideo: fix loop condition in draw_line()
+- fate: update ref after rv30_loop_filter fix
+- RV30: fix masking in rv30_loop_filter()
+- libcdio: support recent cdio-paranoia
+- Theora: Skip zero-sized headers
+- H.264: add 3 pixels below for subpixel filter wait position
+- H.264: fix ff_generate_sliding_window_mmcos() prototype
+- H.264: don't clobber mmco opcode tables for non-first slice headers
+- libx264: use the library specific default rc_initial_buffer_occupancy
+- lavc: set the default rc_initial_buffer_occupancy
+- lavc: introduce the convenience function init_get_bits8
+- lavc: check for overflow in init_get_bits
+- configure: enable pic for shared libs on AArch64
+- zmbv: Reset the decoder on keyframe errors
+- VC1 decoder: prevent a crash due missing pred_flag parameter
+- matroska: Fix use after free
+- VP3: Fix double free in vp3_decode_end()
- Fix a crash on windows platforms related to automatic stack alignment
in libavresample
-- Fix memleaks in the ogg demuxer. Related to CVE-2012-2882
+- Fix memleaks in the Ogg demuxer. Related to CVE-2012-2882
version 1.1:
@@ -7,6 +7,7 @@ git://source.ffmpeg.org/ffmpeg.git at SHA1 f218121 on June 1st, 2012 (jya)
git://source.ffmpeg.org/ffmpeg.git at SHA1 59d765e3 on December 12th, 2012 (jya) (release/1.0 branch)
git://source.ffmpeg.org/ffmpeg.git at SHA1 553c9c77 on December 16th, 2012 (jya) (release/1.0 branch)
git://source.ffmpeg.org/ffmpeg.git at SHA1 057051b8 on February 17th, 2013 (jya) (release/1.1 branch)
+git://source.ffmpeg.org/ffmpeg.git at SHA1 7c8beec4 on March 7th, 2013 (jya) (release/1.1 branch)
List of files modified from original FFmpeg:
Makefile
@@ -1 +1 @@
-1.1.2
+1.1.3
@@ -1 +1 @@
-1.1.2
+1.1.3
@@ -1466,6 +1466,7 @@ HAVE_LIST="
CONFIG_EXTRA="
aandcttables
ac3dsp
+ audio_frame_queue
error_resilience
gcrypt
golomb
@@ -1633,7 +1634,7 @@ mpegvideoenc_select="mpegvideo"
# decoders / encoders
aac_decoder_select="mdct sinewin"
-aac_encoder_select="mdct sinewin"
+aac_encoder_select="audio_frame_queue mdct sinewin"
aac_latm_decoder_select="aac_decoder aac_latm_parser"
ac3_decoder_select="mdct ac3dsp ac3_parser"
ac3_encoder_select="mdct ac3dsp"
@@ -1718,13 +1719,13 @@ msmpeg4v3_decoder_select="h263_decoder"
msmpeg4v3_encoder_select="h263_encoder"
mss2_decoder_select="vc1_decoder"
nellymoser_decoder_select="mdct sinewin"
-nellymoser_encoder_select="mdct sinewin"
+nellymoser_encoder_select="audio_frame_queue mdct sinewin"
nuv_decoder_select="lzo"
png_decoder_select="zlib"
png_encoder_select="zlib"
qcelp_decoder_select="lsp"
qdm2_decoder_select="mdct rdft mpegaudiodsp"
-ra_144_encoder_select="lpc"
+ra_144_encoder_select="audio_frame_queue lpc"
ralf_decoder_select="golomb"
rv10_decoder_select="h263_decoder"
rv10_encoder_select="h263_encoder"
@@ -1825,7 +1826,9 @@ vc1_parser_select="error_resilience mpegvideo"
libaacplus_encoder_deps="libaacplus"
libcelt_decoder_deps="libcelt"
libfaac_encoder_deps="libfaac"
+libfaac_encoder_select="audio_frame_queue"
libfdk_aac_encoder_deps="libfdk_aac"
+libfdk_aac_encoder_select="audio_frame_queue"
libgsm_decoder_deps="libgsm"
libgsm_encoder_deps="libgsm"
libgsm_ms_decoder_deps="libgsm"
@@ -1834,24 +1837,30 @@ libilbc_decoder_deps="libilbc"
libilbc_encoder_deps="libilbc"
libmodplug_demuxer_deps="libmodplug"
libmp3lame_encoder_deps="libmp3lame"
+libmp3lame_encoder_select="audio_frame_queue"
libopencore_amrnb_decoder_deps="libopencore_amrnb"
libopencore_amrnb_encoder_deps="libopencore_amrnb"
+libopencore_amrnb_encoder_select="audio_frame_queue"
libopencore_amrwb_decoder_deps="libopencore_amrwb"
libopenjpeg_decoder_deps="libopenjpeg"
libopenjpeg_encoder_deps="libopenjpeg"
libopus_decoder_deps="libopus"
libopus_encoder_deps="libopus"
+libopus_encoder_select="audio_frame_queue"
libschroedinger_decoder_deps="libschroedinger"
libschroedinger_encoder_deps="libschroedinger"
libspeex_decoder_deps="libspeex"
libspeex_encoder_deps="libspeex"
+libspeex_encoder_select="audio_frame_queue"
libstagefright_h264_decoder_deps="libstagefright_h264"
libtheora_encoder_deps="libtheora"
libtwolame_encoder_deps="libtwolame"
libvo_aacenc_encoder_deps="libvo_aacenc"
+libvo_aacenc_encoder_select="audio_frame_queue"
libvo_amrwbenc_encoder_deps="libvo_amrwbenc"
libvorbis_decoder_deps="libvorbis"
libvorbis_encoder_deps="libvorbis"
+libvorbis_encoder_select="audio_frame_queue"
libvpx_decoder_deps="libvpx"
libvpx_encoder_deps="libvpx"
libx264_encoder_deps="libx264"
@@ -4094,6 +4103,7 @@ elif enabled gcc; then
check_optflags -fno-tree-vectorize
check_cflags -Werror=implicit-function-declaration
check_cflags -Werror=missing-prototypes
+ check_cflags -Werror=return-type
check_cflags -Werror=vla
elif enabled llvm_gcc; then
check_cflags -mllvm -stack-alignment=16
@@ -4102,6 +4112,7 @@ elif enabled clang; then
check_cflags -Qunused-arguments
check_cflags -Werror=implicit-function-declaration
check_cflags -Werror=missing-prototypes
+ check_cflags -Werror=return-type
elif enabled armcc; then
# 2523: use of inline assembler is deprecated
add_cflags -W${armcc_opt},--diag_suppress=2523
Oops, something went wrong.

0 comments on commit a817da2

Please sign in to comment.