x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-07-29 07:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,392 Commits 40 Branches 429 Tags
7d52ed686b2ccbb2e72d3930cfba69448c346204
Commit Graph
14653 Commits
Author SHA1 Message Date
Gwenole BeauchesneandCarl Eugen Hoyos 7d52ed686b vaapi: fix VC-1 decoding (reconstruct bitstream TTFRM correctly). 
(cherry picked from commit 825dd135d8)
 2011-10-12 11:27:11 +02:00
Laurent AimarandMichael Niedermayer f74d1c6de7 h264: do not let invalid values in h->ref_count after a decoder reset. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0333d234b0)
 2011-10-11 21:34:15 +02:00
Michael Niedermayer e49abd1d92 libx264: Fix loop failure due to bufsize becoming 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 751a4efd4d)
 2011-10-11 21:34:15 +02:00
Michael Niedermayer 09a288476f H264: hotfix for speedloss on frame threading and h264 files with slices. 
This fix is not ideal as it still limits the multithreading on field pictures
to the 2nd field only.
Ill try to fix it properly to allow both fields to decode concurrently but this
needs more work.

This bug exists since and was caused by:
commit ea6331f8bb
Author: Ronald S. Bultje <rsbultje@gmail.com>
Date:   Mon Jun 20 10:24:33 2011 -0400

    h264-mt: fix deadlock in packets with multiple slices (e.g. MP4).
(cherry picked from commit eaa21b6870)
 2011-10-11 21:34:14 +02:00
Laurent AimarandMichael Niedermayer b89a0c9d7f h264: fix intra 16x16 mode check when using mbaff and constrained_intra_pred. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a4fd95b5d5)
 2011-10-02 21:30:21 +02:00
Laurent AimarandMichael Niedermayer efedf09378 h264: check for invalid bit depth value. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c2b7f7748b)
 2011-10-02 21:30:14 +02:00
Laurent AimarandMichael Niedermayer 46edabac3c h264: add entries for 11 and 12 bits in ff_h264_chroma_qp[][] 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 27d3361e34)
 2011-10-02 21:30:08 +02:00
Laurent AimarandMichael Niedermayer bfd7238adb h264: fix the check for invalid SPS:num_ref_frames. 
This patch set the limit to 16.

For information, thoses previous commits:
41f7e2d11d
5cbb0e70a0
assumed it was either 30 or 32.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bcf881a685)
 2011-10-02 21:29:58 +02:00
Laurent AimarandMichael Niedermayer cf0052931d h264: do not let invalid values in h->ref_count on ff_h264_decode_ref_pic_list_reordering() errors. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2428b53f6d)
 2011-10-02 21:29:51 +02:00
Laurent AimarandMichael Niedermayer 6b998720b2 Reject video with non multiple of 16 width/height in the 4xm decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit db5b487551)
 2011-10-02 21:29:45 +02:00
Michael Niedermayer 55a070870f 4xm decoder: fix data size for i2 frames. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0a19b4b0ba)
 2011-10-02 05:48:40 +02:00
Michael Niedermayer 54a1e7b0f2 4xm decoder: print some error messages in case of errors. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1008f639e2)
 2011-10-02 05:48:40 +02:00
Laurent AimarandMichael Niedermayer 2c282e9679 Check for out of bound accesses in the 4xm decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9c661e952f)
 2011-10-02 05:48:26 +02:00
Laurent AimarandMichael Niedermayer 55a96a984e Prevent block size from inreasing in the shorten decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b399cbfba5)
 2011-10-02 05:48:13 +02:00
Laurent AimarandMichael Niedermayer 64a9004d07 Check for out of bound reads in PTX decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 581898ae88)
 2011-10-02 05:48:07 +02:00
Laurent AimarandMichael Niedermayer f421b53400 Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffers used in 4xm decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 90a69b2f61)
 2011-10-02 05:47:51 +02:00
