wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
54017 commits 40 branches 405 tags 230 MiB
Commit graph

24412 commits

Author SHA1 Message Date
Michael Niedermayer
c112e36d41 flacdec: Fix used AVCodecContext 
Fixes out of array writes with multiple threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 22:31:54 +02:00
Michael Niedermayer
a9821bdafb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  4xm: check bitstream_size boundary before using it

Conflicts:
	libavcodec/4xm.c

See: 9c661e95

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 14:51:59 +02:00
Michael Niedermayer
e9f2e9715b Merge commit 'fbd0dacc8d' 
* commit 'fbd0dacc8d':
  4xm: refactor decode_p_block

Conflicts:
	libavcodec/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 14:39:21 +02:00
Michael Niedermayer
27e8298c03 Merge commit '94aefb1932' 
* commit '94aefb1932':
  4xm: do not overread the source buffer in decode_p_block

Conflicts:
	libavcodec/4xm.c

The checks are replaced by av_assert0() as the conditions should
be impossible. If these asserts fail, there is a bug elsewhere

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 14:10:06 +02:00
Michael Niedermayer
67d5d97cdc Merge commit 'be373cb50d' 
* commit 'be373cb50d':
  4xm: do not overread the prestream buffer

Conflicts:
	libavcodec/4xm.c

See: 9c661e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 13:57:07 +02:00
Michael Niedermayer
dbddd587e1 Merge commit 'de2e5777e2' 
* commit 'de2e5777e2':
  4xm: validate the buffer size before parsing it

Conflicts:
	libavcodec/4xm.c

See: 9c661e95

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 13:41:27 +02:00
Michael Niedermayer
f13f4d2b08 Merge commit '145023f572' 
* commit '145023f572':
  4xm: reject frames not compatible with the declared version

See: c433823750

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 13:14:42 +02:00
Michael Niedermayer
18cb3d355f Merge commit '1f0c607560' 
* commit '1f0c607560':
  4xm: drop pointless assert

Conflicts:
	libavcodec/4xm.c

The added condition is impossible to occur and thus is added to the assert.
The assert is not removed from the default case, as the default case cannot
occur. Thus either it should stay as is or the case as a whole be removed.
For extra safety, to ensure this doesnt change the assert is changed to
av_assert0()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 13:06:22 +02:00
Michael Niedermayer
e5558391b5 Merge commit 'b8b809908e' 
* commit 'b8b809908e':
  4xm: forward errors from decode_p_block

Conflicts:
	libavcodec/4xm.c

Impossible to be false check has been replaced by av_assert0()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 12:24:00 +02:00
Michael Niedermayer
294af51401 Merge commit '50ec1db62d' 
* commit '50ec1db62d':
  4xm: fold last_picture lazy allocation in decode_p_frame

Conflicts:
	libavcodec/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 12:12:33 +02:00
Michael Niedermayer
60657ee37a Merge commit 'e7a44f87d0' 
* commit 'e7a44f87d0':
  4xm: refactor fourxm_read_header

Conflicts:
	libavformat/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 10:08:50 +02:00
Michael Niedermayer
5c3e5651dd Merge commit '08859d19b4' 
* commit '08859d19b4':
  4xm: use the correct logging context
  g2meet: Fix a typo in the height comparison

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 09:41:45 +02:00
Michael Niedermayer
443b29e475 h264: Try parsing SPS as complete NAL in more cases 
Fixes Ticket2580

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 01:43:09 +02:00
Michael Niedermayer
8aea2f05dc alacenc: Fix missing sign_extend() 
Possibly fixes Ticket2497

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-12 16:23:49 +02:00
Luca Barbato
59d7bb99b6 4xm: check bitstream_size boundary before using it 
Prevent buffer overread.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-06-12 14:45:46 +02:00
Luca Barbato
fbd0dacc8d 4xm: refactor decode_p_block 
Directly return from code 1, 2 and 6 codepaths and simplify the
remaining one to have a single overflow check and a single call to
mcdc.
 2013-06-12 14:45:46 +02:00
Luca Barbato
94aefb1932 4xm: do not overread the source buffer in decode_p_block 
Check for out of picture macroblocks before calling mcdc.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-06-12 14:45:46 +02:00
Luca Barbato
be373cb50d 4xm: do not overread the prestream buffer 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-06-12 14:45:46 +02:00
Luca Barbato
de2e5777e2 4xm: validate the buffer size before parsing it 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-06-12 14:45:46 +02:00
Luca Barbato
145023f572 4xm: reject frames not compatible with the declared version 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-06-12 14:45:46 +02:00
Luca Barbato
1f0c607560 4xm: drop pointless assert 
Make sure the value of wlog2 is always between 0 and 3.
 2013-06-12 14:45:46 +02:00
