ffmpeg.git
7 years agoeamad: avoid NULL derefence when missing the reference frame.
Laurent Aimar [Sat, 8 Oct 2011 21:40:32 +0000 (23:40 +0200)]
eamad: avoid NULL derefence when missing the reference frame.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6e20554a6d33e92b81dc3cfed6082e03bff2a7f8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeatgv: fix pointer arithmetic overflows.
Laurent Aimar [Sat, 8 Oct 2011 21:40:28 +0000 (23:40 +0200)]
eatgv: fix pointer arithmetic overflows.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6bfe0d4c3d7de11e859ea6720b011cf5fdf5ef03)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeatgv: fix out of bound reads on corrupted motions vectors.
Laurent Aimar [Sat, 8 Oct 2011 21:40:27 +0000 (23:40 +0200)]
eatgv: fix out of bound reads on corrupted motions vectors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 09302a897d1990b1338f049fcd29638d736b8823)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeamad: clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer
Laurent Aimar [Sat, 8 Oct 2011 21:40:30 +0000 (23:40 +0200)]
eamad: clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 74b9c598396f76407c6b3841c10bc67ddddb2a98)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: fix signed overflow in avformat_find_stream_info()
Mans Rullgard [Sat, 8 Oct 2011 01:06:26 +0000 (02:06 +0100)]
lavf: fix signed overflow in avformat_find_stream_info()

On the first iteration through this code, last_dts is always
INT64_MIN (AV_NOPTS_VALUE) and the subtraction overflows in
an invalid manner.  Although the result is only used if the
input values are valid, performing the subtraction is still
not allowed in a strict environment.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a31e9f68a426f634e002282885c6c2eb1bfbea44)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovp8: fix signed overflows
Mans Rullgard [Sat, 8 Oct 2011 14:03:51 +0000 (15:03 +0100)]
vp8: fix signed overflows

In addition to avoiding undefined behaviour, an unsigned type
makes more sense for packing multiple 8-bit values.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit bb59156606e00057a706ed30165bc7329db3823f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomotion_est: fix some signed overflows
Mans Rullgard [Sat, 8 Oct 2011 12:52:44 +0000 (13:52 +0100)]
motion_est: fix some signed overflows

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e708afd3c026a9eb547dab07781320a7e2564312)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodca: fix signed overflow in shift
Mans Rullgard [Sat, 8 Oct 2011 12:49:42 +0000 (13:49 +0100)]
dca: fix signed overflow in shift

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 559c244d42be7a02c23976216b47fd63b80d6c7f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacdec: fix undefined shifts
Mans Rullgard [Sat, 8 Oct 2011 12:41:23 +0000 (13:41 +0100)]
aacdec: fix undefined shifts

Since nnz can be zero, this is needed to avoid a shift by 32.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d12294304acd82cb219e3f66ca9cd6efb2194fa4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoput_bits: fix invalid shift by 32 in flush_put_bits()
Mans Rullgard [Sat, 8 Oct 2011 01:09:42 +0000 (02:09 +0100)]
put_bits: fix invalid shift by 32 in flush_put_bits()

If flush_put_bits() is called when the 32-bit buffer is empty,
e.g. after writing a multiple of 32 bits, and invalid shift by
32 is performed.  Since flush_put_bits() is called infrequently,
this additional check should have negligible performance impact.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit ac6eab1496aad6f8b09deabbef4fe5fd829e142d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: fix the size of PPS::chroma_qp_table
Laurent Aimar [Thu, 6 Oct 2011 19:55:44 +0000 (21:55 +0200)]
h264: fix the size of PPS::chroma_qp_table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e588a5c2d418fdcf08ece076a2642de44f444d55)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: fix fill_colmap() to not store entries mbaff style when the reference is not...
Michael Niedermayer [Thu, 6 Oct 2011 20:54:00 +0000 (22:54 +0200)]
h264: fix fill_colmap() to not store entries mbaff style when the reference is not mbaff at all

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a3ba542af39ba4425cbb44d2a0ae09c212b40001)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo: fix position of bottom edge.
Ronald S. Bultje [Mon, 3 Oct 2011 14:37:24 +0000 (07:37 -0700)]
mpegvideo: fix position of bottom edge.

