RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
48,760 Commits 36 Branches 392 Tags 250 MiB
Commit Graph

22151 Commits

Author SHA1 Message Date
Michael Niedermayer d9226b3717 mpegvideo: dont leave stale pointers in next/last picture 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 04:46:08 +01:00
Michael Niedermayer cc548ea7a6 vc1dec: ensure cbpcy_vlc has been set before decoding a frame. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 04:09:21 +01:00
Michael Niedermayer b53adef07b h264: reset first_field when current_picture_ptr is reset 
Fixes NULL pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 23:14:51 +01:00
Michael Niedermayer 969e75eb80 mjpegdec: Fix out of array read in unescaping code 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 18:20:25 +01:00
Michael Niedermayer 8d06be6b8c wavpack: check pointer to avoid overreading input buffer 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 16:37:31 +01:00
Michael Niedermayer 85a4dbeb9c ra144enc: fix two "may be used uninitialized in this function" warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 15:43:46 +01:00
Michael Niedermayer f137d5763d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: enable pic for shared libs on AArch64
  zmbv: Reset the decoder on keyframe errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 13:38:37 +01:00
Michael Niedermayer 6fc0648932 Merge commit '7b8c5b263bc680eff5710bee5994de39d47fc15e' 
* commit '7b8c5b263bc680eff5710bee5994de39d47fc15e':
  vc1dec: prevent a crash due missing pred_flag parameter
  matroska: Fix use after free

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 13:01:07 +01:00
Michael Niedermayer 8bfc8d88be Merge commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30' 
* commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30':
  vp3: Fix double free in vp3_decode_end()
  fate: Split fate-siff test into demuxer and VB video decoder test

Conflicts:
	tests/fate/demux.mak
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 12:30:32 +01:00
Luca Barbato c1d1ef4ecd zmbv: Reset the decoder on keyframe errors 
Prevent the crash on fuzzed files as reported in bug 63.
 2013-01-11 05:07:42 +01:00
Vladimir Pantelic 7b8c5b263b vc1dec: prevent a crash due missing pred_flag parameter 
Handle pred_flag parameter not given to get_mvdata_interlaced()

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-11 04:57:41 +01:00
Michael Niedermayer 23318a5735 error_concealment: Check that the picture is not in a half setup state. 
Fixes state becoming inconsistent
Fixes a null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 04:46:49 +01:00
Michael Niedermayer 8b47058c61 ass_split: fix out of array access in ass_split() 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 02:51:54 +01:00
Michael Niedermayer 97b1ba696b ass_split: fix out of array access 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 02:31:31 +01:00
Michael Niedermayer 2c16bf2de0 vorbisdec: Check bark_map_size. 
This fixes potential divisions by zero and out of array accesses.

Reported-by: Dale Curtis <dalecurtis@chromium.org>
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 00:58:40 +01:00
Ronald Bultje ec86ba5731 vp3: Fix double free in vp3_decode_end() 
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-10 20:05:42 +01:00
Carl Eugen Hoyos b563afe6fa Do not allow arbitrary packet size in aac decoder. 
Fixes a crash with a file containing a 400MB packet reported in bug 420.
 2013-01-10 13:03:15 +01:00
Michael Niedermayer 65b8527993 Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a' 
* commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a':
  idcinvideo: correctly set AVFrame defaults
  yadif: Port inline assembly to yasm
  au: remove unnecessary casts
  au: return AVERROR codes instead of -1

Conflicts:
	libavcodec/idcinvideo.c
	libavfilter/x86/yadif_template.c
	libavformat/au.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 12:27:16 +01:00
Carl Eugen Hoyos f023003ce6 Fix compilation with --disable-everything. 2013-01-10 10:04:46 +01:00
Michael Niedermayer 6471f63da2 wmalosslessdec: make arrays indexed by ch large enough for maximum number of channels 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 04:57:50 +01:00
Michael Niedermayer 7cb46b5191 targa: use checked bytestream read 
Fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 04:57:50 +01:00
Michael Niedermayer 2b12d1ffd8 qdm2: fix out of stack array read. 
The read value is not used when its outside the array.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 04:57:50 +01:00
Justin Ruggles f7bf72a4a1 idcinvideo: correctly set AVFrame defaults 2013-01-09 14:49:06 -05:00
Michael Niedermayer 4765f63538 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  xan: Convert to bytestream2
  oggenc: add a page_duration option and deprecate the pagesize option
  x86: lavr: add SSE2/AVX dither_int_to_float()

Conflicts:
	libavcodec/xan.c
	libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-09 12:30:14 +01:00
Alexandra Khirnova d744801f1a xan: Convert to bytestream2 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-09 09:59:55 +01:00
Michael Niedermayer 57bdd67646 dirac: fix inverted check 
Regression since: ea6da80
Fixes Ticket2123

I cannot reproduce any regressions by flipping the wrong condition
to how it should have been.

Thanks-to: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-09 01:08:39 +01:00
Michael Niedermayer 86159703f5 ff_find_pix_fmt: return NONE for the "not found" case. 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 14:32:19 +01:00
Michael Niedermayer 4c80184cf5 mjpegdec: allow 2 components in ljpeg_decode_yuv_scan() 
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 02:54:21 +01:00
Michael Niedermayer 3b57bb478f svq1dec: check that the reference frame matches in size before using it. 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 00:28:35 +01:00
Clément Bœsch dbf0a90572 lavc: fix forgotten "que" reference. 
This should have been part of 491ca0e8.
 2013-01-07 22:07:50 +01:00
