OSDN Git Service
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>
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ö [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>
Martin Storsjö [Thu, 26 Sep 2013 13:34:59 +0000 (16:34 +0300)]
rtpdec_qt: Add an accidentally removed allocation return value check
This check was mistakenly removed in
5626f994f.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Sep 2013 09:30:52 +0000 (12:30 +0300)]
tls: Add support for listen mode
Also add options for specifying a certificate and key, which can
be used both when operating as client and as server.
Partially based on a patch by Peter Ross.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 7 Nov 2011 09:06:50 +0000 (11:06 +0200)]
http: Pass options through to the nested protocol
When passing a dict to the nested protocol, it will consume
the used options from it, so a separate copy needs to be used
when reopening the connection multiple times.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 22 Feb 2011 10:02:01 +0000 (12:02 +0200)]
tls: Add options for verifying the peer certificate
A file containing the trusted CA certificates needs to be
supplied via the ca_file AVOption, unless the TLS library
has got a system default file/database set up.
This doesn't check the hostname of the peer certificate with
openssl, which requires a non-trivial piece of code for
manually matching the desired hostname to the string provided
by the certificate, not provided as a library function.
That is, with openssl, this only validates that the received
certificate is signed with the right CA, but not that it is
the actual server we think we're talking to.
Verification is still disabled by default since we can't count
on a proper CA database existing at all times.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 26 Sep 2013 19:03:48 +0000 (21:03 +0200)]
avcodec/parser: reset indexes on realloc failure
Fixes Ticket2982
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Sep 2013 14:43:55 +0000 (16:43 +0200)]
avformat/mpegts: check avio_tell() return code before using it
Fixes Ticket2962
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Sep 2013 12:48:43 +0000 (14:48 +0200)]
avformat/wavdec: check smv_frames_per_jpeg
Values outside would not be possible due to limitations of jpeg itself
Fixes very long running loop
Fixes Ticket2977
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Sep 2013 11:36:45 +0000 (13:36 +0200)]
avformat/mpegenc: minor simplification / use AV_WB16()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Sep 2013 08:06:10 +0000 (10:06 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
g2meet: Respect cursor_stride properly everywhere
See:
c88ac1e0233f34582312dc617261b9270b61df19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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>
Kostya Shishkov [Wed, 25 Sep 2013 09:09:33 +0000 (12:09 +0300)]
g2meet: Respect cursor_stride properly everywhere
This fixes a regression with rgb cursors since
b1e46988.
Signed-off-by: Martin Storsjö <martin@martin.st>
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>