It was wrong in colorspaces where horizontal and vertical chroma
subsampling are not the same, e.g. 422.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh254: explicitly initialize bit depth/chroma idc
Laurent Aimar [Tue, 4 Oct 2011 20:13:56 +0000 (22:13 +0200)]
h254: explicitly initialize bit depth/chroma idc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqcelp: check output buffer size before decoding
Justin Ruggles [Wed, 14 Sep 2011 17:38:07 +0000 (13:38 -0400)]
qcelp: check output buffer size before decoding
(cherry picked from commit e43dd3d2a8e106169e707484090a2d973ece2184)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosipr: fix the output data size check and only calculate it once.
Justin Ruggles [Tue, 20 Sep 2011 19:27:44 +0000 (15:27 -0400)]
sipr: fix the output data size check and only calculate it once.
(cherry picked from commit 1b5a189f06879338088809b3049ea7620f4e7e78)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_dv_frame_profile2: Check input buffer size.
Michael Niedermayer [Tue, 4 Oct 2011 02:21:19 +0000 (04:21 +0200)]
ff_dv_frame_profile2: Check input buffer size.

Based on code by DivX, Inc. / drffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 51b0694bc051cda2bfed048a35e694d1047c6ef0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqdm2: check output buffer size before decoding
Justin Ruggles [Wed, 14 Sep 2011 17:57:04 +0000 (13:57 -0400)]
qdm2: check output buffer size before decoding
(cherry picked from commit 7d49f79f1cd47783a963a757a6563b9cac29db62)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMAINTAINERS: new ffplay maintainer
Michael Niedermayer [Sun, 2 Oct 2011 22:38:50 +0000 (00:38 +0200)]
MAINTAINERS: new ffplay maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cffd20b90ee6f35e37cdb51dd94e6b2174fd31b6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoriff: map 0x0038 to amrnb, works on http://video.mopoto.com/4/40/407/40709.avi
Compn [Sun, 2 Oct 2011 21:39:03 +0000 (17:39 -0400)]
riff: map 0x0038 to amrnb, works on video.mopoto.com/4/40/407/40709.avi
(cherry picked from commit 3ebab62fc67591fd9313fad32892d7d32e805422)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompc8: check output buffer size before decoding
Justin Ruggles [Wed, 14 Sep 2011 15:39:21 +0000 (11:39 -0400)]
mpc8: check output buffer size before decoding
(cherry picked from commit 5674d4b0a35a34b75e3533a8580e0b5a0a8895a7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompc7: return error if packet is too small.
Justin Ruggles [Wed, 14 Sep 2011 15:16:42 +0000 (11:16 -0400)]
mpc7: return error if packet is too small.
(cherry picked from commit 8290d1f38b438f1b070de67645c8b4a42014c7ac)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompc7: check output buffer size before decoding
Justin Ruggles [Tue, 13 Sep 2011 22:53:18 +0000 (18:53 -0400)]
mpc7: check output buffer size before decoding
(cherry picked from commit c8b5c4d27409dfdcec80868686b173ba446c998b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovaapi: fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
Gwenole Beauchesne [Thu, 6 Oct 2011 13:19:33 +0000 (15:19 +0200)]
vaapi: fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
(cherry picked from commit 825dd135d829d85778e6c37f685a6088fef01b2e)

8 years agoh264: do not let invalid values in h->ref_count after a decoder reset.
Laurent Aimar [Tue, 4 Oct 2011 20:13:58 +0000 (22:13 +0200)]
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 0333d234b0355b375762447e93674e3fe3c5bff1)

8 years agolibx264: Fix loop failure due to bufsize becoming 0
Michael Niedermayer [Tue, 4 Oct 2011 21:21:52 +0000 (23:21 +0200)]
libx264: Fix loop failure due to bufsize becoming 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 751a4efd4d754b15ebc6027b09051f27860bb1e8)