Michael Niedermayer f65daf577a rv10: always check direct mode interpolation times. 
Fixes Division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 21:35:52 +01:00
Michael Niedermayer 7fb87bc5f2 mpeg12enc: check dimension validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 15:47:21 +01:00
Michael Niedermayer bcc4ef1a41 mpeg12enc: Correctly mask dimensions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 15:47:06 +01:00
Michael Niedermayer 878e5bd6f5 mpeg12: Support decoding dimensions that are a multiple of 4096 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 15:31:00 +01:00
Paul B Mahol 2a89081cad Add EVRCA and SMV codec id 
Demuxing files should be possible even if there are
no decoding support in lavc (yet).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 11:43:20 +00:00
Paul B Mahol 2516023695 012v: remove double ; and return correct error code if ff_get_buffer() fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 10:48:02 +00:00
Michael Niedermayer c526a01c91 Merge commit '4f50646697606df39317b93c2a427603b77636ee' 
* commit '4f50646697606df39317b93c2a427603b77636ee':
  x86: sbrdsp: Implement SSE qmf_post_shuffle

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:51:10 +01:00
Michael Niedermayer 8429320313 Merge commit '44a0036d10579ed91e48df24859e54b08a582742' 
* commit '44a0036d10579ed91e48df24859e54b08a582742':
  x86: sbrdsp: Implement SSE sum64x5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:40:05 +01:00
Michael Niedermayer ea93ccf079 Merge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0' 
* commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0':
  x86: ABS1: port to cpuflags
  v210x: cosmetics, reformat

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:35:18 +01:00
Michael Niedermayer 55d8cac254 Merge commit '6689474b91049411b5b7986616d1c66b701ae11f' 
* commit '6689474b91049411b5b7986616d1c66b701ae11f':
  v210x: return meaningful error codes.
  r210dec: return meaningful error codes.
  vb: cosmetics, reformat

Conflicts:
	libavcodec/vb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:30:23 +01:00
Michael Niedermayer 501db2f32b Merge commit '9dbbda235d93d628777b986e502213f1ed390973' 
* commit '9dbbda235d93d628777b986e502213f1ed390973':
  vb: return meaningful error codes.
  ptx: return meaningful error codes.
  tiff: return meaningful error codes.
  vqavideo: return meaningful error codes.
  mss2: return meaningful error codes.
  v210dec: return meaningful error codes
  indeo2: cosmetics, reformat

Conflicts:
	libavcodec/indeo2.c
	libavcodec/tiff.c
	libavcodec/v210dec.c
	libavcodec/vb.c
	libavcodec/vqavideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:24:32 +01:00
Michael Niedermayer 4b20d307b3 Merge commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8' 
* commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8':
  indeo2: check decoding errors.
  indeo2: return meaningful error codes
  rl2: cosmetics, reformat

Conflicts:
	libavcodec/rl2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:11:14 +01:00
Michael Niedermayer d30660306c Merge commit '3c6e5a840c45fd3b832e86881602a72e47d46f19' 
* commit '3c6e5a840c45fd3b832e86881602a72e47d46f19':
  rl2: use fixed-width integer types where appropriate
  rl2: return meaningful error codes.
  cljr: return a meaningful error code.
  fraps: cosmetics, reformat

Conflicts:
	libavcodec/fraps.c
	libavcodec/rl2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:01:13 +01:00
Michael Niedermayer 07f22d0b49 Merge commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4' 
* commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4':
  fraps: return meaningful error codes.
  kgv1dec: return meaningful error codes.
  kmvc: return meaningful error codes.
  wnv1: return meaningful error codes.
  dpx: return meaningful error codes.
  truemotion1: return meaningful error codes
  pnm: return meaningful error codes.

Conflicts:
	libavcodec/dpx.c
	libavcodec/fraps.c
	libavcodec/kmvc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 00:41:06 +01:00
Michael Niedermayer 7b018e5c8d Merge commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4' 
* commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4':
  xl: return a meaningful error code.
  xan: return a meaningful error code.
  xxan: return meaningful error codes.
  zmbv: return more meaningful error codes.
  yop: use a meaningful error code.
  c93: return meaningful error codes.
  bmv: return meaningful error codes.
  bmp: return meaningful error codes.
  bink: operate with pointers to AVFrames instead of whole structs.
  bink: return meaningful error codes.
  bfi: return meaningful error codes.
  bethsoftvideo: return meaningful error codes.

Conflicts:
	libavcodec/c93.c
	libavcodec/xl.c
	libavcodec/xxan.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 23:59:35 +01:00
Michael Niedermayer 6190446745 Merge commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355' 
* commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355':
  avs: return meaningful error codes.
  aura: return meaningful error codes.
  asvdec: return meaningful error codes.
  ansi: return a meaningful error code
  anm: return meaningful error codes
  aasc: return meaningful error codes.
  8bps: return meaningful error codes.
  4xm: operate with pointers to AVFrames instead of whole structs.
  4xm: eliminate a pointless indirection

Conflicts:
	libavcodec/4xm.c
	libavcodec/aasc.c
	libavcodec/anm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 23:48:48 +01:00
Michael Niedermayer a2aeaff40f Merge commit 'aa15afb7ce850e2ac688efdef189df5da817a646' 
* commit 'aa15afb7ce850e2ac688efdef189df5da817a646':
  4xm: simplify code with FFSWAP
  4xm: return meaningful error codes

Conflicts:
	libavcodec/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 23:41:19 +01:00
Carl Eugen Hoyos 9ff92cf195 012v decoder. 
The decoder also supports a12v, but removes the transparency layer
since no samples with actual transparency are available for testing.
 2013-01-06 17:59:27 +01:00
Diego Biurrun a0c5917f86 Drop Snow codec 
Snow is a toy codec with no real-world use and horrible code.
 2013-01-06 16:30:02 +01:00
Michael Niedermayer 3db02b83e7 dnxhd: Add avpriv_dnxhd_get_frame_size() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 13:58:46 +01:00