]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Thu, 8 Jan 2015 19:08:24 +0000 (20:08 +0100)]
avformat/rtsp: Use avio_closep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Thu, 8 Jan 2015 16:19:17 +0000 (17:19 +0100)]
avcodec/dvdsubdec: fix accessing dangling pointers
dvdsub_decode() can call append_to_cached_buf() 2 times, the second time
with ctx->buf as argument. If the second append_to_cached_buf() reallocs
ctx->buf, the argument will be a pointer to the previous, freed block.
This can cause invalid reads at least with some fuzzed files - and
possibly with valid files.
Since packets can apparently not be larger than 64K (even if packets are
combined), just use a fixed size buffer. It will be allocated as part of
the DVDSubContext, and although some memory is "wasted", it's relatively
minimal by modern standards and should be acceptable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 16:35:17 +0000 (17:35 +0100)]
Merge commit '
2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e '
* commit '
2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e ':
libfdk-aacdec: Make sure decoding doesn't add any extra delay in the latest version of fdk-aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 16:26:57 +0000 (17:26 +0100)]
Merge commit '
3852e2c926ddb166c7aa69c4644a86100ea144d9 '
* commit '
3852e2c926ddb166c7aa69c4644a86100ea144d9 ':
libopenh264enc: Fix a typo and some nitpicks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 16:12:49 +0000 (17:12 +0100)]
Merge commit '
71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8 '
* commit '
71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8 ':
doc: Add initial documentation about the OpenH264 encoder wrapper
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 8 Jan 2015 14:24:59 +0000 (15:24 +0100)]
lavfi/boxblur: Readd 8bit colour spaces on big-endian.
Michael Niedermayer [Thu, 8 Jan 2015 13:51:04 +0000 (14:51 +0100)]
avformat/hlsenc: Use avio_closep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 13:50:34 +0000 (14:50 +0100)]
avformat/img2dec: Use avio_closep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 13:50:07 +0000 (14:50 +0100)]
avformat/img2enc: Use avio_closep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 13:13:36 +0000 (14:13 +0100)]
avformat/hdsenc: Simplify code by using avio_closep()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 13:11:44 +0000 (14:11 +0100)]
avdevice/lavfi: Use avio_closep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 13:11:12 +0000 (14:11 +0100)]
ffserver: Use avio_closep() to avoid leaving stale pointers in memor
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 13:10:58 +0000 (14:10 +0100)]
ffmpeg: Use avio_closep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 13:10:23 +0000 (14:10 +0100)]
ffmpeg_opt: Use avio_closep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 7 Jan 2015 21:49:41 +0000 (23:49 +0200)]
libfdk-aacdec: Make sure decoding doesn't add any extra delay in the latest version of fdk-aac
The latest version added support for a new option for enabling
a signal level limiter, which adds some extra delay. In fdk-aac, this
is enabled by default, but disable it by default here since we'd rather
have zero-delay decoding.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 7 Jan 2015 22:03:09 +0000 (00:03 +0200)]
libopenh264enc: Fix a typo and some nitpicks
Also move the .long_name entry to below the .name entry.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 7 Jan 2015 22:02:05 +0000 (00:02 +0200)]
doc: Add initial documentation about the OpenH264 encoder wrapper
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 8 Jan 2015 04:10:55 +0000 (05:10 +0100)]
doc/examples/transcoding: Use avio_closep() in examples as it avoids leaving stale pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 04:10:39 +0000 (05:10 +0100)]
idoc/examples/remuxing: Use avio_closep() in examples as it avoids leaving stale pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 04:09:52 +0000 (05:09 +0100)]
doc/examples/transcode_aac: Use avio_closep() in examples as it avoids leaving stale pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 04:09:06 +0000 (05:09 +0100)]
doc/examples/muxing: Use avio_closep() in examples as it avoids leaving stale pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lou Logan [Thu, 8 Jan 2015 02:16:54 +0000 (17:16 -0900)]
doc: fix typos
Signed-off-by: Lou Logan <lou@lrcd.com>
wm4 [Wed, 7 Jan 2015 22:57:50 +0000 (23:57 +0100)]
avcodec/dvdsubdec: error on bitmaps with size 0
Attemtping to decode them could lead to invalid writes with some fuzzed
samples.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 7 Jan 2015 23:04:17 +0000 (00:04 +0100)]
Merge commit '
5a1addd7c1d8ff218ed4b84f4f02fdb83980094c '
* commit '
5a1addd7c1d8ff218ed4b84f4f02fdb83980094c ':
xsub: Support DXSA subtitles
Conflicts:
libavcodec/xsubdec.c
See:
d6f910ea47255b519e0b71c33d74c409a29ab3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 7 Jan 2015 21:48:15 +0000 (22:48 +0100)]
Merge commit '
01168bf1405ddbf671f1074a927b951b8777adbb '
* commit '
01168bf1405ddbf671f1074a927b951b8777adbb ':
mpeg: Remove unused field
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 7 Jan 2015 21:29:16 +0000 (22:29 +0100)]
avformat/segment: Clear contexts after deallocation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 7 Jan 2015 21:15:45 +0000 (22:15 +0100)]
Merge commit '
b3f04657368a32a9903406395f865e230b1de348 '
* commit '
b3f04657368a32a9903406395f865e230b1de348 ':
segment: Fix the failure paths
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 7 Jan 2015 18:46:16 +0000 (19:46 +0100)]
avcodec/aic: Use av_malloc_array
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 7 Jan 2015 17:09:52 +0000 (18:09 +0100)]
ffmpeg_opt: Check for av_realloc_array() failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 7 Jan 2015 16:26:39 +0000 (17:26 +0100)]
ffmpeg_opt: Use av_realloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 7 Jan 2015 16:23:25 +0000 (17:23 +0100)]
avcodec/libxvid: fix potential integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 7 Jan 2015 16:20:39 +0000 (17:20 +0100)]
avformat/dvbsub: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexandre Colucci [Wed, 7 Jan 2015 11:18:08 +0000 (12:18 +0100)]
xsub: Support DXSA subtitles
These have a DXSA tag and contain alpha in addition to
color values for palette.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Tue, 30 Dec 2014 22:17:17 +0000 (23:17 +0100)]
mpeg: Remove unused field
Michael Niedermayer [Wed, 7 Jan 2015 11:18:40 +0000 (12:18 +0100)]
avcodec/mpeg12: Try to fetch pts/dts from both the packet associated with the picture start code as well as earlier start codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Mon, 5 Jan 2015 09:40:41 +0000 (10:40 +0100)]
segment: Fix the failure paths
A failure in segment_end() or segment_start() would lead to freeing
a dangling pointer and in general further calls to seg_write_packet()
or to seg_write_trailer() would have the same faulty behaviour.
CC: libav-stable@libav.org
Reported-By: luodalongde@gmail.com
Michael Niedermayer [Wed, 7 Jan 2015 10:52:08 +0000 (11:52 +0100)]
avcodec/parser: add fuzzy mode to ff_fetch_timestamp()
This will be needed for the following timestamp fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 7 Jan 2015 00:15:57 +0000 (01:15 +0100)]
avcodec/allcodecs: prefer x264 over openh264 if both are available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 23:48:23 +0000 (00:48 +0100)]
Merge commit '
8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4 '
* commit '
8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4 ':
libavcodec: Add an OpenH264 encoder wrapper
Conflicts:
Changelog
configure
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 23:46:40 +0000 (00:46 +0100)]
Merge commit '
2a1500fb552364488cfbee3e29e296788a3a6bdd '
* commit '
2a1500fb552364488cfbee3e29e296788a3a6bdd ':
movenc: Fix a typo in a comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 23:38:50 +0000 (00:38 +0100)]
Merge commit '
e581e88cbdb3323ca0026a54b39a9716a3686e9f '
* commit '
e581e88cbdb3323ca0026a54b39a9716a3686e9f ':
movenc: Readd an accidentally removed condition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 23:29:42 +0000 (00:29 +0100)]
Merge commit '
8e03ca2fff40ce065ea5a516200e777c96cd785e '
* commit '
8e03ca2fff40ce065ea5a516200e777c96cd785e ':
isom: add 'mp1v' fourcc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 23:12:52 +0000 (00:12 +0100)]
Merge commit '
1c6183233d56fb27a4a154e7e64ecab98bd877f1 '
* commit '
1c6183233d56fb27a4a154e7e64ecab98bd877f1 ':
msmpeg4: check memory allocations and propagate errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 23:04:35 +0000 (00:04 +0100)]
Merge commit '
ed97963bdbf3bb17fca4f9ea0aa1a97722dec907 '
* commit '
ed97963bdbf3bb17fca4f9ea0aa1a97722dec907 ':
ulti: invert the order of parameters of ulti_decode_frame()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 23:03:02 +0000 (00:03 +0100)]
Merge commit '
4438c256387a5845e5cdc5c14c43f4047b68301b '
* commit '
4438c256387a5845e5cdc5c14c43f4047b68301b ':
vf_interlace: remove the warning tag in the message
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 22:50:45 +0000 (23:50 +0100)]
Merge commit '
15ea222778caaec0877b3f9938140b707c931d96 '
* commit '
15ea222778caaec0877b3f9938140b707c931d96 ':
vf_interlace: merge FIELD_LOWER check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 22:40:11 +0000 (23:40 +0100)]
Merge commit '
046f75a970701b4c947d38bfd2186dcc5f2ddae2 '
* commit '
046f75a970701b4c947d38bfd2186dcc5f2ddae2 ':
vf_interlace: also assert for height
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 22:20:18 +0000 (23:20 +0100)]
vfilter/vf_tinterlace: Fix issues with linesize and cols
Based on patch by Vittorio Giovara <vittorio.giovara@gmail.com> from
696141e898193311c994b399a8dc60713709092f
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 21:38:11 +0000 (22:38 +0100)]
Merge commit '
696141e898193311c994b399a8dc60713709092f '
* commit '
696141e898193311c994b399a8dc60713709092f ':
vf_interlace: use image width rather than linesize
Conflicts:
libavfilter/vf_interlace.c
See:
f043965cd5145d8540d55c013b0d809b6a874c53
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 21:33:18 +0000 (22:33 +0100)]
Merge commit '
fe082998683334e7f573cfe3876810fb80c5249c '
* commit '
fe082998683334e7f573cfe3876810fb80c5249c ':
build: Use -Werror=format-security
Conflicts:
configure
See:
97592faa51eacda9a949c4f0ba2a6d7989ef5f3b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 21:12:53 +0000 (22:12 +0100)]
Merge commit '
2cef68da69a17ed09c313ba3c3850ec1cc0a80e0 '
* commit '
2cef68da69a17ed09c313ba3c3850ec1cc0a80e0 ':
vda: error out if decoded CVPixelBuffer is empty
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 21:05:13 +0000 (22:05 +0100)]
avcodec/ffv1enc: Fix incompatible pointer type warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 21:03:57 +0000 (22:03 +0100)]
Merge commit '
0352ff102d62ee94e79e0baaf64d5ad4e66f907b '
* commit '
0352ff102d62ee94e79e0baaf64d5ad4e66f907b ':
ffv1: const correctness for encode_rgb_frame()
Conflicts:
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 20:54:26 +0000 (21:54 +0100)]
Merge commit '
ca09effb01e126b0ac74ff3de70a475423ddee82 '
* commit '
ca09effb01e126b0ac74ff3de70a475423ddee82 ':
ffv1: Drop unnecessary casts and const qualifiers to match function signatures
Conflicts:
libavcodec/ffv1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 20:44:08 +0000 (21:44 +0100)]
Merge commit '
1dd797e3c9f179f957316a0becbec048b42df8aa '
* commit '
1dd797e3c9f179f957316a0becbec048b42df8aa ':
swscale: check memory allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 20:37:33 +0000 (21:37 +0100)]
Merge commit '
07a0c0f0005072d115ace61e60f46be68582cc3a '
* commit '
07a0c0f0005072d115ace61e60f46be68582cc3a ':
opt: check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 20:08:20 +0000 (21:08 +0100)]
tools/ismindex.c: Use av_realloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 20:07:50 +0000 (21:07 +0100)]
tools/ismindex: Keep count fields consistent with arrays in case of errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 12 Dec 2013 15:13:55 +0000 (17:13 +0200)]
libavcodec: Add an OpenH264 encoder wrapper
Compared to existing, common opensource H264 encoders, this can be
useful since it has got a different license (BSD instead of GPL).
Performance- and qualitywise it is comparable to x264 in ultrafast
mode.
Hooking it up as an encoder in libavcodec also simplifies comparing
it against other common encoders.
This requires OpenH264 1.3 or newer. Since the OpenH264 API and ABI
changes frequently, only releases are supported.
To take advantage of the OpenH264 patent offer, the OpenH264 library
must not be redistributed, but downloaded at runtime at the end-user's
system.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 5 Jan 2015 13:13:48 +0000 (15:13 +0200)]
movenc: Fix a typo in a comment
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 5 Jan 2015 13:07:01 +0000 (15:07 +0200)]
movenc: Readd an accidentally removed condition
This was removed accidentally as part of
847bf598 . This could cause
groundless warning logging.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 6 Jan 2015 16:52:54 +0000 (17:52 +0100)]
cmdutils.c: Use av_realloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Tue, 4 Feb 2014 20:40:32 +0000 (15:40 -0500)]
isom: add 'mp1v' fourcc
As referenced in the CoreMedia API docs.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Wed, 17 Dec 2014 15:02:10 +0000 (16:02 +0100)]
msmpeg4: check memory allocations and propagate errors
Bug-Id: CID
1257781
Vittorio Giovara [Thu, 18 Dec 2014 19:26:58 +0000 (20:26 +0100)]
ulti: invert the order of parameters of ulti_decode_frame()
This is the order that the caller uses in the rest of the file.
Variables are modified to reflect the order above too and their
initialization is merged with their declarationt. No behavioral
change.
Bug-Id: CID 732286
wm4 [Mon, 5 Jan 2015 17:56:20 +0000 (18:56 +0100)]
avformat/id3v2: support USLT tags
I think this turned out pretty terrible. There's no good way to add new
custom tags that write to AVFormatContext->metadata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 12:12:22 +0000 (13:12 +0100)]
cmdutils: Use 64bit for file size/offset related variable in cmdutils_read_file()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 11:53:53 +0000 (12:53 +0100)]
avformat/utils: Clear pointer in ff_alloc_extradata() to avoid leaving a stale pointer in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 11:53:25 +0000 (12:53 +0100)]
avfilter/buffer: use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 11:52:55 +0000 (12:52 +0100)]
avformat/hlsproto: Use av_freep, to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 11:48:38 +0000 (12:48 +0100)]
avformat/matroskadec: Use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 11:45:25 +0000 (12:45 +0100)]
avformat/mov: use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 04:54:29 +0000 (05:54 +0100)]
avformat/mov: Clear array to prevent potential out of array read from av_dlog()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 6 Jan 2015 09:42:59 +0000 (09:42 +0000)]
lavfi: check av_strdup() return value
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Dale Curtis [Tue, 6 Jan 2015 00:34:17 +0000 (16:34 -0800)]
mov: Fix negative size calculation in mov_read_default().
The previous code assumed if an atom was marked with a 64-bit
size extension, it actually had that data available. The new
code verfies there's enough data in the atom for this to be
done.
Failure to verify causes total_size > atom.size which will
result in negative size calculations later on.
Found-by: Paul Mehta <paul@paulmehta.com>
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Jan 2015 03:29:10 +0000 (04:29 +0100)]
avformat/mov: fix integer overflow in mov_read_udta_string()
Found-by: Paul Mehta <paul@paulmehta.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dale Curtis [Tue, 6 Jan 2015 03:00:43 +0000 (04:00 +0100)]
mov: Fix overflow and error handling in read_tfra().
Under abnormal conditions the item_count may exceed the max
allocation size on 32-bit systems, this causes the allocated
size to overflow and become too small for the given count.
Additionally, if av_reallocp() fails its allocation, the
fragment_index_count is not correctly decremented.
Ensuring further havoc may be wrought, the error code for
read_tfra() is not checked upon return.
Found-by: Paul Mehta <paul@paulmehta.com>
positive return code and use of _array functions by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Jan 2015 01:35:39 +0000 (02:35 +0100)]
avfilter/vf_idet: Add analyze_interlaced_flag mode
This should allow us to insert idet before scale and let scale have interl=-1 as default in that case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Jan 2015 22:55:59 +0000 (23:55 +0100)]
avfilter/vf_yadif: detect telecine content
Fixes: yadif with interlaced_flag_switch.mpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Mon, 5 Jan 2015 17:56:19 +0000 (18:56 +0100)]
avformat/id3v1: strip trailing whitespace
ID3v1 fields have a fixed size, and they are padded either with zeros,
or with spaces. Handle the latter case, instead of putting strings with
trailing spaces into the AVDictionary.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 29 Dec 2014 19:44:03 +0000 (16:44 -0300)]
x86/flacdsp: remove unneeded ifdeffery
x86inc can translate r*m into a register or stack on its own
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Mon, 5 Jan 2015 15:28:25 +0000 (16:28 +0100)]
avformat/dvbsub: increase probe score
Ive not found a single false positive after some moderate testing with
probetest
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Jan 2015 15:22:26 +0000 (16:22 +0100)]
avformat/dvbsub: fix indent after previous commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Jan 2015 15:21:42 +0000 (16:21 +0100)]
avformat/dvbsub: check for 0xf0 earlier in probe, 30% faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Jan 2015 14:55:40 +0000 (15:55 +0100)]
Merge remote-tracking branch 'origin/master'
* origin/master:
libavfilter/vf_blend: do not unconditionally compile both filters
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Tue, 2 Dec 2014 14:58:42 +0000 (14:58 +0000)]
vf_interlace: remove the warning tag in the message
The log level is already a warning.
Vittorio Giovara [Tue, 2 Dec 2014 14:58:41 +0000 (14:58 +0000)]
vf_interlace: merge FIELD_LOWER check
Vittorio Giovara [Tue, 2 Dec 2014 14:58:39 +0000 (14:58 +0000)]
vf_interlace: also assert for height
Vittorio Giovara [Tue, 2 Dec 2014 14:58:38 +0000 (14:58 +0000)]
vf_interlace: use image width rather than linesize
Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
Agostino Sarubbo [Sun, 21 Dec 2014 13:38:57 +0000 (14:38 +0100)]
build: Use -Werror=format-security
Reduce the chance of introducing a class of bugs quite hard to track.
Stefano Pigozzi [Mon, 29 Dec 2014 20:28:50 +0000 (21:28 +0100)]
vda: error out if decoded CVPixelBuffer is empty
On some video samples, VDA silently fails to decode frames and returns
kVDADecoderNoErr. Error out in these cases to avoid producing AVFrames with
empty planes.
Signed-off-by: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Diego Biurrun [Thu, 18 Dec 2014 19:07:29 +0000 (20:07 +0100)]
ffv1: const correctness for encode_rgb_frame()
libavcodec/ffv1enc.c:922:53: warning: passing argument 5 of ‘encode_rgb_frame’ discards ‘const’ qualifier from pointer target type
Diego Biurrun [Thu, 18 Dec 2014 19:07:28 +0000 (20:07 +0100)]
ffv1: Drop unnecessary casts and const qualifiers to match function signatures
libavcodec/ffv1dec.c:898:36: warning: cast discards ‘const’ qualifier from pointer target type
Vittorio Giovara [Wed, 17 Dec 2014 15:02:07 +0000 (16:02 +0100)]
swscale: check memory allocations
CC: libav-stable@libav.org
Bug-Id: CID
1257779
Paul B Mahol [Sun, 4 Jan 2015 12:27:56 +0000 (12:27 +0000)]
libavfilter/vf_blend: do not unconditionally compile both filters
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Vittorio Giovara [Thu, 18 Dec 2014 19:26:57 +0000 (20:26 +0100)]
opt: check memory allocation
CC: libav-stable@libav.org
Bug-Id: CID
1257771
wm4 [Mon, 5 Jan 2015 03:45:26 +0000 (04:45 +0100)]
avcodec/dvdsubdec: fix out of bounds accesses
The code blindly trusted buffer offsets read from the file in the RLE
decoder. Explicitly check the offset. Also error out on other RLE
decoding errors.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Werner Robitza [Fri, 2 Jan 2015 10:11:48 +0000 (11:11 +0100)]
doc/ffmpeg: mention both ffpreset/avpreset in documentation, remove superfluous example
ffmpeg looks for both .ffpreset and .avpreset files depending on whether the
-[avsf]pre or -pre option is used. Added two sections for each type of preset
including the rules according to which files are searched.
(Notably, the lookup order is swapped for avpreset files, because it first
looks for <codec>_<arg>.avpreset and then for <arg>.avpreset.)
This removes the section explaining -pre only, which was under "Examples",
where it did not really make sense.
Signed-off-by: Werner Robitza <werner.robitza@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Jan 2015 01:45:29 +0000 (02:45 +0100)]
Merge commit '
46808fdf04ab113df374157b90b506eb3110daf2 '
* commit '
46808fdf04ab113df374157b90b506eb3110daf2 ':
movenc: Enable editlists by default if delay_moov is enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Jan 2015 01:33:55 +0000 (02:33 +0100)]
Merge commit '
9f810a9b374e0ff8e2a19fd8a7347afe2933e229 '
* commit '
9f810a9b374e0ff8e2a19fd8a7347afe2933e229 ':
libavformat: Check for malloc failures in avformat_new_stream
See:
a66893ac949864352b36b39e48c4cd72bbd81e54
Merged-by: Michael Niedermayer <michaelni@gmx.at>