8 years agoconfigure: remove bashism equality check for target_os.
Clément Bœsch [Tue, 4 Oct 2011 19:34:55 +0000 (21:34 +0200)]
configure: remove bashism equality check for target_os.
(cherry picked from commit e39be59b85de63e036bd6db9b79a9a9f29a838f7)

8 years agoH264: hotfix for speedloss on frame threading and h264 files with slices.
Michael Niedermayer [Mon, 3 Oct 2011 22:14:48 +0000 (00:14 +0200)]
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 ea6331f8bbaf3343faec6ffe77a6218a016a3af5
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 eaa21b6870ba8bba4b0370e91f1941307c1c9681)

8 years agompegtsenc: Lift limit on PMT PID
Loren Osborn [Mon, 3 Oct 2011 14:03:29 +0000 (16:03 +0200)]
mpegtsenc: Lift limit on PMT PID
Fixes Ticket518
(cherry picked from commit bf5c3bac51e422580aad011fcd927c818542f054)

8 years agoDo not set codec_tag property for matroska muxers.
Carl Eugen Hoyos [Sun, 28 Aug 2011 21:13:17 +0000 (23:13 +0200)]
Do not set codec_tag property for matroska muxers.

Fixes ticket #8, #537.

8 years agolavf/utils: fix overestimation of the rational number density.
Michael Niedermayer [Mon, 3 Oct 2011 14:32:17 +0000 (16:32 +0200)]
lavf/utils: fix overestimation of the rational number density.
Fixes Ticket498

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoUpdate for 0.8.5 n0.8.5
Michael Niedermayer [Sun, 2 Oct 2011 20:02:45 +0000 (22:02 +0200)]
Update for 0.8.5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: fix intra 16x16 mode check when using mbaff and constrained_intra_pred.
Laurent Aimar [Sun, 2 Oct 2011 19:07:41 +0000 (21:07 +0200)]
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 a4fd95b5d511384ed3ce388d8d20a16b1c4c0530)

8 years agoh264: check for invalid bit depth value.
Laurent Aimar [Sun, 2 Oct 2011 16:29:31 +0000 (18:29 +0200)]
h264: check for invalid bit depth value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c2b7f7748be447e1446f63b13da472ba7e00f329)

8 years agoh264: add entries for 11 and 12 bits in ff_h264_chroma_qp[][]
Laurent Aimar [Sun, 2 Oct 2011 16:29:30 +0000 (18:29 +0200)]
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 27d3361e34cf19ad5c0bfb7cfacae0db99b26064)

8 years agoh264: fix the check for invalid SPS:num_ref_frames.
Laurent Aimar [Sun, 2 Oct 2011 14:06:38 +0000 (16:06 +0200)]
h264: fix the check for invalid SPS:num_ref_frames.

This patch set the limit to 16.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bcf881a6858760ecbd9ff4352a38813dc4232dd6)

8 years agoh264: do not let invalid values in h->ref_count on ff_h264_decode_ref_pic_list_reorde...
Laurent Aimar [Sun, 2 Oct 2011 14:06:37 +0000 (16:06 +0200)]
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 2428b53f6d306d8d71dec34fa7b0af733d76cfac)

8 years agoReject video with non multiple of 16 width/height in the 4xm decoder.
Laurent Aimar [Sat, 1 Oct 2011 00:04:45 +0000 (02:04 +0200)]
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 db5b4875514eb7740844f514dbf236c9179a6a93)

8 years ago4xm decoder: fix data size for i2 frames.
Michael Niedermayer [Sun, 2 Oct 2011 01:40:26 +0000 (03:40 +0200)]
4xm decoder: fix data size for i2 frames.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0a19b4b0bae772cac7f8341e94c319c96356ee69)

