]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Mon, 30 Sep 2013 00:20:49 +0000 (02:20 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
omadec: fix bitrate for ATRAC3+ streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 30 Sep 2013 00:15:36 +0000 (02:15 +0200)]
Merge commit '
23d0fdcf6f30843fc3f14084d80581f1ca10f1f3 '
* commit '
23d0fdcf6f30843fc3f14084d80581f1ca10f1f3 ':
Add support for multichannel ATRAC3+ streams.
Conflicts:
libavformat/oma.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 30 Sep 2013 00:03:33 +0000 (02:03 +0200)]
Merge commit '
93370d12164236d59645314871a1d6808b2a8ddb '
* commit '
93370d12164236d59645314871a1d6808b2a8ddb ':
mxfdec: set audio timebase to 1/samplerate
Conflicts:
libavformat/mxfdec.c
tests/ref/fate/mxf-demux
tests/ref/seek/lavf-mxf
tests/ref/seek/lavf-mxf_d10
See:
83cab07a4c7f8ee1521c49e387b7d86de78d1955
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 23:54:59 +0000 (01:54 +0200)]
Merge commit '
ff07ec143ebd3833fd5a3f4b6c00474ac523a31f '
* commit '
ff07ec143ebd3833fd5a3f4b6c00474ac523a31f ':
pcx: Return an error on broken palette if err_detect is set to 'explode'
Conflicts:
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 23:46:54 +0000 (01:46 +0200)]
Merge commit '
d1d99e3befea5d411ac3aae72dbdecce94f8b547 '
* commit '
d1d99e3befea5d411ac3aae72dbdecce94f8b547 ':
pcx: Check the packet size before assuming it fits a palette
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 23:41:51 +0000 (01:41 +0200)]
Merge commit '
7ba0cedbfeff5671b264d1d7e90777057b5714c6 '
* commit '
7ba0cedbfeff5671b264d1d7e90777057b5714c6 ':
rpza: Fix a buffer size check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 23:27:24 +0000 (01:27 +0200)]
Michael Niedermayer [Sun, 29 Sep 2013 23:21:30 +0000 (01:21 +0200)]
Merge commit '
fc739b3eefa0b58d64e7661621da94a94dbc8a82 '
* commit '
fc739b3eefa0b58d64e7661621da94a94dbc8a82 ':
xan: Only read within the data that actually was initialized
Conflicts:
libavcodec/xan.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 23:09:38 +0000 (01:09 +0200)]
Merge commit '
30db94dc399f6e4ef8905049d9b740556f0fce47 '
* commit '
30db94dc399f6e4ef8905049d9b740556f0fce47 ':
xan: Use bytestream2 to limit reading to within the buffer
Conflicts:
libavcodec/xan.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 22:56:24 +0000 (00:56 +0200)]
Merge commit '
9fb0de86b49e9fb0709a8ad1e1875e35da841887 '
* commit '
9fb0de86b49e9fb0709a8ad1e1875e35da841887 ':
pcx: Consume the whole packet if giving up due to missing palette
Conflicts:
libavcodec/pcx.c
See:
b4e516e30e7004a0454a9009080c4de38987189a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 22:40:17 +0000 (00:40 +0200)]
Merge commit '
a81cad8f86d1feb7e4bfae29e43f3e994935a5c7 '
* commit '
a81cad8f86d1feb7e4bfae29e43f3e994935a5c7 ':
pngdec: Stop trying to decode once inflate returns Z_STREAM_END
Conflicts:
libavcodec/pngdec.c
See:
65bf9a44d7b0295e03463fd143499ab5b85d0cb7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 22:32:01 +0000 (00:32 +0200)]
Merge commit '
c231987662194d009dd91bfc57c678e0e70ca161 '
* commit '
c231987662194d009dd91bfc57c678e0e70ca161 ':
mov: Make sure the read sample count is nonnegative
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 22:13:03 +0000 (00:13 +0200)]
Merge commit '
640a2427aafa774b83316b7a8c5c2bdc28bfd269 '
* commit '
640a2427aafa774b83316b7a8c5c2bdc28bfd269 ':
bfi: Add some very basic sanity checks for input packet sizes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 21:59:16 +0000 (23:59 +0200)]
Michael Niedermayer [Sun, 29 Sep 2013 21:45:56 +0000 (23:45 +0200)]
Merge commit '
a9221e39600a31ee13e736e9e47743cde23f0280 '
* commit '
a9221e39600a31ee13e736e9e47743cde23f0280 ':
electronicarts: Add more sanity checking for the number of channels
Note: This check is probably unnecessary
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 21:41:13 +0000 (23:41 +0200)]
Merge commit '
d07aa3f02b73ab1371c13ac7898338380ca0932b '
* commit '
d07aa3f02b73ab1371c13ac7898338380ca0932b ':
riffdec: Add sanity checks for the sample rate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 29 Sep 2013 21:37:46 +0000 (23:37 +0200)]
swr: fix example code and doxy indent.
Clément Bœsch [Tue, 24 Sep 2013 19:43:19 +0000 (21:43 +0200)]
doc/faq: add @command{} in the tool debug entry.
Clément Bœsch [Tue, 24 Sep 2013 19:42:21 +0000 (21:42 +0200)]
doc/faq: remove indent in examples.
CSS should take care of this.
Clément Bœsch [Tue, 24 Sep 2013 19:41:49 +0000 (21:41 +0200)]
doc/faq: remove Delphi/Pascal entry.
Link is dead.
Clément Bœsch [Tue, 24 Sep 2013 19:41:21 +0000 (21:41 +0200)]
doc/faq: rework r_frame_rate entry.
Michael Niedermayer [Sun, 29 Sep 2013 21:24:27 +0000 (23:24 +0200)]
Merge commit '
28ff439efd2362fb21e1a78610737f2e26a72d8f '
* commit '
28ff439efd2362fb21e1a78610737f2e26a72d8f ':
mvi: Add sanity checking for the audio frame size
Conflicts:
libavformat/mvi.c
See:
ea1d8465e6eca582c09e2526f677033b62576fda
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 21:03:58 +0000 (23:03 +0200)]
Merge commit '
59480abce7e4238e22b3a4a904a9fe6abf4e4188 '
* commit '
59480abce7e4238e22b3a4a904a9fe6abf4e4188 ':
alac: Do bounds checking of lpc_order read from the bitstream
See:
fd4f4923cce6a2cbf4f48640b4ac706e614a1594
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 20:59:11 +0000 (22:59 +0200)]
Merge commit '
adc09136a4a63b152630abeacb22c56541eacf60 '
* commit '
adc09136a4a63b152630abeacb22c56541eacf60 ':
xwma: Avoid division by zero
Conflicts:
libavformat/xwma.c
See:
a3cb7f992f88fcfa524bd9cd08b28e09d6718f75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 20:51:02 +0000 (22:51 +0200)]
Merge commit '
8d07258bb6063d0780ce2d39443d6dc6d8eedc5a '
* commit '
8d07258bb6063d0780ce2d39443d6dc6d8eedc5a ':
avidec: Make sure a packet is large enough before reading its data
Conflicts:
libavformat/avidec.c
See:
028cc42a1638e6f93a857f11c2568d1c3a51e612
Note: data!=NULL implies that the allocated array is at least FF_INPUT_BUFFER_PADDING_SIZE large
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 20:42:26 +0000 (22:42 +0200)]
Merge commit '
68ff9981283a56c731f00c2ee7901103665092fc '
* commit '
68ff9981283a56c731f00c2ee7901103665092fc ':
vqf: Make sure the bitrate is in the valid range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 20:27:01 +0000 (22:27 +0200)]
Merge commit '
9277050e2918e0a0df9689721a188a604d886616 '
* commit '
9277050e2918e0a0df9689721a188a604d886616 ':
vqf: Make sure sample_rate is set to a valid value
See:
e481ba2ed79421d82ed631d187c05c03260c6561
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Maxim Poliakovski [Sun, 29 Sep 2013 19:53:49 +0000 (21:53 +0200)]
omadec: fix bitrate for ATRAC3+ streams
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Maxim Poliakovski [Fri, 27 Sep 2013 22:18:18 +0000 (00:18 +0200)]
Add support for multichannel ATRAC3+ streams.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sat, 28 Sep 2013 14:56:54 +0000 (16:56 +0200)]
mxfdec: set audio timebase to 1/samplerate
Fixes sync in some samples (e.g. bugs 7581 and 8374 in VLC).
Based on a commit by Matthieu Bouron <matthieu.bouron@gmail.com>
Reported-by: Jean-Baptiste Kempf <jb@videolan.org>
CC: libav-stable@libav.org
Michael Niedermayer [Sun, 29 Sep 2013 19:11:47 +0000 (21:11 +0200)]
avcodec/tiff_common: fix bprint max sizes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 29 Sep 2013 19:07:15 +0000 (19:07 +0000)]
avfilter/vf_rotate: use vsub for output plane height calculation
Output plane height used horizontal instead of vertical subsampling.
This is just cosmetic change as filter does not support formats where
vertical subsampling does not match horizontal one.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Sun, 29 Sep 2013 15:39:52 +0000 (18:39 +0300)]
pcx: Return an error on broken palette if err_detect is set to 'explode'
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 29 Sep 2013 10:02:27 +0000 (13:02 +0300)]
pcx: Check the packet size before assuming it fits a palette
This fixes reads out of bounds.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 22:24:20 +0000 (01:24 +0300)]
rpza: Fix a buffer size check
We read 2 bytes for 15 out of 16 pixels, therefore we need to
have at least 30 bytes, not 16.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 22:04:05 +0000 (01:04 +0300)]
xxan: Disallow odd width
Decoded data is always written in pairs within this decoder.
This fixes writes out of bounds.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 21:59:50 +0000 (00:59 +0300)]
xan: Only read within the data that actually was initialized
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 21:53:58 +0000 (00:53 +0300)]
xan: Use bytestream2 to limit reading to within the buffer
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 21:38:50 +0000 (00:38 +0300)]
pcx: Consume the whole packet if giving up due to missing palette
Previously, we returned 0, meaning successful decoding but 0
bytes consumed, leading to an infinite loop.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 21:12:04 +0000 (00:12 +0300)]
pngdec: Stop trying to decode once inflate returns Z_STREAM_END
If the input buffer contains more data after the deflate stream,
the loop previously left running infinitely, with inflate returning
Z_STREAM_END.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 20:57:36 +0000 (23:57 +0300)]
mov: Make sure the read sample count is nonnegative
This avoids setting a negative number of frames, ending up with a
negative average frame rate.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 20:46:04 +0000 (23:46 +0300)]
bfi: Add some very basic sanity checks for input packet sizes
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 20:42:40 +0000 (23:42 +0300)]
bfi: Avoid divisions by zero
If a zero-length video packet is to be returned, just return
AVERROR(EAGAIN) and switch back to the audio stream.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 20:38:40 +0000 (23:38 +0300)]
electronicarts: Add more sanity checking for the number of channels
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 20:32:39 +0000 (23:32 +0300)]
riffdec: Add sanity checks for the sample rate
This avoids a division by zero for G726.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 20:26:18 +0000 (23:26 +0300)]
mvi: Add sanity checking for the audio frame size
This avoids a division by zero.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 27 Sep 2013 21:22:52 +0000 (00:22 +0300)]
alac: Do bounds checking of lpc_order read from the bitstream
In lpc_prediction(), we write up to array element 'lpc_order' in
an array allocated to hold 'max_samples_per_frame' elements.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 28 Sep 2013 20:13:26 +0000 (23:13 +0300)]
xwma: Avoid division by zero
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 27 Sep 2013 21:41:31 +0000 (00:41 +0300)]
avidec: Make sure a packet is large enough before reading its data
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Sun, 29 Sep 2013 16:36:25 +0000 (16:36 +0000)]
doc/demuxers: fix image2 examples
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Sat, 28 Sep 2013 20:19:10 +0000 (23:19 +0300)]
vqf: Make sure the bitrate is in the valid range
Even if the sample rate is valid, an invalid bitrate could
pass the mode combination test below.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 27 Sep 2013 21:34:35 +0000 (00:34 +0300)]
vqf: Make sure sample_rate is set to a valid value
This avoids divisions by zero later (and possibly assertions in
time base scaling), since an invalid rate_flag combined with an
invalid bitrate below could pass the mode combination test.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 29 Sep 2013 15:02:57 +0000 (17:02 +0200)]
avformat/mpegenc: check, warn and clip muxrate to syntactical possible values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 15:02:06 +0000 (17:02 +0200)]
avformat/mpegenc: check, warn and clip VBV value to within syntactically possible values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 15:00:54 +0000 (17:00 +0200)]
avformat/mpegenc: fix muxrates AVOption maximum value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Sep 2013 12:33:40 +0000 (14:33 +0200)]
avformat/mxfenc: instance number is just 24 bits
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Sep 2013 18:53:41 +0000 (20:53 +0200)]
Revert "fate: Force diff into text mode"
This should fix AIX and should no longer be needed
This reverts commit
b78e75ebc9b03bea8f0c48da266ee6cc0fb8e22d .
Michael Niedermayer [Tue, 24 Sep 2013 18:52:16 +0000 (20:52 +0200)]
avcodec/exif: print bytes and undefined types as scalar lists
This prevents odd characters from ending in the fate test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Sep 2013 18:50:22 +0000 (20:50 +0200)]
avcodec/tiff_common: add ff_tadd_bytes_metadata()
The le argument is passed so the function has the same prototype as the
other similar functions. It is otherwise unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 29 Sep 2013 05:11:56 +0000 (07:11 +0200)]
Remove an incorrect and unneeded assert in the amr demuxer.
Asserting a specific codec is not correct since libavformat
allows forcing a codec, an equivalent check is in the
following line.
Fixes ticket #3001.
Ronald S. Bultje [Fri, 20 Sep 2013 12:01:19 +0000 (08:01 -0400)]
Rewrite emu_edge functions to have separate src/dst_stride arguments.
This allows supporting files for which the image stride is smaller than
the max. block size + number of subpel mc taps, e.g. a 64x64 VP9 file
or a 16x16 VP8 file with -fflags +emu_edge.
Ronald S. Bultje [Sat, 28 Sep 2013 13:20:24 +0000 (09:20 -0400)]
vp8: use 2 registers for dst_stride and src_stride in neon bilin filter.
Matthieu Bouron [Thu, 28 Mar 2013 14:41:48 +0000 (15:41 +0100)]
lavf/mxfdec: add j2k codec to intra only codecs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Sep 2013 18:29:05 +0000 (20:29 +0200)]
avcodec/huffman: Allow specifying nb_bits to ff_huff_build_tree()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Sep 2013 15:07:47 +0000 (17:07 +0200)]
avformat/utils: factor find_decoder() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 28 Sep 2013 15:36:54 +0000 (15:36 +0000)]
avformat/vfq: fix deadlock in vqf_read_header()
Fixes #3010.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 28 Sep 2013 14:33:30 +0000 (14:33 +0000)]
avfilter/dualinput: remove unused variable
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Bradshaw [Tue, 17 Sep 2013 02:10:04 +0000 (20:10 -0600)]
libopenjpeg: fix encoding of odd sized subsampled images
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 28 Sep 2013 00:13:59 +0000 (20:13 -0400)]
Convert multiplier for MV from int to ptrdiff_t.
This prevents emulated_edge_mc from not undoing mvy*stride-related
integer overflows.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Sep 2013 09:02:01 +0000 (11:02 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: allow user-provided execute() callbacks
Conflicts:
libavfilter/avfilter.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Sep 2013 08:47:43 +0000 (10:47 +0200)]
Merge commit '
38e15df1489d86c016515223ee693e7d0326c56a '
* commit '
38e15df1489d86c016515223ee693e7d0326c56a ':
avframe: note that linesize is not the usable data size
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 8 Aug 2013 14:28:41 +0000 (16:28 +0200)]
lavfi: allow user-provided execute() callbacks
Anton Khirnov [Fri, 27 Sep 2013 14:49:05 +0000 (16:49 +0200)]
avframe: note that linesize is not the usable data size
Michael Niedermayer [Fri, 27 Sep 2013 20:53:24 +0000 (22:53 +0200)]
avcodec/imc: Check flcoeffs5
Fixes infinite loop
Fixes Ticket2996
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 27 Sep 2013 09:22:49 +0000 (09:22 +0000)]
fate: add phase test
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 27 Sep 2013 18:51:49 +0000 (18:51 +0000)]
avfilter: add av_cold to init()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 27 Sep 2013 18:12:37 +0000 (20:12 +0200)]
avcodec/mlpdec: Fail if the input is too small
This fixes a infinite loop
Fixes Ticket2986
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Sep 2013 16:54:58 +0000 (18:54 +0200)]
avformat/mxfdec: check sample size more completely
Fixes division by zero
Fixes Ticket2992
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Georg Martius [Sat, 14 Sep 2013 00:54:39 +0000 (02:54 +0200)]
avfilter/vidstabtransform: update optzoom range values for recent vid.stab update.
Signed-off-by: Georg Martius <martius@mis.mpg.de>
Michael Niedermayer [Fri, 27 Sep 2013 13:55:11 +0000 (15:55 +0200)]
avformat/tls: fix {} error for the GNUTLS case
Found-by:" Geek.Song" <ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 27 Sep 2013 08:51:43 +0000 (08:51 +0000)]
avfilter/af_ladspa: set output channel layout for passthrough case
For cases when plugin does not return any samples we just return
input samples. Previously channel layout for outlink was not set.
Set it explicitly instead.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 24 Sep 2013 16:20:53 +0000 (16:20 +0000)]
avfilter/af_ladspa: allow changing controls dynamically
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 24 Sep 2013 16:08:17 +0000 (16:08 +0000)]
avfilter/af_ladspa: refactor code setting input control ports values
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 27 Sep 2013 11:27:31 +0000 (13:27 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lxf: check the nb_streams instead of relying on padding
Conflicts:
libavformat/lxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Sep 2013 11:09:10 +0000 (13:09 +0200)]
Michael Niedermayer [Fri, 27 Sep 2013 10:59:53 +0000 (12:59 +0200)]
Merge commit '
7e52080cb18332cb1da9fe133498750b6b4b0fb3 '
* commit '
7e52080cb18332cb1da9fe133498750b6b4b0fb3 ':
pcm: support 24-bit/32-bit little-endian planar
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/pcm.c
libavcodec/version.h
libavformat/nut.c
See:
467dfd5dfae7cc435a2b2e7cf012a0de2fea5848
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Sep 2013 10:29:36 +0000 (12:29 +0200)]
Merge commit '
839df90c718dcab9b9e91ca3c7e73479b3e8103c '
* commit '
839df90c718dcab9b9e91ca3c7e73479b3e8103c ':
lxf: Support 16-channel files
lxf: Support version 1 files
Conflicts:
libavformat/lxfdec.c
See:
e701b0cf7553202085840d3bfd1aff432b4de513
See:
1a06d6dd866318b49596c0bf5ed03917f952d3bd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Sep 2013 10:13:41 +0000 (12:13 +0200)]
Merge commit '
d872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9 '
* commit '
d872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9 ':
lavf: Reset the entry count and allocation size variables on av_reallocp failures
Conflicts:
libavformat/avienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Sep 2013 09:45:21 +0000 (11:45 +0200)]
Merge commit '
06ebc0bf9a6401733a4ce1310325de19f631819a '
* commit '
06ebc0bf9a6401733a4ce1310325de19f631819a ':
lavf: Allocate arrays with av_realloc if they will be realloced later
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Sep 2013 09:38:44 +0000 (11:38 +0200)]
Merge commit '
1af78b865b66acb8020c54262f12aa41ad47e05c '
* commit '
1af78b865b66acb8020c54262f12aa41ad47e05c ':
rtpdec_qt: Add an accidentally removed allocation return value check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Sep 2013 09:21:42 +0000 (11:21 +0200)]
Merge commit '
705b748e8d8612385c96428ae36ed0d42a170d93 '
* commit '
705b748e8d8612385c96428ae36ed0d42a170d93 ':
tls: Add support for listen mode
Conflicts:
doc/protocols.texi
libavformat/tls.c
libavformat/version.h
See:
4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Sep 2013 08:13:13 +0000 (10:13 +0200)]
Merge commit '
5c53bf7aaf03748464cbf978bffe7ffdb71112b1 '
* commit '
5c53bf7aaf03748464cbf978bffe7ffdb71112b1 ':
http: Pass options through to the nested protocol
Conflicts:
libavformat/http.c
See:
b6f435fbc87c024f8403fca69e6e6b98bccf93fa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Sep 2013 07:22:42 +0000 (09:22 +0200)]
Merge commit '
8b09d917e7dc7d7f2ace31419f802d4ff518236c '
* commit '
8b09d917e7dc7d7f2ace31419f802d4ff518236c ':
tls: Add options for verifying the peer certificate
Conflicts:
doc/protocols.texi
libavformat/tls.c
libavformat/version.h
See:
b2460858f64b2070d84dd861d4bbd16acfb9b0e9
See:
973a758f52a4e5fe63bd88806a4b2db034a032de
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 25 Jun 2013 14:42:02 +0000 (16:42 +0200)]
lxf: check the nb_streams instead of relying on padding
Remove the now unneeded stream pointer while at it.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Paul B Mahol [Fri, 16 Nov 2012 15:10:36 +0000 (15:10 +0000)]
lxf: remove deplanarization hack
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Paul B Mahol [Fri, 16 Nov 2012 16:00:04 +0000 (16:00 +0000)]
pcm: support 24-bit/32-bit little-endian planar
Used by LXF.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Carl Eugen Hoyos [Thu, 16 Aug 2012 08:20:25 +0000 (10:20 +0200)]
lxf: Support 16-channel files
Reported, analyzed and tested by Gabriel Gerard.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Reimar Döffinger [Sat, 24 Mar 2012 15:47:33 +0000 (16:47 +0100)]
lxf: Support version 1 files
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö [Thu, 26 Sep 2013 13:37:02 +0000 (16:37 +0300)]
lavf: Reset the entry count and allocation size variables on av_reallocp failures
When av_reallocp fails, the associated variables that keep track of
the number of elements in the array (and in some cases, the
separate number of allocated elements) need to be reset.
Not all of these might technically be needed, but it's better to
reset them if in doubt, to make sure variables don't end up
conflicting.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 26 Sep 2013 13:34:04 +0000 (16:34 +0300)]
lavf: Allocate arrays with av_realloc if they will be realloced later
Pointers returned from av_malloc can't in general be passed
to av_realloc.
Signed-off-by: Martin Storsjö <martin@martin.st>