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

53529 Commits

Author SHA1 Message Date
Clément Bœsch a0a41db339 lavfi/testsrc: make nb_decimals available only in testsrc. 2013-05-23 17:22:05 +02:00
Clément Bœsch 288f916643 lavfi/testsrc: move color options to the color scope filter definition. 2013-05-23 17:22:05 +02:00
Michael Niedermayer eee19198ef avcodec/libfaac: fallback to a supported bitrate if the requested is not supported 
Fixes: Ticket2587

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 15:37:48 +02:00
Michael Niedermayer e8c26557a4 avformat/mtv: remove empty comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 14:46:01 +02:00
Michael Niedermayer ef43b9496b avcodec/mpegvideo: remove empty comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 14:43:42 +02:00
Michael Niedermayer 1d3476f258 postproc/postprocess_template: remove empty comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 14:39:58 +02:00
Darryl Wallace 3e16047507 s302m encoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 12:03:06 +00:00
Paul B Mahol fbd0f91a3a escape130: switch to init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 10:21:12 +00:00
Michael Niedermayer ac2c52174f avcodec/wavpack: remove ;; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 12:07:31 +02:00
Paul B Mahol 79f452f4e6 fraps: set avctx->color_range 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 10:05:28 +00:00
Paul B Mahol 591fa05278 doc/general: remove obsolete info about APE decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 09:32:12 +00:00
Michael Niedermayer b7d16dc4bd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wavpack: check packet size early

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 10:55:46 +02:00
Michael Niedermayer 402bec52d4 Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62' 
* commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62':
  wavpack: use bytestream2 in wavpack_decode_block

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 10:46:05 +02:00
Michael Niedermayer 1fded9b69c Merge commit 'f36d7831d96aeb072db5a2b78892a534d96e288e' 
* commit 'f36d7831d96aeb072db5a2b78892a534d96e288e':
  pixdesc: mark gray8 as pseudopal

Conflicts:
	libavutil/pixdesc.c

No change as gray8 was already marked as pseudopal in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 10:33:45 +02:00
Michael Niedermayer 1724123c65 Merge commit '3eae9b030cbbdc263f69834b791624613032d548' 
* commit '3eae9b030cbbdc263f69834b791624613032d548':
  mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 10:25:25 +02:00
Dale Curtis c54a1565f5 avformat/utils: Keep internal and external av_read_frame() packets in sync. 
Otherwise, during error conditions, the caller will be left with
dangling pointers to a destructed packet => boom.

BUG=242786
TEST=ffmpeg_regression_tests

Commit slightly simplified by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 03:29:47 +02:00
Paul B Mahol 1f02927d28 lavfi/mp: try to pass interlaced & tff flags 
This makes mp=softpulldown actually useful.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-22 20:30:09 +00:00
Clément Bœsch 91b461459a lavfi/lut3d: avoid overread. 2013-05-22 22:12:14 +02:00
Luca Barbato fd06291239 wavpack: check packet size early 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-05-22 22:02:57 +02:00
Luca Barbato 3f0b6d7a62 wavpack: use bytestream2 in wavpack_decode_block 
Prevent most out of buffer reads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-05-22 22:02:55 +02:00
Michael Niedermayer 657875b145 avcodec/aic: Fix vlc value checks 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 21:30:28 +02:00
Anton Khirnov f36d7831d9 pixdesc: mark gray8 as pseudopal 
Many functions treat it as such already.
Fixes Bug 499.

CC:libav-stable@libav.org
 2013-05-22 21:18:08 +02:00
Michael Niedermayer 30df9789a9 proresdec: Fix end condition 
Fixes out of array writes
No FFmpeg release is affected by this

This also fixes some artifacts

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 20:24:50 +02:00
Michael Niedermayer df3ee7b9a9 smvjpegdec: use av_pix_fmt_desc_get() avoid direct table access 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 20:24:50 +02:00
Clément Bœsch 165bc9caa2 v4l2: make possible to disable libv4l2 at runtime. 
Also disable it by default since it looks currently buggy. The
usefulness of such library is mostly limited to backward compatibility
with very old devices.
 2013-05-22 19:49:29 +02:00