8 years ago4xm decoder: print some error messages in case of errors.
Michael Niedermayer [Sun, 2 Oct 2011 01:39:59 +0000 (03:39 +0200)]
4xm decoder: print some error messages in case of errors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1008f639e2ebaa2b3d48ac765ca49c8869042d75)

8 years agoCheck for out of bound accesses in the 4xm decoder.
Laurent Aimar [Sat, 1 Oct 2011 22:38:27 +0000 (00:38 +0200)]
Check for out of bound accesses in the 4xm decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9c661e952fbcbf044709f9a7031c68cc4860336b)

8 years agoPrevent block size from inreasing in the shorten decoder.
Laurent Aimar [Fri, 30 Sep 2011 22:43:05 +0000 (00:43 +0200)]
Prevent block size from inreasing in the shorten decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b399cbfba5d901608c18e1a2d48a24c30541a634)

8 years agoCheck for out of bound reads in PTX decoder.
Laurent Aimar [Sat, 1 Oct 2011 22:38:32 +0000 (00:38 +0200)]
Check for out of bound reads in PTX decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 581898ae882dc37967b689b6ea5f2b2a9acd257a)

8 years agoClear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffers used...
Laurent Aimar [Sat, 1 Oct 2011 22:38:30 +0000 (00:38 +0200)]
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 90a69b2f61cbd2d58723d712bdf283e5e56b2ea2)

8 years agoFix the check for missing references in ff_er_frame_end() for H264.
Laurent Aimar [Sat, 1 Oct 2011 22:38:31 +0000 (00:38 +0200)]
Fix the check for missing references in ff_er_frame_end() for H264.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoPrevent NULL dereference when the huffman table is invalid in the 4xm decoder.
Laurent Aimar [Sat, 1 Oct 2011 22:38:28 +0000 (00:38 +0200)]
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 4a8ff0636d67c6df059f2ae2df49ad1181de14ca)

8 years agoFix use of uninitialized memory in 4X Technologies demuxer.
Laurent Aimar [Sat, 1 Oct 2011 22:38:26 +0000 (00:38 +0200)]
Fix use of uninitialized memory in 4X Technologies demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a1876e0072aa0c69f037e0cafaca1a54bf2e189b)

8 years agoh264: increase ref_poc size to 32 as it can be per field.
Michael Niedermayer [Sat, 1 Oct 2011 22:47:54 +0000 (00:47 +0200)]
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 8c851ef5a81fb0429453c43fdcfc974ce1b6e447)

8 years agoh264: set unused ref_counts to 0 as a precautionary meassure.
Michael Niedermayer [Sat, 1 Oct 2011 22:45:41 +0000 (00:45 +0200)]
h264: set unused ref_counts to 0 as a precautionary meassure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3af2de76ac8b7aa762e4ee129ec29140e6247d81)

8 years agoRemove Chnagelog it has nothing to do with reality
Michael Niedermayer [Sat, 1 Oct 2011 20:12:01 +0000 (22:12 +0200)]
Remove Chnagelog it has nothing to do with reality

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/release/0.7' into release/0.8
Michael Niedermayer [Sat, 1 Oct 2011 20:42:41 +0000 (22:42 +0200)]
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>
8 years agofate: fix motion pixels checksum change caused by backported bugfix
Michael Niedermayer [Sat, 1 Oct 2011 20:28:16 +0000 (22:28 +0200)]
fate: fix motion pixels checksum change caused by backported bugfix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavienc: Add a limit on the number of skiped frames muxed in a row.
Michael Niedermayer [Sat, 1 Oct 2011 01:48:33 +0000 (03:48 +0200)]
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 9cb9e39c41959961bdb5a1fd51cdd25e10c050f3)

8 years agovf_scale.c: propagate error code
Michael Niedermayer [Sat, 1 Oct 2011 01:16:32 +0000 (03:16 +0200)]
vf_scale.c: propagate error code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8447703c16b9e6fdc48ce92553ec1cfa2e359b84)

