]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Thu, 26 Sep 2013 01:13:38 +0000 (03:13 +0200)]
avformat/mpegenc: Better heuristic for ordering packets
This prevents underflows in quite constrained cases
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Sep 2013 01:09:29 +0000 (03:09 +0200)]
avformat/mpegenc: Better default for max_delay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Sep 2013 00:16:12 +0000 (02:16 +0200)]
avformat/mpegenc: change assert to av_assert0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Sep 2013 23:07:24 +0000 (01:07 +0200)]
avformat/mpegenc: improve field names in underflow error message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Sep 2013 19:42:56 +0000 (21:42 +0200)]
avcodec/wmalosslessdec: Fix return code for invalid buffer sizes
Fixes infinite loop
Fixes Ticket2979
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 25 Sep 2013 19:35:06 +0000 (19:35 +0000)]
avcodec/flicvideo: fix infinite loops
Fixes #2995.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 25 Sep 2013 18:10:24 +0000 (20:10 +0200)]
avcodec/wmaprodec: check that there are input bits left in decode_subframe_length()
Fixes infinite loop
Fixes Ticket2987
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Sep 2013 16:26:13 +0000 (18:26 +0200)]
avcodec/lagarith: check scaled probabilities
Prevents infinite loop
Fixes Ticket2988
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Sep 2013 14:30:25 +0000 (16:30 +0200)]
avcodec/cabac: remove h264_lps_state
The only use case of it was the selftest code, and there the slightly more
complex indexing that is needed after its removial doesnt matter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Sep 2013 09:02:25 +0000 (11:02 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc doxy: document that avcodec_flush_buffers() invalidates decoded frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Sep 2013 08:52:47 +0000 (10:52 +0200)]
Merge commit '
2725f2d40315b56f17c5dffe39dda7d94786302d '
* commit '
2725f2d40315b56f17c5dffe39dda7d94786302d ':
doc/filters: fix an option name in the unsharp docs
Conflicts:
doc/filters.texi
See:
b7b72963e06f21fb985c58100c7d048cfea2736a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Sep 2013 08:21:04 +0000 (10:21 +0200)]
Merge commit '
cab8c5f8e140c96ba3725ab709d823abfd1e31a5 '
* commit '
cab8c5f8e140c96ba3725ab709d823abfd1e31a5 ':
h264: do not reinitialize the global cabac tables at each slice header
See:
1e2e2c8095de2d9ea3259305cfeff28f40e4ca12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Sep 2013 08:02:09 +0000 (10:02 +0200)]
Merge commit '
e880418660c80e2f12a123e131975cdb6b12cd13 '
* commit '
e880418660c80e2f12a123e131975cdb6b12cd13 ':
cabac: remove write-only h264_mps_state[]
Conflicts:
libavcodec/cabac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Sep 2013 07:38:33 +0000 (09:38 +0200)]
Merge commit '
668643b9239c70b777aea322eab411ebc960d9a0 '
* commit '
668643b9239c70b777aea322eab411ebc960d9a0 ':
matroskadec: check av_strdup() when setting defaults
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Sep 2013 00:08:04 +0000 (02:08 +0200)]
avcodec/pngdec: check for stream end in png_decode_idat()
Fix infinite loop
Fix Ticket2978
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Sep 2013 22:44:17 +0000 (00:44 +0200)]
avcodec/mpegvideo_enc: check qmin/qmax
Fixes Ticket2990
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Sep 2013 22:25:23 +0000 (00:25 +0200)]
avcodec/g2meet: fix regression with rgb cursors
Fixes Ticket2972
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 18 Jun 2013 09:35:44 +0000 (11:35 +0200)]
lavc doxy: document that avcodec_flush_buffers() invalidates decoded frames
Anton Khirnov [Thu, 11 Jul 2013 02:44:41 +0000 (04:44 +0200)]
doc/filters: fix an option name in the unsharp docs
Michael Niedermayer [Tue, 24 Sep 2013 15:14:21 +0000 (17:14 +0200)]
avcodec/mpegvideo: drop emu edge check from chroma_4mv_motion_lowres()
This is in line with the other functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sun, 11 Aug 2013 10:14:44 +0000 (12:14 +0200)]
h264: do not reinitialize the global cabac tables at each slice header
Anton Khirnov [Sun, 11 Aug 2013 10:12:43 +0000 (12:12 +0200)]
cabac: remove write-only h264_mps_state[]
Anton Khirnov [Wed, 4 Sep 2013 06:55:17 +0000 (08:55 +0200)]
matroskadec: check av_strdup() when setting defaults
Alex Smith [Tue, 24 Sep 2013 13:16:32 +0000 (09:16 -0400)]
ffhash: Change size to an int
This fixes compilation with MSVC and ICL, and makes ffhash consistent
with how the rest of the codebase uses read().
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Sep 2013 13:53:50 +0000 (15:53 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: add support for interleaved chroma formats to libx264.
Conflicts:
libavcodec/libx264.c
See:
283fb76d3d6eef1337ed493eae25fc0fc3752ce7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Sep 2013 13:43:22 +0000 (15:43 +0200)]
Merge commit '
a454dec19aa6666b555deec431bc42eda391d7b6 '
* commit '
a454dec19aa6666b555deec431bc42eda391d7b6 ':
pixdesc: fix NV20* descriptors
h264_sei: check SEI size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Sep 2013 13:38:08 +0000 (15:38 +0200)]
Merge commit '
71cabb521ac397db3903011d2de7afd3e0fc7ab6 '
* commit '
71cabb521ac397db3903011d2de7afd3e0fc7ab6 ':
h264: do not discard NAL_SEI when skipping frames
Conflicts:
libavcodec/h264.c
See:
7d75fb381ba774a8d2fa7de0c12140cd465c0255
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Sep 2013 13:23:01 +0000 (15:23 +0200)]
Merge commit '
edaba18021e4793116f0f266e65077578a5e742e '
* commit '
edaba18021e4793116f0f266e65077578a5e742e ':
h264: log extradata skip only for non-ignored NALs
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Sep 2013 13:03:32 +0000 (15:03 +0200)]
Merge commit '
26179964ff3fa1173e6f512c5735ba8223e2395d '
* commit '
26179964ff3fa1173e6f512c5735ba8223e2395d ':
h264_sei: log unknown sei messages
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Sep 2013 12:55:14 +0000 (14:55 +0200)]
Merge commit '
5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d '
* commit '
5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d ':
mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0
Conflicts:
libavcodec/mpegvideo.c
The chroma_*_shift and codec_tag code was not under a size!=0 check in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Sep 2013 12:35:47 +0000 (14:35 +0200)]
Merge commit '
d6d27f3e58e6980bce4a490e7d8cc0f6a84521fe '
* commit '
d6d27f3e58e6980bce4a490e7d8cc0f6a84521fe ':
configure: Enable -Qansi-alias for icl 14+
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Kieran Kunhya [Sun, 22 Sep 2013 15:54:47 +0000 (10:54 -0500)]
lavc: add support for interleaved chroma formats to libx264.
Interleaved chroma is x264's native format
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Sun, 22 Sep 2013 10:42:18 +0000 (05:42 -0500)]
pixdesc: fix NV20* descriptors
They were inconsistent (overlapping fields and wrong sizes)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Rainer Hochecker [Thu, 19 Sep 2013 14:26:24 +0000 (16:26 +0200)]
h264: do not discard NAL_SEI when skipping frames
Setting AVDISCARD_NONREF (e.g. after flushing) resulted in 100% dropped frames.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Thu, 19 Sep 2013 14:26:25 +0000 (16:26 +0200)]
h264_sei: check SEI size
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Vittorio Giovara [Fri, 20 Sep 2013 13:42:41 +0000 (15:42 +0200)]
h264: log extradata skip only for non-ignored NALs
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Vittorio Giovara [Thu, 19 Sep 2013 15:28:41 +0000 (17:28 +0200)]
h264_sei: log unknown sei messages
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Martin Storsjö [Tue, 24 Sep 2013 09:02:39 +0000 (12:02 +0300)]
mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0
This fixes breakage in a few fate tests on certain setups
(that for some reason didn't break on OS X) after the previous
commit (
8812a8057 ). Currently, some video streams are initialized
in ff_MPV_common_init with width/height set at 0 and only changed
to a proper video size with ff_MPV_common_frame_size_change later.
The breakage was diagnosed by Anton Khirnov.
Signed-off-by: Martin Storsjö <martin@martin.st>
Alex Smith [Tue, 24 Sep 2013 08:30:38 +0000 (04:30 -0400)]
configure: Enable -Qansi-alias for icl 14+
Qansi-alias worked on 12.x, then caused miscompilation on 13.x, but now
works again passing all FATE tests for icl version 14.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Tue, 24 Sep 2013 08:48:14 +0000 (10:48 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h263dec: Remove a hack that can cause infinite loops
Conflicts:
libavcodec/h263dec.c
See:
d2981b8ef191fc7876e3486e42222ab6a8777c24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 23:02:51 +0000 (01:02 +0200)]
avcodec/mjpegenc: dont store DQT for LJPEG
This may improve compatibility of lgpegs generated by libavcodec
also encoded ljpegs become slightly smaller
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 22:29:02 +0000 (00:29 +0200)]
avformat/omadec: simplify checks in nprobe()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Mon, 23 Sep 2013 16:35:57 +0000 (18:35 +0200)]
doc/outdevs: add sdl window_fullscreen option
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 23 Sep 2013 09:25:48 +0000 (12:25 +0300)]
h263dec: Remove a hack that can cause infinite loops
The actual usefulness of the hack is not known, and it does cause
infinite loops with some broken input files.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Mon, 23 Sep 2013 00:18:58 +0000 (20:18 -0400)]
vp8: fix PPC assembly and bilinear C code to work if src_stride != dst_stride.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 13:04:05 +0000 (15:04 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/dualinput: reimplement on top of framesync.
lavfi: add an API to synchronize multiple video inputs.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 12:57:30 +0000 (14:57 +0200)]
avcodec/vc1dec: fix propagating error codes from various functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 12:53:48 +0000 (14:53 +0200)]
avcodec/vc1dec: Fix return code on malloc() failure from ff_vc1_decode_init_alloc_tables()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 12:47:01 +0000 (14:47 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenchint: Clear size and len if the realloc failed
Conflicts:
libavformat/movenchint.c
See:
63621762eccf4c825ef1d42251b0d45d0c498826
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 12:40:06 +0000 (14:40 +0200)]
Merge commit '
f2b00a5372bfa1d82a8ab99cb8eafac8a9473494 '
* commit '
f2b00a5372bfa1d82a8ab99cb8eafac8a9473494 ':
movenc: Return a proper error code for invalid combinations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 12:34:18 +0000 (14:34 +0200)]
Merge commit '
23d6ba2c44540eb39c6880e4cbd527d297d264a9 '
* commit '
23d6ba2c44540eb39c6880e4cbd527d297d264a9 ':
vc1dec: Check the error handling flags on slice/field header decode errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 12:27:09 +0000 (14:27 +0200)]
Merge commit '
f7e616959aff8706edccdae763c24c897c449f6f '
* commit '
f7e616959aff8706edccdae763c24c897c449f6f ':
electronicarts: Check packet sizes before reading
Conflicts:
libavformat/electronicarts.c
See:
fb1ea777b3a01be6d71a103529ad37982707cacc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 12:13:43 +0000 (14:13 +0200)]
Merge commit '
ce67f442be0f6c4a8794272873852e256b5b8ee4 '
* commit '
ce67f442be0f6c4a8794272873852e256b5b8ee4 ':
lavf: Avoid setting avg_frame_rate if delta_dts is negative
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 23 Sep 2013 12:10:52 +0000 (14:10 +0200)]
ffprobe: fix uninitialized variable warning
Fix warning:
ffprobe.c:1684:21: warning: ‘start’ may be used uninitialized in this function [-Wmaybe-uninitialized] end = start + interval->end;
The warning is a false positive, since the variable is accessed only if
has_start is set, and in that case start has been already set.
Michael Niedermayer [Mon, 23 Sep 2013 12:03:53 +0000 (14:03 +0200)]
Merge commit '
bb7bf175951475235ee7d0504198c4a30cf5d5dd '
* commit '
bb7bf175951475235ee7d0504198c4a30cf5d5dd ':
vc1dec: Don't decode slices when the latest slice header failed to decode
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 11:52:40 +0000 (13:52 +0200)]
Merge commit '
5e25fdbfe01635cfc650ac4adc27d434b2df0d64 '
* commit '
5e25fdbfe01635cfc650ac4adc27d434b2df0d64 ':
vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks
See:
09de0ffeab37442d1a31ee194ea6d78a67186de1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 11:41:26 +0000 (13:41 +0200)]
Merge commit '
b772b0e28eba6abf76d86ee8c6e459a86642db5a '
* commit '
b772b0e28eba6abf76d86ee8c6e459a86642db5a ':
vc1dec: Undo mpegvideo initialization if unable to allocate tables
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 11:29:29 +0000 (13:29 +0200)]
Merge commit '
ede508443e4bf57dc1e019fac81bf6244b88fbd3 '
* commit '
ede508443e4bf57dc1e019fac81bf6244b88fbd3 ':
vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 11:20:42 +0000 (13:20 +0200)]
Merge commit '
91be1103fd1f79d381edf268c32f4166b6c3b6d8 '
* commit '
91be1103fd1f79d381edf268c32f4166b6c3b6d8 ':
wnv1: Make sure the input packet is large enough
Conflicts:
libavcodec/wnv1.c
See:
f23a2418fb0ccc56fdae4dbf83a5994cc917c475
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 10:33:08 +0000 (12:33 +0200)]
Merge commit '
f1eac2b8a0370b908cd691086d11f51342054730 '
* commit '
f1eac2b8a0370b908cd691086d11f51342054730 ':
movenc: Use keyframes as default fragmentation point in ismv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 10:22:03 +0000 (12:22 +0200)]
Merge commit '
a9553bbb336a7186c62b3b14a0499c1b6ba61ebd '
* commit '
a9553bbb336a7186c62b3b14a0499c1b6ba61ebd ':
movenc: Set all implicit flags immediately in mov_write_header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 10:17:10 +0000 (12:17 +0200)]
Merge commit '
187023f6b2b43966acb2449a379b4ededdc4b22e '
* commit '
187023f6b2b43966acb2449a379b4ededdc4b22e ':
movenc: Set mov->mode earlier in mov_write_header
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 10:01:49 +0000 (12:01 +0200)]
Merge commit '
5055035670bd1a1eaca64bd3bc71fb07de9df2c3 '
* commit '
5055035670bd1a1eaca64bd3bc71fb07de9df2c3 ':
tls: Do not abort on non-fatal TLS alerts with gnutls
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 09:56:24 +0000 (11:56 +0200)]
Merge commit '
c951e4b442df9dde6051634a85359eb809bf2142 '
* commit '
c951e4b442df9dde6051634a85359eb809bf2142 ':
flv: Make onTextData parsing robust
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 09:45:11 +0000 (11:45 +0200)]
Merge commit '
ba77757a7efafe38924b6b423acfca8c1e1c62d6 '
* commit '
ba77757a7efafe38924b6b423acfca8c1e1c62d6 ':
rtmp: Replace a magic number with a macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 09:40:10 +0000 (11:40 +0200)]
Merge commit '
5840473890440dbe0bd2cce530ebb3d93e187ae6 '
* commit '
5840473890440dbe0bd2cce530ebb3d93e187ae6 ':
rtmp: Rewrite embedded flv handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 09:36:02 +0000 (11:36 +0200)]
Merge commit '
e40a0e822801d2485e4e555909d7a82713fa86a5 '
* commit '
e40a0e822801d2485e4e555909d7a82713fa86a5 ':
rtmp: Refactor get_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 09:31:09 +0000 (11:31 +0200)]
Merge commit '
32a414f316c7f0eea877370e3f9d9f25afbf5da2 '
* commit '
32a414f316c7f0eea877370e3f9d9f25afbf5da2 ':
rtmp: Support AMF_DATA_TYPE_MIXEDARRAY
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Tue, 27 Aug 2013 22:07:22 +0000 (00:07 +0200)]
lavfi/dualinput: reimplement on top of framesync.
Nicolas George [Tue, 27 Aug 2013 22:04:54 +0000 (00:04 +0200)]
lavfi: add an API to synchronize multiple video inputs.
Compared to dualinput, this API can handle more than two
inputs and can generate frames synchronized to any or all
input streams.
Michael Bradshaw [Tue, 17 Sep 2013 00:54:36 +0000 (18:54 -0600)]
libopenjpeg: init and close properly; don't config during encode
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 22 Sep 2013 23:42:33 +0000 (23:42 +0000)]
avcodec/escape124: fix infinite loop
Remove can_safely_read() as its not really needed with
checked bitstream reader.
Fixes #2984.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Timothy Gu [Sat, 21 Sep 2013 22:39:35 +0000 (15:39 -0700)]
doc/filters: add [] labels for the graph of the opening paragraph example
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Sat, 21 Sep 2013 18:36:12 +0000 (20:36 +0200)]
doc/filters: use between() function in select examples
Simplify.
Stefano Sabatini [Sat, 21 Sep 2013 08:19:21 +0000 (10:19 +0200)]
doc/fftools: rework some paragraph in the AVOptions chapter
Fix typos, and clarify note about codec AVOptions.
Paul B Mahol [Sun, 22 Sep 2013 20:39:16 +0000 (20:39 +0000)]
doc/filters: put ladspa configure option into @code{}
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 22 Sep 2013 18:44:54 +0000 (20:44 +0200)]
tests/fate/prores: fix skip alpha tests on big endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Sep 2013 18:36:21 +0000 (20:36 +0200)]
avcodec/avcodec.h: skip_alpha should not be accessed directly (would cause ABI issues)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 22 Sep 2013 18:45:50 +0000 (18:45 +0000)]
doc/filters: mention configure option for ladspa
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Sun, 22 Sep 2013 15:31:54 +0000 (18:31 +0300)]
movenchint: Clear size and len if the realloc failed
Previously these were left in an inconsistent state.
Pointed out by Michael Niedermayer.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 22 Sep 2013 11:44:17 +0000 (14:44 +0300)]
movenc: Return a proper error code for invalid combinations
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 22 Sep 2013 11:50:48 +0000 (14:50 +0300)]
vc1dec: Check the error handling flags on slice/field header decode errors
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 20 Sep 2013 09:26:45 +0000 (12:26 +0300)]
electronicarts: Check packet sizes before reading
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 20 Sep 2013 09:20:06 +0000 (12:20 +0300)]
lavf: Avoid setting avg_frame_rate if delta_dts is negative
This avoids setting avg_frame_rate to invalid (negative)
values.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 19 Feb 2013 20:40:09 +0000 (21:40 +0100)]
vc1dec: Don't decode slices when the latest slice header failed to decode
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 20 Sep 2013 08:32:25 +0000 (11:32 +0300)]
vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 20 Sep 2013 08:16:57 +0000 (11:16 +0300)]
vc1dec: Undo mpegvideo initialization if unable to allocate tables
Previously, s->context_initialized was left set to 1
if ff_vc1_decode_init_alloc_tables failed, skipping the
initialization completely on the next decode call.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Kieran Kunhya [Sun, 22 Sep 2013 15:54:47 +0000 (10:54 -0500)]
lavc: Add support for interleaved chroma formats to libx264. Interleaved chroma is x264's native format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 22 Sep 2013 17:22:51 +0000 (17:22 +0000)]
avcodec/sgirledec: fix infinite loop in decode_sgirle8()
Fixes #2985.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 20 Sep 2013 14:01:00 +0000 (14:01 +0000)]
avfilter: add ladspa wrapper filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reimar Döffinger [Thu, 8 Aug 2013 18:27:24 +0000 (20:27 +0200)]
Make decoding alpha optional for some codecs.
For codecs where decoding of a whole plane can simply
be skipped, we should offer applications to not decode
alpha for better performance (ca. 30% less CPU usage
and 40% reduced memory bandwidth).
It also means applications do not need to implement support
(even if it is rather simple) for YUVA formats in order to be
able to play these files.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Sun, 22 Sep 2013 13:58:13 +0000 (15:58 +0200)]
avformat/mov: reset extradata size when extradata gets deallocated due to realloc failure
This prevents the fields from becoming inconsistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Wed, 21 Aug 2013 03:04:46 +0000 (05:04 +0200)]
Fix nonsense MPEG-4 hwaccel code.
Issues with the code:
1) The skip_bits_long breaks packed B-frames since we skip
of the packed frame, even for VDPAU.
2) Calling ff_h263_find_resync_marker_reverse is nonsense for MPEG-4,
and for H.263 the only code using this (vaapi_mpeg4) explicitly reverts
this change!
3) mb_x/mb_y are always 0 when vaapi_mpeg4_decode_slice, so doing
computations with them is just obfuscation
4) due to not updating mb_y the code would always go into the error
resilience case, causing nonsense error messages and maybe further
issues.
While tested to fix the data provided to the decoder in case of
VDPAU so it is the same as for the non-hwaccel code, the VA-API code
was not tested to still work, and adding regression testing even
as a quick hack is much more complicated for it.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Martin Storsjö [Fri, 20 Sep 2013 08:16:00 +0000 (11:16 +0300)]
vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Sep 2013 21:07:34 +0000 (00:07 +0300)]
wnv1: Make sure the input packet is large enough
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 10 Sep 2013 15:43:19 +0000 (18:43 +0300)]
movenc: Use keyframes as default fragmentation point in ismv
Fragmenting blindly to a certain duration isn't a good choice
if one should be able to switch between different qualities,
therefore default to keyframes instead.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 10 Sep 2013 12:56:19 +0000 (15:56 +0300)]
movenc: Set all implicit flags immediately in mov_write_header
This makes sure other sanity checks for conflicting options
can work properly, e.g. for the conflict between the faststart
flag when using the ismv mode.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 21 Sep 2013 22:29:33 +0000 (01:29 +0300)]
movenc: Set mov->mode earlier in mov_write_header
This allows simplifying some early checks that depend on the
muxer mode.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 21 Sep 2013 22:02:36 +0000 (01:02 +0300)]
tls: Do not abort on non-fatal TLS alerts with gnutls
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 22 Sep 2013 13:06:22 +0000 (15:06 +0200)]
avformat/movenchint: use realloc_array() to protect against integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>