Clément Bœsch 12f51c1f9e lavfi: add lut3d filter. 
Fixes part of Ticket #2517.
 2013-05-22 18:23:43 +02:00
Michael Niedermayer ad22767cb6 shorten: fix "off by padding" bug 
Fixes array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 17:40:12 +02:00
Janne Grunau 3eae9b030c mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes 
ff_mpeg_unref_picture clears the flag indicating that the frame needs to
be reallocated after a frame size change. Since we have now reference
counted buffers we can unref the buffers immediately.
 2013-05-22 15:40:12 +02:00
Ash Hughes 14ec9d2590 Support playing SMV files. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 15:20:22 +02:00
Michael Niedermayer cc0db8cf30 avienc: Disallow the first frame to be skiped 
Fixes Ticket2386

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 14:11:42 +02:00
Michael Niedermayer c88e52e797 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Enable the strtod workaround when building for bionic

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 10:57:46 +02:00
Michael Niedermayer 32f550ee01 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Add a fate test for ProRes Transparency.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 04:40:12 +02:00
Michael Niedermayer 914ab4cd1c j2kdec & jpeg2000dec: check lengthinc against array size 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 04:18:38 +02:00
Michael Niedermayer 17e66c9ff4 j2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocation 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 03:18:55 +02:00
Michael Niedermayer 53f0442464 avcodec/jpeg2000dec: Port tile size check from j2kdec 
Fixes potential integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 03:16:52 +02:00
Michael Niedermayer 73ffab4195 jpeg2000dec: check TPsot 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 02:53:21 +02:00
Michael Niedermayer fec8783883 jpeg2000dec: read and check curtileno 
Fixes out of array accesses
Code ported from j2kdec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 02:29:49 +02:00
Michael Niedermayer f399b33c2b jpeg2000dec & j2kdec: Fix return type of get_sot() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 02:14:04 +02:00
Michael Niedermayer 4a9a6a1f35 vcodec/jpeg2000dec: fix av_log() type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 02:05:50 +02:00
Michael Niedermayer 8d9fa738f5 j2kdec: cosmetics from jpeg2000dec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 01:25:52 +02:00
Michael Niedermayer 0b42631641 avcodec/jpeg2000dec: merge bytestream2 reading from j2kdec 
This fixes at least one out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 01:24:47 +02:00
Michael Niedermayer c649ecb3b2 avcodec/jpeg2000dec: get_qcx, fix stack and heap overwrites 
This is likely remotely exploitable
Fix ported from j2kdec
No uptodate FFmpeg release should be affected by this

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 00:07:45 +02:00
Carl Eugen Hoyos 898268a23b Add a fate test for ProRes Transparency. 2013-05-21 23:09:19 +02:00
Paul B Mahol f98dbc7311 lavu/opt: check if class is NULL too 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-21 20:50:49 +00:00
Clément Bœsch 39dc1bc90f lavfi/(a)showinfo: use link frame counter instead of local counter. 2013-05-21 22:29:16 +02:00
Michael Niedermayer 81bec0ace4 avutil/pixfmt: add forgotten deprecated to YUVJ411 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 21:49:28 +02:00
Michael Niedermayer 069ede2981 jpeg2000dec: Check ncomponents and tile dimensions 
Fixes various problems

Code ported from j2kdec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 21:44:34 +02:00
Michael Niedermayer 78c7bff04a avcodec/j2k: rename J2K_ constants to JPEG2000_ 
This should simplify merging the 2 decoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 21:44:34 +02:00
Michael Niedermayer 0ab0ed2b86 j2k: Rename structs to be more similar to jpeg2000dec 
This should simplify merging

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 21:44:34 +02:00
Michael Niedermayer 376e89e280 j2kdec: s/decode_packets/jpeg2000_decode_packets/ 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 21:44:34 +02:00