8 years agoFix out of bound reads/writes in the TIFF decoder.
Laurent Aimar [Fri, 30 Sep 2011 22:45:03 +0000 (00:45 +0200)]
Fix out of bound reads/writes in the TIFF decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5ca5d432e028ffdd4067b87aed6702168c3207b6)

8 years agoCheck for out of bound writes in the QDM2 decoder.
Laurent Aimar [Fri, 30 Sep 2011 22:45:05 +0000 (00:45 +0200)]
Check for out of bound writes in the QDM2 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a7876c6e4e62e94d51e364ba99aae4da7671238)

8 years agoFix out of bound reads in the QDM2 decoder.
Laurent Aimar [Fri, 30 Sep 2011 22:45:04 +0000 (00:45 +0200)]
Fix out of bound reads in the QDM2 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 491eaf35ae1f9b619441314bec33766e31580184)

8 years agoFix out of bound reads due to integer overflow in the ADPCM IMA Electronic Arts EACS...
Laurent Aimar [Fri, 30 Sep 2011 22:45:02 +0000 (00:45 +0200)]
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 346876ec168affe7c21be88d8f1acf1a75cc8409)

8 years agoCheck for out of bound reads in the Electronic Arts CMV decoder.
Laurent Aimar [Fri, 30 Sep 2011 22:45:01 +0000 (00:45 +0200)]
Check for out of bound reads in the Electronic Arts CMV decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a5d46235f3f70f0b620f8e54649ece45ecc5b170)

8 years agoPrevent NULL dereferences when missing the reference frame in the Electronic Arts...
Laurent Aimar [Fri, 30 Sep 2011 22:45:00 +0000 (00:45 +0200)]
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 113d7be62497c4e59db8f224fdb7f0a90cf17d03)

8 years agoFix potential pointer arithmetic overflows in the Electronic Arts CMV decoder.
Laurent Aimar [Fri, 30 Sep 2011 22:44:59 +0000 (00:44 +0200)]
Fix potential pointer arithmetic overflows in the Electronic Arts CMV decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e9064c9ce8ed18c3a3aab61e58e663b8f5b0c551)

8 years agoPrevent infinite loop in the ANM decoder.
Laurent Aimar [Fri, 30 Sep 2011 22:44:58 +0000 (00:44 +0200)]
Prevent infinite loop in the ANM decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 39993860e1525ca5d1b07521865b7e9e1b294ed7)

8 years agoFix double free on error in Deluxe Paint Animation demuxer.
Laurent Aimar [Fri, 30 Sep 2011 22:44:57 +0000 (00:44 +0200)]
Fix double free on error in Deluxe Paint Animation demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d39d7122e34d2cf994d6dc474fe0c8bee2f7fcfd)

8 years agoCheck for out of bound reads in AVS decoder.
Laurent Aimar [Fri, 30 Sep 2011 22:44:56 +0000 (00:44 +0200)]
Check for out of bound reads in AVS decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7afe9e5638242a3210a0fc378e34e3af41e29176)

8 years agoCheck for out of bound writes in the avs demuxer.
Laurent Aimar [Fri, 30 Sep 2011 22:44:55 +0000 (00:44 +0200)]
Check for out of bound writes in the avs demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5d44c061cf511d97be5fac8d76be2f3915c6e798)

8 years agoCheck for corrupted data in avs demuxer.
Laurent Aimar [Fri, 30 Sep 2011 22:44:54 +0000 (00:44 +0200)]
Check for corrupted data in avs demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1cce7def0a8eff2e7db294b7d195a0fb1a5043b0)

8 years agolavf: Avoid using av_malloc(0) in av_dump_format
Martin Storsjö [Fri, 30 Sep 2011 17:30:35 +0000 (20:30 +0300)]
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 e81e5e8ad2bb5746df0c343c396019aca165cf66)

