Carl Eugen Hoyos [Tue, 25 Nov 2014 00:28:19 +0000 (01:28 +0100)]
Include config.h from huffyuvdsp.h.
Fixes a warning about undefined HAVE_BIGENDIAN when running make checkheaders.
Carl Eugen Hoyos [Tue, 25 Nov 2014 00:27:30 +0000 (01:27 +0100)]
Include stddef from snow_dwt.h.
Fixes make checkheaders.
Michael Niedermayer [Tue, 25 Nov 2014 00:41:37 +0000 (01:41 +0100)]
avcodec/mjpegdec: Add YUVA420 formats to *scale asserts
Fixes assertion failure
Fixes: signal_sigabrt_7ffff6ac7bb9_2042_cov_2593130068_ef1f8a057bb6056674fad92f6b8c0acd.jpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Nov 2014 00:34:32 +0000 (01:34 +0100)]
avcodec/mjpegdec: Print the number of bits in the unsupported pixel format error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Nov 2014 00:14:38 +0000 (01:14 +0100)]
avcodec/mjpegdec: Check for pixfmtid 0x42111100 || 0x24111100 with more than 8 bits
These cases are not supported yet
Fixes assertion failure
Fixes: signal_sigabrt_7ffff6ac7bb9_1_cov_1553101927_00.jpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 01:22:17 +0000 (02:22 +0100)]
doc/examples/decoding_encoding: fix storing all channels
Fixes Ticket3355
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Mon, 24 Nov 2014 15:12:26 +0000 (16:12 +0100)]
avformat/apngdec: transmit all the chunks between consecutive fcTL ones.
In order to support multiple IDAT of fdAT chunks following an fcTL one,
transmit all the chunks between two fcTL ones (or between fcTL and IEND
one).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Mon, 24 Nov 2014 14:20:53 +0000 (15:20 +0100)]
avformat/rawdec: raw formats have no timestamps
Some raw demuxers already had AVFMT_NOTIMESTAMPS set. Add it for all the
others.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rodger Combs [Mon, 24 Nov 2014 05:31:20 +0000 (23:31 -0600)]
ffmpeg: fix accurate seeking with -copyts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Boris Reisig [Mon, 24 Nov 2014 08:00:05 +0000 (02:00 -0600)]
avdevice/xcbgrab: fix undefined reference to xcb_shape_rectangles in xcbgrab.c
works with (--enable-libxcb-shape) and without (--disable-libxcb-shape) now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Nov 2014 15:52:19 +0000 (16:52 +0100)]
avformat/mpegenc: assert that premux_packet is non null
Based on:
065923b0781b06a2604f69f4e2c2407b7750a854
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Nov 2014 13:07:01 +0000 (14:07 +0100)]
Merge commit '
fe42f94ce1023f9c2f7e86404c60afcee5b078a9'
* commit '
fe42f94ce1023f9c2f7e86404c60afcee5b078a9':
dashenc: Don't segment all video streams when one stream gets a keyframe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Nov 2014 13:01:23 +0000 (14:01 +0100)]
Merge commit '
6f26f14f134e753d6168591f30815b1c08c1498b'
* commit '
6f26f14f134e753d6168591f30815b1c08c1498b':
sidxindex: Write mimeType=audio/mp4 for audio-only representations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Nov 2014 12:46:29 +0000 (13:46 +0100)]
Merge commit '
208f3abb917757743313da0da714e525e03159d2'
* commit '
208f3abb917757743313da0da714e525e03159d2':
aacsbr: always initialize max_qmf_subbands
See:
c6d3b3be1555257ff3f88da6b8dca2158dad2a85
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Nov 2014 12:38:23 +0000 (13:38 +0100)]
Merge commit '
55b59fab880a9fcdd30f97c5170af282087ac4f7'
* commit '
55b59fab880a9fcdd30f97c5170af282087ac4f7':
roqaudio: Always use the frame buffer on flush
Conflicts:
libavcodec/roqaudioenc.c
See:
a1af505d6640a89401f8e9941a38352a1ca49d58
See:
c0b17ea106b94f79255f81ec36ea50096e1ae985
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Nov 2014 12:28:57 +0000 (13:28 +0100)]
Merge commit '
0562887a984388fdc7a9b71c9374ff9c756fb4f1'
* commit '
0562887a984388fdc7a9b71c9374ff9c756fb4f1':
tiffenc: initialize return value
Conflicts:
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Nov 2014 12:16:37 +0000 (13:16 +0100)]
Merge commit '
299d8ab104fb350254eb2e6d9ecdce892a2a55b1'
* commit '
299d8ab104fb350254eb2e6d9ecdce892a2a55b1':
cook: Make sure there is enough extradata
See:
c9e455432988acd414990ba92f782b8e3c4b6aea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Nov 2014 12:09:49 +0000 (13:09 +0100)]
Merge commit '
30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b'
* commit '
30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b':
sol: simplify sol_codec_id()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Nov 2014 11:58:31 +0000 (12:58 +0100)]
Merge commit '
b99ca863506f0630514921b740b78364de67a3ff'
* commit '
b99ca863506f0630514921b740b78364de67a3ff':
aacdec: avoid an out-of-bounds write
Conflicts:
libavcodec/aacdec.c
See:
ba02069a8e22985a9a775dac9ece6dc54a7e8b44
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Nov 2014 11:45:07 +0000 (12:45 +0100)]
Merge commit '
277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'
* commit '
277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2':
lavu: move internal define to the only places where it is used
Conflicts:
libavcodec/h264_cabac.c
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Nov 2014 11:22:11 +0000 (12:22 +0100)]
Merge commit '
065923b0781b06a2604f69f4e2c2407b7750a854'
* commit '
065923b0781b06a2604f69f4e2c2407b7750a854':
mpegenc: prevent a NULL pointer dereference
Not merged, this is not needed, and could hide more serious issues
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Nov 2014 10:39:26 +0000 (11:39 +0100)]
Merge commit '
9c12c6ff9539e926df0b2a2299e915ae71872600'
* commit '
9c12c6ff9539e926df0b2a2299e915ae71872600':
motion_est: convert stride to ptrdiff_t
Conflicts:
libavcodec/me_cmp.c
libavcodec/ppc/me_cmp.c
libavcodec/x86/me_cmp_init.c
See:
9c669672c7fd45ef1cad782ab551be438ceac6cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 17 Nov 2014 13:26:17 +0000 (15:26 +0200)]
dashenc: Don't segment all video streams when one stream gets a keyframe
This makes sure that segments actually start at a keyframe (and
makes sure we don't split segments twice in a row, with one segment
consisting of only a handful of packets), when one stream uses b-frames
while another one doesn't.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 23 Nov 2014 15:30:35 +0000 (17:30 +0200)]
sidxindex: Write mimeType=audio/mp4 for audio-only representations
This fixes playback with dash.js, when the input is one separate
mp4 file per track.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 24 Nov 2014 03:57:56 +0000 (04:57 +0100)]
avutil/file: fix av_tempfile() documentation
Found-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sat, 22 Nov 2014 23:57:33 +0000 (00:57 +0100)]
lavc/huffyuvdec: fix mem leak in case of init failure
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sat, 22 Nov 2014 22:25:12 +0000 (23:25 +0100)]
lavc/smvjpegdec: fix mem leak in case of init failure
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Mon, 24 Nov 2014 00:10:49 +0000 (01:10 +0100)]
lavc/libxvid: fix mem leak in case of init failure
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Vittorio Giovara [Fri, 21 Nov 2014 12:57:37 +0000 (12:57 +0000)]
aacsbr: always initialize max_qmf_subbands
Fixes a wordly warning from clang -Wsometimes-uninitialized.
Michael Niedermayer [Wed, 12 Nov 2014 10:13:10 +0000 (11:13 +0100)]
roqaudio: Always use the frame buffer on flush
Prevent NULL dereference.
CC: libav-stable@libav.org
Bug-Id: CID 703669
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Sun, 9 Nov 2014 07:48:43 +0000 (08:48 +0100)]
tiffenc: initialize return value
'ret' can only be used without initialization if s->height <= 0, which can
only happen if avctx->height <= 0, which is validated elsewhere. Doesn't hurt
to still initialize it though.
CC: libav-stable@libav.org
Bug-Id: CID 732296
Luca Barbato [Sun, 23 Nov 2014 15:09:05 +0000 (16:09 +0100)]
cook: Make sure there is enough extradata
At least 8 bytes are needed (Mono audio).
Bug-Id: CID 741418
CC: libav-stable@libav.org
Vittorio Giovara [Fri, 21 Nov 2014 12:57:35 +0000 (12:57 +0000)]
sol: simplify sol_codec_id()
Bug-Id: CID
1238993
Vittorio Giovara [Fri, 21 Nov 2014 12:57:40 +0000 (12:57 +0000)]
aacdec: avoid an out-of-bounds write
Also move the check in the case it is actually used.
CC: libav-stable@libav.org
Bug-Id: CID
1087090
Vittorio Giovara [Fri, 21 Nov 2014 12:57:43 +0000 (12:57 +0000)]
lavu: move internal define to the only places where it is used
Vittorio Giovara [Fri, 21 Nov 2014 12:57:42 +0000 (12:57 +0000)]
mpegenc: prevent a NULL pointer dereference
CC: libav-stable@libav.org
Bug-Id: CID 29261
Vittorio Giovara [Fri, 21 Nov 2014 12:57:41 +0000 (12:57 +0000)]
motion_est: convert stride to ptrdiff_t
CC: libav-stable@libav.org
Bug-Id: CID 700556 / CID 700557 / CID 700558
Michael Niedermayer [Mon, 24 Nov 2014 01:10:45 +0000 (02:10 +0100)]
avutil: remove FF_CONST_AVUTIL53, its no longer needed
version is 54 already
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Nov 2014 23:36:58 +0000 (00:36 +0100)]
Changelog: remove 24bit lossless wma entry for now, some samples work others do not yet work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jeffrey Wescott [Thu, 6 Nov 2014 01:55:34 +0000 (17:55 -0800)]
avformat/rtmpproto: only prepend @setMetaData for onMetaData and |RtmpSampleAccess
In current versions of ffmpeg, when streaming to an RTMP server, anytime a packet of type
RTMP_PT_NOTIFY is encountered, the packet is prepended with @setDataFrame before it gets sent
to the server. This is incorrect; only packets for onMetaData and |RtmpSampleAccess should
invoke @setDataFrame on the RTMP server. Specifically, the current bug manifests
itself when trying to stream onTextData or onCuePoint invocations.
This fix addresses that problem and ensures that the @setDataFrame is only prepended
for onMetaData and |RtmpSampleAccess.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sat, 22 Nov 2014 22:11:50 +0000 (23:11 +0100)]
lavc/rv30: fix mem leak in case of init failure
Also replaced return -1 with return AVERROR(EINVAL)
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sat, 22 Nov 2014 21:56:51 +0000 (22:56 +0100)]
lavc/mss1: fix mem leak in case of init failure
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
James Almer [Sat, 22 Nov 2014 16:41:43 +0000 (13:41 -0300)]
lavf/apngdec: print currently unsupported in-stream tags in a more readable form
Also use length and not stream position
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: James Almer <jamrial@gmail.com>
Carl Eugen Hoyos [Sun, 23 Nov 2014 12:22:27 +0000 (13:22 +0100)]
Print a warning if vp6 is muxed into flv: The output is flipped.
Fixes ticket #4132.
Carl Eugen Hoyos [Sun, 23 Nov 2014 12:21:29 +0000 (13:21 +0100)]
Fix standalone compilation of the apng decoder on x86.
Clément Bœsch [Sun, 23 Nov 2014 11:56:02 +0000 (12:56 +0100)]
avcodec/microdvddec: support non persistent italic marker '/'
Inspired from a patch by Michal Wazgird <mplayer@cyryl.net>
See https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2014-November/072772.html
Clément Bœsch [Sun, 23 Nov 2014 11:16:30 +0000 (12:16 +0100)]
avcodec/microdvddec: support various broken form of color tags
Inspired by a patch from Michal Wazgird <mplayer@cyryl.net>
See https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2014-November/072772.html
Reimar Döffinger [Sat, 22 Nov 2014 22:29:58 +0000 (23:29 +0100)]
xface: reduce stack usage by directly storing 2 bytes data instead of pointers.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 22 Nov 2014 22:27:38 +0000 (23:27 +0100)]
xface: reduce table sizes.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 22 Nov 2014 22:12:51 +0000 (23:12 +0100)]
xface: Fix encoder crashes due to too small on-stack array.
Also add a FATE test.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 22 Nov 2014 18:50:37 +0000 (19:50 +0100)]
svq1enc: reduce stack usage of recursively-called function.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 22 Nov 2014 19:49:13 +0000 (20:49 +0100)]
lpc: Reduce stack usage by allocating LLSModel in context.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Lukasz Marek [Sat, 22 Nov 2014 21:45:10 +0000 (22:45 +0100)]
lavc/libvorbisdec: use better error codes
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sat, 22 Nov 2014 21:30:28 +0000 (22:30 +0100)]
lavc/libvorbisdec: fix mem leak in case of init failure
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sat, 22 Nov 2014 21:38:17 +0000 (22:38 +0100)]
lavc/smacker: fix mem leak in case of init failure
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sat, 22 Nov 2014 21:41:35 +0000 (22:41 +0100)]
lavc/anm: fix mem leak in case of init failure
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Michael Niedermayer [Sun, 23 Nov 2014 00:49:04 +0000 (01:49 +0100)]
avcodec/x86/Makefile: fix order
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Nov 2014 00:32:35 +0000 (01:32 +0100)]
Merge commit '
f856d9c2f314c493c672dfb9c876da182525da3d'
* commit '
f856d9c2f314c493c672dfb9c876da182525da3d':
dashenc: Don't require the stream bitrate to be known
Conflicts:
libavformat/dashenc.c
See:
5f8fcdd4481b3e740d76b09e10a80e3271ef47b5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Nov 2014 00:18:51 +0000 (01:18 +0100)]
Merge commit '
eec7f032a903e06d249d1e8aa6630b65292bf40f'
* commit '
eec7f032a903e06d249d1e8aa6630b65292bf40f':
lavf: Remove a redundant include of sys/stat.h
Conflicts:
libavformat/os_support.h
See:
49515cb8407ba237329280d99ab7e79a02560dfe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Nov 2014 00:15:26 +0000 (01:15 +0100)]
Matthew Oliver [Sat, 22 Nov 2014 16:43:19 +0000 (03:43 +1100)]
libavcodec/tiff: Fix static linking of lzma with msvc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 19 Nov 2014 11:49:31 +0000 (13:49 +0200)]
dashenc: Don't require the stream bitrate to be known
Don't write any bitrate attribute if it isn't known. As long as one
doesn't want automatic bitrate switching, playback can work just
fine even if it isn't set.
If strict standard compliance is requested, this is still considered
an error, since the attribute is mandatory according to the spec.
Based on a patch by Rodger Combs.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 18 Nov 2014 07:57:07 +0000 (09:57 +0200)]
lavf: Remove a redundant include of sys/stat.h
The same file already includes this header a few lines further
above.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 17 Nov 2014 12:08:05 +0000 (13:08 +0100)]
flvenc: Remove an unused variable
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 22 Nov 2014 20:08:38 +0000 (21:08 +0100)]
avcodec/x86/lossless_audiodsp: fix fallback code for 32bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Nov 2014 19:49:40 +0000 (20:49 +0100)]
avcodec/wmalosslessdec: support 24bit lossless
Not checked if its actually lossless
Fixes Ticket1847
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Nov 2014 19:38:30 +0000 (20:38 +0100)]
avcodec/x86/lossless_audiodsp: support len %16 == 8 in scalarproduct_and_madd_int16()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Nov 2014 18:18:30 +0000 (19:18 +0100)]
avcodec/mjpegdec: fix pixfmtid 0x14111100
Fixes part of Ticket 2004
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Tue, 2 Sep 2014 18:55:35 +0000 (20:55 +0200)]
ffv1dec: Avoid unnecessarily large stack usage and copies.
Ideally the compiler could figure this out on its own,
but it seems it can't.
An alternative that would avoid the messy explicit memcpy
would be to use a sub-struct for the parts that should
be preserved, which can then simply be assigned.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Sat, 22 Nov 2014 17:44:35 +0000 (18:44 +0100)]
avfilter/graphparser: Use av_freep(), avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Nov 2014 17:44:35 +0000 (18:44 +0100)]
avfilter/avf_concat: Use av_freep(), avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Nov 2014 17:44:35 +0000 (18:44 +0100)]
avdevice/iec61883: Use av_freep(), avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Fri, 21 Nov 2014 08:45:42 +0000 (09:45 +0100)]
ffplay: fix mem leak when opening input or parsing options fail.
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Nov 2014 13:10:13 +0000 (14:10 +0100)]
avcodec/libspeexdec: make array const
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sat, 15 Nov 2014 17:53:58 +0000 (18:53 +0100)]
h264_mb: Use smaller data type for refs in await_references.
As far as I can tell the value can never go outside
the int16_t type.
And especially the cost of the initialization is
reduced quite a bit by making it smaller.
Overall decoding speedup not measurable though.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 15 Nov 2014 17:10:53 +0000 (18:10 +0100)]
h264_i386: Optimize decode_significance_8x8_x86 for 64 bit.
11674 -> 10877 decicycles on my Phenom II.
Overall speedup was unfortunately within measurement error.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 18 Oct 2014 13:28:03 +0000 (15:28 +0200)]
indeo2: move variable declarations into blocks using them.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 18 Oct 2014 13:26:26 +0000 (15:26 +0200)]
mxfdec: minor simplification.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Matthew Oliver [Sat, 22 Nov 2014 07:27:46 +0000 (18:27 +1100)]
lavf: fix apngdec under msvc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 21 Nov 2014 22:09:33 +0000 (19:09 -0300)]
lavf/apngdec: properly skip currently unsupported in-stream tags
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mark Reid [Sat, 22 Nov 2014 01:43:09 +0000 (17:43 -0800)]
libavformat/mxfdec.c: export source package uids and names as metadata
Changes since v1:
* renamed mxf_read_source_package -> mxf_read_package
v1 reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Nov 2014 01:09:09 +0000 (02:09 +0100)]
doc: fix the the typos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
TOYAMA Shin-ichi [Sat, 22 Nov 2014 00:23:43 +0000 (09:23 +0900)]
doc/decoders.texi: typo in description for option ifo_palette
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Nov 2014 00:23:42 +0000 (01:23 +0100)]
Merge commit '
cd975d5658a1cbe99939df75db59d5ae9fbcb4e0'
* commit '
cd975d5658a1cbe99939df75db59d5ae9fbcb4e0':
hevc: Spin the mv_mpv_mode calls in a stand alone function
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 22:45:26 +0000 (23:45 +0100)]
Michael Niedermayer [Fri, 21 Nov 2014 22:18:30 +0000 (23:18 +0100)]
Merge commit '
312daa15891dc7abb77a404fe927d5ee35c52a71'
* commit '
312daa15891dc7abb77a404fe927d5ee35c52a71':
vp9: Use the correct upper bound for seg_id
Conflicts:
libavcodec/vp9.h
libavcodec/vp9block.c
Not merged, the value was correct before as far as i can see
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 16 Nov 2014 10:29:41 +0000 (11:29 +0100)]
hevc: Spin the mv_mpv_mode calls in a stand alone function
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Fri, 21 Nov 2014 21:33:23 +0000 (22:33 +0100)]
Merge commit '
d466d82faaf6e0e57a3a4be5e38e3902ef251ac3'
* commit '
d466d82faaf6e0e57a3a4be5e38e3902ef251ac3':
dvdsubdec: Do not leak on failure path
Conflicts:
libavcodec/dvdsubdec.c
See:
7fa9f7ef1c2f0cee81ec6ea6a4ff10af4c4fc62c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 21:25:09 +0000 (22:25 +0100)]
Merge commit '
a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b'
* commit '
a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b':
libtwolame: prevent a NULL pointer dereference
See:
a586b3d9b1df9099c18d3e15c9b261f6612ad2ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 21:15:32 +0000 (22:15 +0100)]
avfilter/formats: Alloc NULL fmts in SET_COMMON_FORMATS()
This avoids null pointer dereferences in case memory allocation has failed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 21:13:44 +0000 (22:13 +0100)]
avfilter/formats: free the correct pointer in ADD_FORMAT()
Also only free it when it was not previously allocated to return to the
state prior to the failing function call
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 20:39:26 +0000 (21:39 +0100)]
Merge commit '
863ee8a855b8ce27ffef41479eb66da58763faed'
* commit '
863ee8a855b8ce27ffef41479eb66da58763faed':
lavfi: clean memory on error in ADD_FORMAT()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 20:30:01 +0000 (21:30 +0100)]
Merge commit '
fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6'
* commit '
fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6':
xwma: Do not leak on failure path
Conflicts:
libavformat/xwma.c
See:
375a0c03a9a401a328a94b3d9f5338ab1524f7ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 20:02:17 +0000 (21:02 +0100)]
Merge commit '
aa8b39d999589154f79300de9038994d0093cd34'
* commit '
aa8b39d999589154f79300de9038994d0093cd34':
lavc: Move the libtwolame encoder registration to the list for external libraries
Conflicts:
libavcodec/allcodecs.c
See:
f5f98727b361c62d3962cef37a100db95d62b702
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 19:21:56 +0000 (20:21 +0100)]
Changelog: add zygoaudio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 19:08:56 +0000 (20:08 +0100)]
avcodec/libspeexdec: more verbose error message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 19:08:05 +0000 (20:08 +0100)]
avcodec/libspeexdec: support zygoaudio
Fixes Ticket1873
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 17:02:01 +0000 (18:02 +0100)]
avcodec/vp6: Use av_freep(), avoid leaving stale pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 17:02:01 +0000 (18:02 +0100)]
avdevice/avdevice.c: Use av_freep(), avoid leaving stale pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Nov 2014 17:02:01 +0000 (18:02 +0100)]
avdevice/fbdev_common: Use av_freep(), avoid leaving stale pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>