191ee4aefb
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>
2013-09-27 12:51:08 +00:00
110a2f446d
avfilter/af_ladspa: allow changing controls dynamically
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-27 12:49:55 +00:00
4d86a945df
avfilter/af_ladspa: refactor code setting input control ports values
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-27 12:49:54 +00:00
d8d235ffe9
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>
2013-09-27 13:27:31 +02:00
fc424f37a3
Merge commit 'a529fa2f4dd3292ba7d9cd3e6ba76425b1ba7aef'
...
* commit 'a529fa2f4dd3292ba7d9cd3e6ba76425b1ba7aef':
lxf: remove deplanarization hack
See: 37e2a9783f
2013-09-27 13:10:18 +02:00
b654aa6beb
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: 467dfd5dfa
2013-09-27 13:05:05 +02:00
e82071e727
Merge commit '839df90c718dcab9b9e91ca3c7e73479b3e8103c'
...
* commit '839df90c718dcab9b9e91ca3c7e73479b3e8103c':
lxf: Support 16-channel files
lxf: Support version 1 files
Conflicts:
libavformat/lxfdec.c
See: e701b0cf751a06d6dd86
2013-09-27 12:31:15 +02:00
72eddc10fa
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>
2013-09-27 12:13:41 +02:00
328a5b93d3
Merge commit '06ebc0bf9a6401733a4ce1310325de19f631819a'
...
* commit '06ebc0bf9a6401733a4ce1310325de19f631819a':
lavf: Allocate arrays with av_realloc if they will be realloced later
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27 11:45:37 +02:00
47c5c942f8
Merge commit '1af78b865b66acb8020c54262f12aa41ad47e05c'
...
* commit '1af78b865b66acb8020c54262f12aa41ad47e05c':
rtpdec_qt: Add an accidentally removed allocation return value check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27 11:38:49 +02:00
f31c36e552
Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93'
...
* commit '705b748e8d8612385c96428ae36ed0d42a170d93':
tls: Add support for listen mode
Conflicts:
doc/protocols.texi
libavformat/tls.c
libavformat/version.h
See: 4f4eb380f0
2013-09-27 11:33:19 +02:00
689a1bd917
Merge commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1'
...
* commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1':
http: Pass options through to the nested protocol
Conflicts:
libavformat/http.c
See: b6f435fbc8
2013-09-27 10:38:04 +02:00
e6e71fd7b5
Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c'
...
* commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c':
tls: Add options for verifying the peer certificate
Conflicts:
doc/protocols.texi
libavformat/tls.c
libavformat/version.h
See: b2460858f6973a758f52
2013-09-27 09:33:28 +02:00
5c349ad08a
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
2013-09-27 01:33:46 +02:00
a529fa2f4d
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
2013-09-27 01:33:46 +02:00
7e52080cb1
pcm: support 24-bit/32-bit little-endian planar
...
Used by LXF.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-09-27 01:33:45 +02:00
839df90c71
lxf: Support 16-channel files
...
Reported, analyzed and tested by Gabriel Gerard.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-09-27 01:33:45 +02:00
779951cd2c
lxf: Support version 1 files
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-09-27 01:33:45 +02:00
d872fb0f7f
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>
2013-09-26 23:14:03 +03:00
06ebc0bf9a
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>
2013-09-26 23:13:53 +03:00
1af78b865b
rtpdec_qt: Add an accidentally removed allocation return value check
...
This check was mistakenly removed in 5626f994f
2013-09-26 23:13:50 +03:00
705b748e8d
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>
2013-09-26 23:13:35 +03:00
5c53bf7aaf
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>
2013-09-26 23:13:16 +03:00
8b09d917e7
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>
2013-09-26 23:13:06 +03:00
f31011e9ab
avcodec/parser: reset indexes on realloc failure
...
Fixes Ticket2982
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26 21:03:48 +02:00
5dc6c0ea9e
avformat/mpegts: check avio_tell() return code before using it
...
Fixes Ticket2962
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26 16:43:55 +02:00
e024953722
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>
2013-09-26 14:56:32 +02:00
cd05c4060a
avformat/mpegenc: minor simplification / use AV_WB16()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26 13:36:45 +02:00
1906e00030
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
g2meet: Respect cursor_stride properly everywhere
See: c88ac1e023
2013-09-26 10:21:36 +02:00
32cde96296
avformat/mpegenc: Better heuristic for ordering packets
...
This prevents underflows in quite constrained cases
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26 03:13:38 +02:00
930406325c
avformat/mpegenc: Better default for max_delay
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26 03:12:20 +02:00
b637118086
avformat/mpegenc: change assert to av_assert0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26 02:16:12 +02:00
ddd0e23d58
avformat/mpegenc: improve field names in underflow error message
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26 01:07:24 +02:00
851a6e2f1a
avcodec/wmalosslessdec: Fix return code for invalid buffer sizes
...
Fixes infinite loop
Fixes Ticket2979
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 21:50:27 +02:00
f5498ef38d
avcodec/flicvideo: fix infinite loops
...
Fixes #2995 .
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-25 19:45:49 +00:00
c99d27287d
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>
2013-09-25 20:10:24 +02:00
45f0623ae3
avcodec/lagarith: check scaled probabilities
...
Prevents infinite loop
Fixes Ticket2988
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 18:26:13 +02:00
4370f65be8
g2meet: Respect cursor_stride properly everywhere
...
This fixes a regression with rgb cursors since b1e46988
2013-09-25 17:42:01 +03:00
ab6fbe8206
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>
2013-09-25 16:30:25 +02:00
c3c6999ea1
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>
2013-09-25 11:02:32 +02:00
9b3d4258d9
Merge commit '2725f2d40315b56f17c5dffe39dda7d94786302d'
...
* commit '2725f2d40315b56f17c5dffe39dda7d94786302d':
doc/filters: fix an option name in the unsharp docs
Conflicts:
doc/filters.texi
See: b7b72963e0
2013-09-25 10:53:32 +02:00
4a89868c5f
Merge commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5'
...
* commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5':
h264: do not reinitialize the global cabac tables at each slice header
See: 1e2e2c8095
2013-09-25 10:25:17 +02:00
b0b66269f4
Merge commit 'e880418660c80e2f12a123e131975cdb6b12cd13'
...
* commit 'e880418660c80e2f12a123e131975cdb6b12cd13':
cabac: remove write-only h264_mps_state[]
Conflicts:
libavcodec/cabac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 10:02:09 +02:00
57070d9892
Merge commit '668643b9239c70b777aea322eab411ebc960d9a0'
...
* commit '668643b9239c70b777aea322eab411ebc960d9a0':
matroskadec: check av_strdup() when setting defaults
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 09:39:24 +02:00
65bf9a44d7
avcodec/pngdec: check for stream end in png_decode_idat()
...
Fix infinite loop
Fix Ticket2978
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 02:17:36 +02:00
bb4b041df3
avcodec/mpegvideo_enc: check qmin/qmax
...
Fixes Ticket2990
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 00:44:17 +02:00
c88ac1e023
avcodec/g2meet: fix regression with rgb cursors
...
Fixes Ticket2972
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 00:25:23 +02:00
5f4b1b1cbd
lavc doxy: document that avcodec_flush_buffers() invalidates decoded frames
2013-09-24 17:34:00 +02:00
2725f2d403
doc/filters: fix an option name in the unsharp docs
2013-09-24 17:22:11 +02:00
dcc7686ae7
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>
2013-09-24 17:15:24 +02:00
Paul B Mahol
Michael Niedermayer
Luca Barbato
Carl Eugen Hoyos
Reimar Döffinger
Martin Storsjö
Kostya Shishkov
Anton Khirnov