8 years agoavcodec: reject audio packets with NULL data and non-zero size
Justin Ruggles [Sat, 24 Sep 2011 01:54:44 +0000 (21:54 -0400)]
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 6326afd5e90cfed9df08b652a1cd6f6a948c239a)

8 years agoFix out of bound writes in fix_bitshift() of the shorten decoder.
Laurent Aimar [Thu, 29 Sep 2011 22:05:53 +0000 (00:05 +0200)]
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 f42b3195d3f2692a4dfc0a8668bb4ac35301f2ed)

8 years agoCheck for out of bound reads in the Tiertex Limited SEQ decoder.
Laurent Aimar [Thu, 29 Sep 2011 22:05:47 +0000 (00:05 +0200)]
Check for out of bound reads in the Tiertex Limited SEQ decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5d7e3d71673d64a16b58430a0027afadb6b3a54e)

8 years agoFix the size of workspace buffers in the motion pixels decoder.
Laurent Aimar [Thu, 29 Sep 2011 22:05:49 +0000 (00:05 +0200)]
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 62234a4d3a30f3949694781ef8a941ef55b210fa)

8 years agoClear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer used...
Laurent Aimar [Thu, 29 Sep 2011 22:05:48 +0000 (00:05 +0200)]
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 e60619f9b4bdaf9af46887cdb2c86454567b4a61)

8 years agoCheck for out of bounds writes in the Delphine Software International CIN decoder.
Laurent Aimar [Thu, 29 Sep 2011 22:05:51 +0000 (00:05 +0200)]
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 3035c4034b6af3ad47f921e3385196e1b9d44ddf)

8 years agoCheck for out of bounds reads in the Delphine Software International CIN decoder.
Laurent Aimar [Thu, 29 Sep 2011 22:05:50 +0000 (00:05 +0200)]
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 8e5f093c2cf13eab3d68d893bf8f30c56ba4e733)

8 years agoCheck for out of bound reads in the QuickDraw decoder.
Laurent Aimar [Thu, 29 Sep 2011 22:05:46 +0000 (00:05 +0200)]
Check for out of bound reads in the QuickDraw decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 44e2f0c3cd2df68659e07ed3d5eab4974794eb33)

8 years agomov: Only touch extradata in mov_read_extradata() if codec_id is what we expect
Tomas Härdin [Wed, 28 Sep 2011 08:34:51 +0000 (10:34 +0200)]
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 e571305a71494af195891e314b05936f040f89d3)

8 years agoCheck for out of bound reads in xan_huffman_decode() of the xan decoder.
Laurent Aimar [Tue, 27 Sep 2011 22:45:54 +0000 (00:45 +0200)]
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 c8b835954ae4aef797112afda3b52f8dfe3c7b74)

8 years agodca: clear inactive subbands only once in qmf_32_subbands()
Mans Rullgard [Wed, 28 Sep 2011 20:00:35 +0000 (21:00 +0100)]
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 bf00a73ace9b1aba790b75dcb26d43adfceb769f)

8 years agovf_unsharp: set default chroma size value to 5x5
Stefano Sabatini [Sat, 13 Aug 2011 14:30:44 +0000 (16:30 +0200)]
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 1ee20141900c98f9dc25eca121c66c3ff468c1e4)

8 years agovf_unsharp: fix out-of-buffer read
Stefano Sabatini [Fri, 12 Aug 2011 06:42:35 +0000 (08:42 +0200)]
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 998e8519efbc772994c5ba19c0d39573998be9db)

8 years agoCheck for unsupported parameters in ff_j2k_dwt_init()
Laurent Aimar [Wed, 28 Sep 2011 23:04:54 +0000 (01:04 +0200)]
Check for unsupported parameters in ff_j2k_dwt_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b4483a531a139f304f4370f470325facb107202f)

8 years agoCheck for out of bound reads in jpeg 2000 decoder.
Laurent Aimar [Wed, 28 Sep 2011 23:04:53 +0000 (01:04 +0200)]
Check for out of bound reads in jpeg 2000 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 02660a871301adada14b0e0fe64c66f73c2e4541)