Laurent AimarandMichael Niedermayer d2a276a3fd Fix the check for missing references in ff_er_frame_end() for H264. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-02 05:47:46 +02:00
Laurent AimarandMichael Niedermayer 535112b365 Prevent NULL dereference when the huffman table is invalid in the 4xm decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a8ff0636d)
 2011-10-02 05:45:01 +02:00
Michael Niedermayer 86491c5dbc h264: increase ref_poc size to 32 as it can be per field. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8c851ef5a8)
 2011-10-02 05:44:42 +02:00
Michael Niedermayer 3e0dbb8a7e h264: set unused ref_counts to 0 as a precautionary meassure. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3af2de76ac)
 2011-10-02 05:44:35 +02:00
Michael Niedermayer b0804f3705 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 
* qatar/release/0.7: (73 commits)
  Update Changelog for 0.7.2 release
  Update RELEASE file for 0.7.2
  lavf: do not set codec_tag for rawvideo
  fate: allow testing with libavfilter disabled
  fate: separate lavf-mxf_d10 test from lavf-mxf
  Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
  movenc: fix NULL reference in mov_write_tkhd_tag
  movenc: create an alternate group for each media type
  flvdec: Check for overflow before allocating arrays
  ppc: fix some pointer to integer casts
  ppc: fix 32-bit PIC build
  rv34: Check for invalid slice offsets
  rv34: Fix potential overreads
  rv34: Avoid NULL dereference on corrupted bitstream
  rv10: Reject slices that does not have the same type as the first one
  lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails
  oggdec: fix out of bound write in the ogg demuxer
  Fixed size given to init_get_bits().
  smacker: fix a few off by 1 errors
  Check for invalid VLC value in smacker decoder.
  ...

Conflicts:
	RELEASE
	libavcodec/avs.c
	libavcodec/ppc/asm.S
	libavcodec/rv34.c
	libavcodec/xan.c
	libavdevice/alsa-audio.h
	libavformat/flvdec.c
	libavformat/gxf.c
	libavformat/utils.c
	libswscale/x86/swscale_template.c
	tests/ref/lavf/mov
	tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 22:42:41 +02:00
Laurent AimarandMichael Niedermayer f144a70d60 Fix out of bound reads/writes in the TIFF decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5ca5d432e0)
 2011-10-01 21:03:49 +02:00
Laurent AimarandMichael Niedermayer b08df314dc Check for out of bound writes in the QDM2 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a7876c6e4)
 2011-10-01 21:03:45 +02:00
Laurent AimarandMichael Niedermayer e0fb22cea9 Fix out of bound reads in the QDM2 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 491eaf35ae)
 2011-10-01 21:03:40 +02:00
Laurent AimarandMichael Niedermayer 802045777a Fix out of bound reads due to integer overflow in the ADPCM IMA Electronic Arts EACS decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 346876ec16)
 2011-10-01 21:03:35 +02:00
Laurent AimarandMichael Niedermayer e8fd4a43ba Check for out of bound reads in the Electronic Arts CMV decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a5d46235f3)
 2011-10-01 21:03:31 +02:00
Laurent AimarandMichael Niedermayer d950461f59 Prevent NULL dereferences when missing the reference frame in the Electronic Arts CMV decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 113d7be624)
 2011-10-01 21:03:26 +02:00
Laurent AimarandMichael Niedermayer df39708269 Fix potential pointer arithmetic overflows in the Electronic Arts CMV decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e9064c9ce8)
 2011-10-01 20:59:57 +02:00
Laurent AimarandMichael Niedermayer 1f2a93cf4b Prevent infinite loop in the ANM decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 39993860e1)
 2011-10-01 20:59:49 +02:00
Laurent AimarandMichael Niedermayer 3b840fab90 Check for out of bound reads in AVS decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7afe9e5638)
 2011-10-01 20:59:34 +02:00
Justin RugglesandMichael Niedermayer b8ab1adfcd avcodec: reject audio packets with NULL data and non-zero size 
There is no valid reason the user should ever send such packets in the
first place, but the documentation for CODEC_CAP_DELAY states that the
codec is guaranteed not to get a NULL packet unless that capability is
set. That isn't true without preventing this case.
(cherry picked from commit 6326afd5e9)
 2011-10-01 20:56:18 +02:00
