x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-07-31 00:34:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,372 Commits 40 Branches 429 Tags
f421b534007ad791df593208d7998d07500a666e
Commit Graph
31372 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent AimarandMichael Niedermayer 2e342df4a2 Fix use of uninitialized memory in 4X Technologies demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a1876e0072)
 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 2cd7580ab5 Remove Chnagelog it has nothing to do with reality 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 22:45:25 +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
Michael Niedermayer 77a7092d1c fate: fix motion pixels checksum change caused by backported bugfix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 22:28:16 +02:00
Michael Niedermayer 80331265ca avienc: Add a limit on the number of skiped frames muxed in a row. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9cb9e39c41)
 2011-10-01 21:04:04 +02:00
Michael Niedermayer 00f6cbb53d vf_scale.c: propagate error code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8447703c16)
 2011-10-01 21:03:57 +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 67b704982f Fix double free on error in Deluxe Paint Animation demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d39d7122e3)
 2011-10-01 20:59:42 +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
Laurent AimarandMichael Niedermayer fa79af6845 Check for out of bound writes in the avs demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5d44c061cf)
 2011-10-01 20:59:28 +02:00
Laurent AimarandMichael Niedermayer c23d5261f7 Check for corrupted data in avs demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1cce7def0a)
 2011-10-01 20:59:20 +02:00
Martin StorsjöandMichael Niedermayer 932b5f3cbb lavf: Avoid using av_malloc(0) in av_dump_format 
On OS X, av_malloc(0) returns pointers that cause crashes when
freed.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit e81e5e8ad2)
 2011-10-01 20:57:04 +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
Tomas HärdinandMichael Niedermayer 2451228b0c mov: Only touch extradata in mov_read_extradata() if codec_id is what we expect 
Extradata should only be parsed from the avss, fiel, jp2h and alac atoms for
AVS, MJPEG, Motion JPEG 2000 and ALAC respectively.
This also fixes the mov demuxer coming up with bogus extradata for some
AVC-Intra samples due to the presence of fiel atoms.
(cherry picked from commit e571305a71)
 2011-10-01 20:53:53 +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
Stefano SabatiniandMichael Niedermayer 8d61c68442 vf_unsharp: set default chroma size value to 5x5 
The previous default value 0x0 was not good, since it is not even
valid.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 1ee2014190)
 2011-10-01 20:51:52 +02:00
Stefano SabatiniandMichael Niedermayer d155fdefb8 vf_unsharp: fix out-of-buffer read 
In apply_unsharp(), when y is >= height, prevent out-of-buffer reading
from src, read from the last buffer line in src2 instead.

The check was implemented in the original unsharp libmpcodecs code and
lost in the port.

This also fixes output discrepancy between the two filters.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 998e8519ef)
 2011-10-01 20:51:43 +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 17b6abab50 movenc: 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 194c2432ee)
 2011-10-01 20:50:19 +02:00
Nicolas GeorgeandMichael Niedermayer cfff8db729 gxfenc: 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 af84d9bb9e)
 2011-10-01 20:50:08 +02:00
Nicolas GeorgeandMichael Niedermayer 431937883f aviobuf: 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 247a1dc847)
 2011-10-01 20:50:02 +02:00
Nicolas GeorgeandMichael Niedermayer 7bc9c32573 avienc: 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 e47cfe9e5c)
 2011-10-01 20:49:55 +02:00
Nicolas GeorgeandMichael Niedermayer 1537f86a93 avidec: 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 71e23d39a3)
 2011-10-01 20:49:48 +02:00
Nicolas GeorgeandMichael Niedermayer 2a934e87b1 4xm: 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 0cc44facf1)
 2011-10-01 20:49:41 +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