Luca Barbato
b8b809908e 4xm: forward errors from decode_p_block 
Partially mitigate out of memory writes.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-06-12 14:45:46 +02:00
Luca Barbato
50ec1db62d 4xm: fold last_picture lazy allocation in decode_p_frame 2013-06-12 14:45:46 +02:00
Luca Barbato
e7a44f87d0 4xm: refactor fourxm_read_header 
Split sound and video tag parsing in separate functions.
 2013-06-12 14:45:46 +02:00
Luca Barbato
08859d19b4 4xm: use the correct logging context 2013-06-12 14:45:46 +02:00
Michael Niedermayer
7ad5708691 g2meet: Fix a typo in the height comparison 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-12 13:45:53 +02:00
Michael Niedermayer
d3c4ea8b35 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  g2meet: do not leak buffers
  g2meet: more graceful cursor loading
  g2meet: reset dimensions on header parsing errors

Conflicts:
	libavcodec/g2meet.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-12 11:53:27 +02:00
Kostya Shishkov
7dfc3381dd g2meet: do not leak buffers 2013-06-12 09:54:45 +02:00
Kostya Shishkov
4d960d7f60 g2meet: more graceful cursor loading 2013-06-12 09:54:45 +02:00
Kostya Shishkov
767ae86cee g2meet: reset dimensions on header parsing errors 2013-06-12 09:54:45 +02:00
Michael Niedermayer
73d5cf8f43 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: add a libwavpack encoder wrapper

Conflicts:
	Changelog
	doc/encoders.texi
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-11 09:36:34 +02:00
Michael Niedermayer
5d199c3ad9 Merge commit '799f57ac96' 
* commit '799f57ac96':
  lavc: use AVFrame API properly in pad_last_frame().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-11 09:27:04 +02:00
Michael Niedermayer
175e916fa2 avcodec/utils: Fix encoder allocation size 
Fixes Ticket2645
Found-by: Darrell Walisser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-11 01:15:39 +02:00
Anton Khirnov
84d3ff50cd lavc: add a libwavpack encoder wrapper 2013-06-10 21:33:48 +02:00
Anton Khirnov
799f57ac96 lavc: use AVFrame API properly in pad_last_frame(). 
This also simplifies the code.
 2013-06-10 21:19:51 +02:00
Michael Niedermayer
8e887ca1fe jpeg2000dec: Check bpno in decode_cblk() 
Fixes integer overflow in fate-redcode-demux

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-10 17:13:46 +02:00
Michael Niedermayer
e473f7e659 (lib)utvideodec: remove setting of color_primaries 
Thanks-to: Paranoialmaniac
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-10 16:00:59 +02:00
Michael Niedermayer
9908607363 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  utvideodec: Set colorspace by codec_tag.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-10 10:43:43 +02:00
Stephen Hutchinson
3f54547709 utvideo: Add ULH0 and ULH2 decoding to the native decoder. 
Also prevents an error since the native decoder (if enabled) is
always used to probe Ut Video-encoded files, even if the user
forces libutvideo to be the decoder. Without this patch, the probe
would fail, and the video wouldn't get properly handed over,
resulting in failure to set codec parameters. When the native
decoder is disabled, libutvideo can probe and initialize decoding
without issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-10 10:15:13 +02:00
Stephen Hutchinson
8ed6c13fe3 libutvideo: Add ULH0 and ULH2 decoding when using version 13.0.1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-10 10:12:15 +02:00
Yusuke Nakamura
252ee3d39b utvideodec: Set colorspace by codec_tag. 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2013-06-10 09:38:22 +02:00
Yusuke Nakamura
b441fdeb15 utvideodec: Support ULH0 and ULH2 formats. 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2013-06-10 09:37:53 +02:00
Carl Eugen Hoyos
052838f765 Insert a newline before showing embedded svq1 messages. 
Messages may start with a carriage return.
 2013-06-09 19:25:43 +02:00
Michael Niedermayer
2d8f880a9b g2meet: fix typo in height comparission 
Fixes CID1030349
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-09 16:55:10 +02:00
Michael Niedermayer
ada497e616 g2meet: Check cursor parameters before writing them in the context 
Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-09 12:00:57 +02:00
Michael Niedermayer
6d3bcbb211 avcodec/g2meet: check framebuf has been allocated before use 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-09 03:09:26 +02:00
Michael Niedermayer
9e9ec5ad2a smvjpegdec: No frame at all is an error 
This fixes a infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 20:02:22 +02:00
Paul B Mahol
b94f045b18 wavpack: add missing .\n to entropy error message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-08 17:39:54 +00:00
Michael Niedermayer
f973f17416 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  faxcompr: return meaningful errors

Conflicts:
	libavcodec/faxcompr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 12:38:18 +02:00
Michael Niedermayer
a5a9bcc876 Merge commit 'f32aefcf34' 
* commit 'f32aefcf34':
  faxcompr: K&R formatting cosmetics

Conflicts:
	libavcodec/faxcompr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 12:30:15 +02:00