Laurent AimarandMichael Niedermayer 107ea3057e Fix out of bound writes in fix_bitshift() of the shorten decoder. 
The data pointers s->decoded[*] already take into account s->nwrap.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f42b3195d3)
 2011-10-01 20:54:48 +02:00
Laurent AimarandMichael Niedermayer 375bd0cfb3 Check for out of bound reads in the Tiertex Limited SEQ decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5d7e3d7167)
 2011-10-01 20:54:36 +02:00
Laurent AimarandMichael Niedermayer 9b1bf08525 Fix the size of workspace buffers in the motion pixels decoder. 
Some buffers must be mod 4 in width and/or height.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 62234a4d3a)
 2011-10-01 20:54:31 +02:00
Laurent AimarandMichael Niedermayer 376b099474 Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer used in motion pixels decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e60619f9b4)
 2011-10-01 20:54:26 +02:00
Laurent AimarandMichael Niedermayer 6e774cf67e Check for out of bounds writes in the Delphine Software International CIN decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3035c4034b)
 2011-10-01 20:54:21 +02:00
Laurent AimarandMichael Niedermayer 18cfe0238d Check for out of bounds reads in the Delphine Software International CIN decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8e5f093c2c)
 2011-10-01 20:54:17 +02:00
Laurent AimarandMichael Niedermayer 603cb031f1 Check for out of bound reads in the QuickDraw decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 44e2f0c3cd)
 2011-10-01 20:54:12 +02:00
Laurent AimarandMichael Niedermayer f9efe1d76e Check for out of bound reads in xan_huffman_decode() of the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c8b835954a)
 2011-10-01 20:53:44 +02:00
Mans RullgardandMichael Niedermayer 626f11b3bc dca: clear inactive subbands only once in qmf_32_subbands() 
Writing zeros to the high entries in the array need only be
done once as the cutoff position is constant throughout the
loop.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit bf00a73ace)
 2011-10-01 20:52:09 +02:00
Laurent AimarandMichael Niedermayer d414c77ded Check for unsupported parameters in ff_j2k_dwt_init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b4483a531a)
 2011-10-01 20:51:35 +02:00
Laurent AimarandMichael Niedermayer dc9b708f4d Check for out of bound reads in jpeg 2000 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 02660a8713)
 2011-10-01 20:51:28 +02:00
Laurent AimarandMichael Niedermayer f8eabfc16e Prevent calling init_vlc() with invalid parameters in motionpixels decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 41b7389cad)
 2011-10-01 20:51:17 +02:00
Laurent AimarandMichael Niedermayer 14617fa7b8 Prevent NULL dereference when the palette is missing in the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 56ee5a9ad1)
 2011-10-01 20:51:12 +02:00
Laurent AimarandMichael Niedermayer 485b4317bb Fixed out of bound accesses in xan_unpack() of the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5279141c1d)
 2011-10-01 20:51:08 +02:00
Nicolas GeorgeandMichael Niedermayer acfe2c9154 libvpxenc: Replace av_realloc by av_realloc_f when relevant. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 769298a686)
 2011-10-01 20:49:34 +02:00
Nicolas GeorgeandMichael Niedermayer bbb191c721 bitstream: Replace av_realloc by av_realloc_f when relevant. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 198ed6474d)
 2011-10-01 20:49:26 +02:00
Laurent AimarandMichael Niedermayer fa816e01f4 Check for out of bound reads in the flic decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1f024b8820)
 2011-10-01 20:47:42 +02:00
Laurent AimarandMichael Niedermayer 03a4b489f1 Prevent out of bound accesses in the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit feca3ba053)
 2011-10-01 20:44:51 +02:00
Laurent AimarandMichael Niedermayer df0d418ce0 Check for invalid/corrupted bitstream in sun raster decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b9596a5037)
 2011-10-01 20:44:46 +02:00