8 years agoPrevent calling init_vlc() with invalid parameters in motionpixels decoder.
Laurent Aimar [Wed, 28 Sep 2011 23:04:52 +0000 (01:04 +0200)]
Prevent calling init_vlc() with invalid parameters in motionpixels decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 41b7389cade702383e59343561776f83bb26e17f)

8 years agoPrevent NULL dereference when the palette is missing in the xan decoder.
Laurent Aimar [Wed, 28 Sep 2011 23:04:51 +0000 (01:04 +0200)]
Prevent NULL dereference when the palette is missing in the xan decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 56ee5a9ad1b385129c40ba4773f99bc5943ae8af)

8 years agoFixed out of bound accesses in xan_unpack() of the xan decoder.
Laurent Aimar [Wed, 28 Sep 2011 23:04:49 +0000 (01:04 +0200)]
Fixed out of bound accesses in xan_unpack() of the xan decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5279141c1d7a72c467b7e0666fc2275cbcec4668)

8 years agomovenc: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
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 194c2432eecd97c36914956f3bf7781ac4fc6f3d)

8 years agogxfenc: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
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 af84d9bb9e8a69a715fc7596d6cbaa00ad00dc29)

8 years agoaviobuf: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
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 247a1dc84716cb033b538a5bd5ba8b33de0e8260)

8 years agoavienc: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
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 e47cfe9e5c10eee3c8d0b6aff81792c0f10e66e1)

8 years agoavidec: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
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 71e23d39a396f45bbdf258735b02a4bd5e25fd49)

8 years ago4xm: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
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 0cc44facf17153454727c26f2f40ee2f77b90df5)

8 years agolibvpxenc: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
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 769298a6869c3b16557280a63f6502409d1b5e49)

8 years agobitstream: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
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 198ed6474d603f930430067b8b56955d443e821c)

8 years agoIntroduce av_realloc_f.
Nicolas George [Sun, 20 Mar 2011 18:39:20 +0000 (19:39 +0100)]
Introduce av_realloc_f.

av_realloc_f helps avoiding memory-leaks in typical uses of realloc.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5cd754bca290775ec2dbbf88597ab58e0482efca)

8 years agoIntroduce av_size_mult.
Nicolas George [Sun, 20 Mar 2011 18:39:20 +0000 (19:39 +0100)]
Introduce av_size_mult.

av_size_mult helps checking for overflow when computing the size of a memory
area.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b2600509fef4d77645491f208b8113c372a32110)

8 years agoCheck for out of bound reads in the flic decoder.
Laurent Aimar [Tue, 27 Sep 2011 20:05:15 +0000 (22:05 +0200)]
Check for out of bound reads in the flic decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1f024b882094b26c85e87698faa002b8713b5f88)

8 years agoPrevent out of bound accesses in the xan decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:53:47 +0000 (23:53 +0200)]
Prevent out of bound accesses in the xan decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit feca3ba053499e0d38f48910cef9bc431036956f)

8 years agoCheck for invalid/corrupted bitstream in sun raster decoder.
Laurent Aimar [Tue, 27 Sep 2011 19:24:03 +0000 (21:24 +0200)]
Check for invalid/corrupted bitstream in sun raster decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b9596a503760ccbd82ca3c03d1c0d5b9449be12b)

8 years agoPrevent NULL dereferences when missing the reference frame in the xan decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:43:57 +0000 (23:43 +0200)]
Prevent NULL dereferences when missing the reference frame in the xan decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 19e95b88459e879d3e67a66350d937c32ed762ca)

8 years agoCheck for out of bounds reads in sun rasterfile decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:43:53 +0000 (23:43 +0200)]
Check for out of bounds reads in sun rasterfile decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 039f3c33fffd2f4ae376b662ea4ec67c1d6a4c04)