virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
53,516 Commits 37 Branches 400 Tags 462 MiB
a05db52c12
Commit Graph

53516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stefano Sabatini
a8d98377b1 lavfi/geq: prefer symbolic constants 
Hopefully enhance readability.
 2013-05-21 21:15:08 +02:00
Stefano Sabatini
2210003b7f lavfi/geq: add aliases for RGB options 2013-05-21 21:15:00 +02:00
Paul B Mahol
dbb49a6539 vp3: zero allocated tables 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-21 17:49:29 +00:00
Martin Storsjö
5b2b0b912d configure: Enable the strtod workaround when building for bionic 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-21 19:37:07 +03:00
Michael Niedermayer
66f5790d7b seek-test: make duration user configurable 
Previously this was hardcoded to 4 seconds

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 18:13:25 +02:00
Clément Bœsch
b8a9876a8b lavfi/yadif: add timeline support. 2013-05-21 16:09:42 +02:00
Michael Niedermayer
b1bbd715d8 avcodec/huffman: increase bits constant 
Fixes Ticket2593

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 13:51:04 +02:00
Michael Niedermayer
b9ea6a8414 avcodec/huffman: use named identifer for the bits constant 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 13:51:04 +02:00
Michael Niedermayer
1d7e6a6bde avcodec/bitstream: print vlc length in error case. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 13:51:04 +02:00
Michael Niedermayer
b60a65ee2d mjpegdec: fix AV_PIX_FMT_YUVJ411P handling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 12:56:12 +02:00
Michael Niedermayer
a90baa63c3 add YUVJ411P 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 12:56:11 +02:00
Michael Niedermayer
1d8b1f0e51 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  proresdec: simplify slice component offsets handling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 12:01:58 +02:00
Michael Niedermayer
6ef7b6af6b Merge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8' 
* commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8':
  mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac

Conflicts:
	libavcodec/mjpegdec.c

See: 1f41cffe1e

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 12:01:37 +02:00