Nicolas George
05e64b51bb
lavfi/aresample: set buffer properties after copy.
...
The aresample filter changes the format, layout and/or sample rate,
it can not copy them blindly from its input.
Fix trac ticket 1671 because af_volume uses the properties from the
buffer and not from the link.
2012-09-13 11:52:49 +02:00
Nicolas George
3593f577b0
lavfi/audio: fix an invalid boundary check.
2012-09-13 11:52:49 +02:00
Carl Eugen Hoyos
72791e41d4
Fix muxing mjpeg in swf.
...
(cherry picked from commit 7680d99b43 )
2012-09-13 09:21:26 +02:00
jamal
4155968fc6
build: Fix some paths in uninstall-libs
...
Folder and file names weren't being separated with a slash.
This resulted in .dll.a, .lib and .def files not being removed on uninstall.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net >
(cherry picked from commit 49440853d0 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-13 04:47:46 +02:00
jamal
d14ce69869
doc/Makefile: Add missing $(HOSTEXESUF) to print_options
...
(cherry picked from commit d48f014ff1 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-13 04:47:20 +02:00
Ronald S. Bultje
b45a8f6d24
dxva2: include dxva.h if found
...
Apparently, some build environments require dxva.h even for dxva2,
while others lack this header entirely. Including it conditionally
allows building in both cases.
Signed-off-by: Martin Storsjö <martin@martin.st >
(cherry picked from commit fa84506177 )
Conflicts:
configure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-13 04:46:50 +02:00
Michael Niedermayer
ae8491ce33
configure: fix sctp check.
...
This fixes build failures on debian/kfreebsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit bed63a5e98 )
Conflicts:
configure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-13 04:45:57 +02:00
Carl Eugen Hoyos
3f78fe1d56
Clarify that -passlogfile has a different syntax when used with -vcodec libx264.
2012-08-31 14:16:36 +02:00
Reimar Döffinger
fb52da522c
oggdec: Initialize stream index to -1 in ogg_packet.
...
The previous method of having to initialize it outside lead
to incorrect code: even if it was initialized, it usually was
only initialized once, thus a packet that could not be matched
to any stream would just be processed with the return values
from the previous call.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
(cherry picked from commit 69aeba1396 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-06 16:52:18 +02:00
Reimar Döffinger
5231a35559
oggdec: simplify start time calculation code.
...
Also slightly more correct behaviour in case streams_left for
some reason is 0 from the start.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
(cherry picked from commit a4163b2d65 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-06 16:52:09 +02:00
Michael Niedermayer
606538df6c
oggdec: check stream index before using it in ogg_get_length()
...
Fixes crash based on a uninitialized array index read.
If the read does not crash then out of array writes based
on the same index might have been triggered afterwards.
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 9e1c55cfde )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-06 16:51:59 +02:00
Michael Niedermayer
a19010f7a6
wmaenc: dont mess with the bitrate.
...
The bitrate is not writeable by an encoder.
Fixes generation of invalid wma
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-07-02 13:29:41 +02:00
Michael Niedermayer
39fe8033bb
Update for 0.11.1
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
n0.11.1
2012-06-07 22:53:09 +02:00
Michael Niedermayer
964f8419dd
probetest: allow specifying parameters on the command line
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 6cfaccabc4 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 01:06:58 +02:00
Michael Niedermayer
5c2ffa2ce7
mpegvideo: fix out of heap array accesses
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 317ca0d3f7 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Michael Niedermayer
6be8e44c00
search_for_quantizers_faac: fix curband
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 33775c3507 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Reimar Döffinger
565581b0a4
ffmpeg: avoid a confusing and easy to break if().
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 93147daf59 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Michael Niedermayer
dc85ca0945
ffmpeg: use isatty() before messing with the terminal state
...
This fixes terminal messup in case of crashes (like in make fate)
Reviewed-by: François Revol <revol@free.fr >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit c8a11014b6 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Michael Niedermayer
a53ca16ae9
swr-test: support "--help"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 787c395a30 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Michael Niedermayer
92e5e62156
buildsys: fix rules for swresample-test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 63b1c08073 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Carl Eugen Hoyos
e1c9434424
Make H264 reorder buffer size message less verbose.
...
(cherry picked from commit a3bc7f916d )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Carl Eugen Hoyos
af3f7c88f2
Add missing CRLFs to avisynth error messages.
...
(cherry picked from commit 1faf0d6a7a )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Carl Eugen Hoyos
b4294e2319
Fix MP2 muxer Makefile dependencies.
...
Found, analysed and tested by trac user Jamal.
Fixes ticket #1411
(cherry picked from commit 757d5b9bfd )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Kostya Shishkov
7d97936495
mpc8: fix maximum bands handling
...
In Musepack SV8 codec property tell the maximum nonzero band, but every
frame codes maximum band as a limit (i.e. strictly less than given value).
Synthesis also expects maximum nonzero band, so there's a need to convert
frame maximum band limit value.
(cherry picked from commit b56825c40e )
Conflicts:
libavcodec/mpc8.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Alex Converse
f9fc08de65
aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono.
...
(cherry picked from commit 79c8e29a7e )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Carl Eugen Hoyos
31d3b3b5d5
Fix compilation condition for some ProRes dsp encoder functions.
...
Found, analysed and tested by trac user Jamal.
Fixes part of Ticket #1404 .
(cherry picked from commit 568a592418 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Carl Eugen Hoyos
706809adb2
Fix compilation condition for some ProRes dsp decoder functions.
...
Found, analysed and tested by trac user Jamal.
Fixes part of Ticket #1404 .
(cherry picked from commit 84986b4e61 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Carl Eugen Hoyos
4e66ca5f37
Fix ProRes decoder Makefile dependencies.
...
Found, analysed and tested by trac user Jamal.
Fixes part of Ticket #1404 .
(cherry picked from commit a4b885d55e )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Carl Eugen Hoyos
530ce76a05
Fix G.723.1 encoder Makefile dependencies.
...
(cherry picked from commit c02ef07881 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:26 +02:00
Michael Niedermayer
0e74b21427
ffv1dec: print more information for -debug 1
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 38c9ebd2a9 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
381a914024
ffv1: fix log level of FF_DEBUG_PICT_INFO
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 730d079bf7 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
d0d9182d3e
mpc8: fix channel checks
...
fix heap array overflow
Found-by: Piotr Bandurski <ami_stuff@o2.pl >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 44c10168cf )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
320704f739
av_get_audio_frame_duration: fix FPE
...
Fixes ticket1392
Found-by: Piotr Bandurski <ami_stuff@o2.pl >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit a5ad3c2382 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
be1d65031f
mace: check channel count, fixes FPE
...
Fixes ticket1391
Found-by: Piotr Bandurski <ami_stuff@o2.pl >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 6df1cfa7e4 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
bbc4d287c9
h263: disable loop filter with lowres
...
Fixes ticket1212
Found-by: Piotr Bandurski <ami_stuff@o2.pl >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit cc229d4e83 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
3bb942e6f0
mpc7: fix handling of last frame
...
Fixes heap buffer overflow
Fixes ticket1393
Found-by: Piotr Bandurski <ami_stuff@o2.pl >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit e95233789c )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
e863d3306f
oggdec: fix regression that caused reading the whole file during open
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit e0eaf10049 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
433ec3afa3
png_parser: dont falsely mark frames as keyframes
...
Fixes Ticket1381
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 82570d2f09 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
d0cb4dc471
lavf: use input keyframe flag when muxer does not provide keyframe flags.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 5665674b55 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
95b1cbc4cb
bink: fix out of reference frame read
...
Fixes Ticket1374
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit b3675f890a )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
177fc2438a
h264: log debug output for slightly truncated streams
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit fb4e434cfb )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
46b99bb70c
h264: try to better handle h264 streams that are slightly truncated
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit cd0f9f00a2 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
03275ed219
bmv: fix apparent sign error in the frame_off check
...
Fixes part of Ticket1373
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit debbcfae60 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
ae5f69a98f
bmv: fix integer overflows in vlc decoder.
...
Fixes part of Ticket1373
Found-by: Piotr Bandurski <ami_stuff@o2.pl >
Based-on-patch-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 679c578cb8 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
dc72a59fe5
ffv1: fix integer overflow in quant table initialization
...
Fixes part of Ticket1372
Found-by: Piotr Bandurski <ami_stuff@o2.pl >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 9ebe6e3910 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
70af4f209f
ffv1: fix crash caused by version becoming inconsistent
...
Fixes part of Ticket1372
Found-by: Piotr Bandurski <ami_stuff@o2.pl >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 97c281d5b7 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
0964e189da
fraps: fix version 0/1 input data size check.
...
Fixes array overread.
Fixes Ticket1371
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 0bae6661cd )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
7883efbbb2
wmv1: check that the input buffer is large enough
...
Fixes null ptr deref
Fixes Ticket1367
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit f23a2418fb )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
af67af5938
rv20: fix lowres out of array read
...
Fixes Ticket1239
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 0766b6e3ec )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00
Michael Niedermayer
d3c564b784
yopdec: check frame oddness to be within supported limits
...
Fixes Ticket1365
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit febc013dc5 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-07 00:55:25 +02:00