Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-09-15faxcompr: fix out of array readMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5891e454a667e42ef71a06bfd9661540ea3f3ebd) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-15escape124: fix integer overflow leading to excessive memory allocationMichael Niedermayer
Fixes Ticket1629 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3d7817048cb387de87600f2152075f78b37b60a6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-15sp5xdec: fix off by 1 error causing a crashMichael Niedermayer
Fixes Ticket1633 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f0896a6bd94e5b45447c7d640c8e8aa95d860d7a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-15mpegaudio_parser: reset state to prevent it to be randomMichael Niedermayer
Fixes Ticket1718 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 93b240f4a59348c07d3d7e4862227f6949c51e14) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-15pthread: Avoid crashes/odd behavior caused by spurious wakeupsBen Jackson
pthread_wait_cond can wake up for no reason (Wikipedia: Spurious_wakeup). The FF_THREAD_SLICE thread mechanism could spontaneously execute jobs or allow the caller of avctx->execute to return before all jobs were complete. This adds tests to both cases to ensure the wakeup is real. Signed-off-by: Ben Jackson <ben@ben.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e3329474a366de066b25e86f35f5abf9c5a4b7b2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13lavfi/aresample: set buffer properties after copy.Nicolas George
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-13lavfi/audio: fix an invalid boundary check.Nicolas George
2012-09-13Fix muxing mjpeg in swf.Carl Eugen Hoyos
(cherry picked from commit 7680d99b4302e476076cc1b8f2567f47c2aaef4d)
2012-09-13build: Fix some paths in uninstall-libsjamal
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 49440853d0c1e740daee0e2df1e65d5e67b1ad6b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13doc/Makefile: Add missing $(HOSTEXESUF) to print_optionsjamal
(cherry picked from commit d48f014ff1db985fa3f74eddfb30bf513f99ff7a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13dxva2: include dxva.h if foundRonald S. Bultje
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 fa84506177f0246b30d4ea6a99ee5d419f3e4550) Conflicts: configure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13configure: fix sctp check.Michael Niedermayer
This fixes build failures on debian/kfreebsd Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bed63a5e98b1ba1f3bca6c81ea819666c2d81fde) Conflicts: configure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-31Clarify that -passlogfile has a different syntax when used with -vcodec libx264.Carl Eugen Hoyos
2012-08-06oggdec: Initialize stream index to -1 in ogg_packet.Reimar Döffinger
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 69aeba1396d5a13e79cbc3cc9f49fd6896addb82) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-06oggdec: simplify start time calculation code.Reimar Döffinger
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 a4163b2d6583396845e06b1b976c3a981eb8cb1c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-06oggdec: check stream index before using it in ogg_get_length()Michael Niedermayer
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 9e1c55cfdec1e1e46fa39b92ea5c425ba9499c68) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-02wmaenc: dont mess with the bitrate.Michael Niedermayer
The bitrate is not writeable by an encoder. Fixes generation of invalid wma Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-08Update for 0.11.1n0.11.1Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07probetest: allow specifying parameters on the command lineMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6cfaccabc4edc3321c9a47e349236815b9d649e2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07mpegvideo: fix out of heap array accessesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 317ca0d3f735fad354c404e8bbac3e1ce9f09b12) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07search_for_quantizers_faac: fix curbandMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 33775c3507f4e0977d8ef1d8c5cbd167d0429319) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07ffmpeg: avoid a confusing and easy to break if().Reimar Döffinger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 93147daf59b096f3d6ad6d9e8d8c11c293e425d2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07ffmpeg: use isatty() before messing with the terminal stateMichael Niedermayer
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 c8a11014b673ebc6946db6fcd20009d330c57c48) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07swr-test: support "--help"Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 787c395a30ecc87bd6dadf2ec1ccab8648653880) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07buildsys: fix rules for swresample-testMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 63b1c08073adefb93c9fe8e3a6fd9c1b99772b7e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07Make H264 reorder buffer size message less verbose.Carl Eugen Hoyos
(cherry picked from commit a3bc7f916dcc69cfa439b424352d5951b4eaf9b8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07Add missing CRLFs to avisynth error messages.Carl Eugen Hoyos
(cherry picked from commit 1faf0d6a7a70cb0bcfbbff0421fb00bb6da658f9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07Fix MP2 muxer Makefile dependencies.Carl Eugen Hoyos
Found, analysed and tested by trac user Jamal. Fixes ticket #1411 (cherry picked from commit 757d5b9bfda45e45d9ab28ad4d5a9205119fe549) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07mpc8: fix maximum bands handlingKostya Shishkov
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 b56825c40ee1329b33aed34ff8a639fa18d263a0) Conflicts: libavcodec/mpc8.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07aacdec: Turn PS off when switching to stereo and turn it to implicit when ↵Alex Converse
switching to mono. (cherry picked from commit 79c8e29a7e404dbcf670df599fad6894f98ccab2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07Fix compilation condition for some ProRes dsp encoder functions.Carl Eugen Hoyos
Found, analysed and tested by trac user Jamal. Fixes part of Ticket #1404. (cherry picked from commit 568a5924180b0ce43e2706bf2491b70c455eb36a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07Fix compilation condition for some ProRes dsp decoder functions.Carl Eugen Hoyos
Found, analysed and tested by trac user Jamal. Fixes part of Ticket #1404. (cherry picked from commit 84986b4e61994c64ef2ea6161c473f82a2672cbc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07Fix ProRes decoder Makefile dependencies.Carl Eugen Hoyos
Found, analysed and tested by trac user Jamal. Fixes part of Ticket #1404. (cherry picked from commit a4b885d55ee061fa8df089f356ddbabf0282da5f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07Fix G.723.1 encoder Makefile dependencies.Carl Eugen Hoyos
(cherry picked from commit c02ef0788178d859f829c9703325e247b60e1895) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07ffv1dec: print more information for -debug 1Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 38c9ebd2a97a1298e4c5cc9d01d88d69c55be695) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07ffv1: fix log level of FF_DEBUG_PICT_INFOMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 730d079bf756c40f4a3c4624388db11d1be3475f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07mpc8: fix channel checksMichael Niedermayer
fix heap array overflow Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 44c10168cff41c200825448b77cb8feff0d316c9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07av_get_audio_frame_duration: fix FPEMichael Niedermayer
Fixes ticket1392 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a5ad3c2382ac27cf712aaba6a222ec12f5eb88da) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07mace: check channel count, fixes FPEMichael Niedermayer
Fixes ticket1391 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6df1cfa7e4d488051d7b5033c0c69df970db9f82) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07h263: disable loop filter with lowresMichael Niedermayer
Fixes ticket1212 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cc229d4e83889d1298f1a0863b55feec6c5c339a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07mpc7: fix handling of last frameMichael Niedermayer
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 e95233789c08f55c0b2d0657bada609629a59294) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07oggdec: fix regression that caused reading the whole file during openMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e0eaf1004910e451cbb8dbcb5c54ac63721adb61) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07png_parser: dont falsely mark frames as keyframesMichael Niedermayer
Fixes Ticket1381 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 82570d2f09e76d262f4eb57b591b08c4aa64729a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07lavf: use input keyframe flag when muxer does not provide keyframe flags.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5665674b55a45df757ed4fcd076a5cdf9ab484b6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07bink: fix out of reference frame readMichael Niedermayer
Fixes Ticket1374 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b3675f890abee0bc446495711223a5c790234672) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07h264: log debug output for slightly truncated streamsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fb4e434cfb5bf5510bf9ade40a9b63e3a579247e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07h264: try to better handle h264 streams that are slightly truncatedMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cd0f9f00a2471891b692729d8e62c8979396a2ee) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07bmv: fix apparent sign error in the frame_off checkMichael Niedermayer
Fixes part of Ticket1373 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit debbcfae6010f027a0334d70d0dbb7ddd912ad5a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07bmv: fix integer overflows in vlc decoder.Michael Niedermayer
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 679c578cb8e82df6fdee977e3137a26a680ad346) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07ffv1: fix integer overflow in quant table initializationMichael Niedermayer
Fixes part of Ticket1372 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9ebe6e391071690dbee79a645c51b14bd55c2ff4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>