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
2016-04-24avformat/mux: Check that deinit is set before calling itMichael Niedermayer
Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-24avformat/mpegts: Skip over broken 0x80 headersMichael Niedermayer
This fixes demuxing of 01c56b0dc1.ts Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-24avformat/mpegts: factor duplicate seek back code into mpegts_resyncMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-23lavf/isom: Support Perian tag NELL for nellymoser.Carl Eugen Hoyos
Reported by forum user turas35.
2016-04-22avformat/tee: Handling slave failure in tee muxerJan Sebechlebsky
Adds per slave option 'onfail' to the tee muxer allowing an output to fail, so other slave outputs can continue. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
2016-04-22avformat/tee: Fix leaks in tee muxer when open_slave failsJan Sebechlebsky
In open_slave failure can happen before bsfs array is initialized, close_slave must check that bsfs is not NULL before accessing tee_slave->bsfs[i] element. Slave muxer expects write_trailer to be called if it's write_header suceeded (so resources allocated in write_header are freed). Therefore if failure happens after successfull write_header call, we must ensure that write_trailer of that particular slave is called. Some cleanups are made by Marton Balint. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
2016-04-22Merge commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7'Derek Buitenhuis
* commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7': rtmpdh: add an stdio.h include Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-21avcodec: add TrueMotion 2.0 Real Time decoderPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-21Merge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'Derek Buitenhuis
* commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48': testprogs: Clean up #includes Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-21Merge commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2'Derek Buitenhuis
* commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2': unix: Use rw_timeout for setting the connect timeout Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-21Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'Derek Buitenhuis
* commit 'fab8156b2f30666adabe227b3d7712fd193873b1': avio: Copy URLContext generic options into child URLContexts Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-21libnut: Pass stream to ff_parse_specific_paramsDerek Buitenhuis
This function bo longer takes an AVCodecContext. Fixes ticket #5430. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-21lavf: use new decode APIwm4
From Libav commit 8bc4accc37ab047d2fd85d672c577b39dfc918e1, with additional code for decoding subtitles (not present in Libav). Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-04-21lavc: introduce a new decoding/encoding API with decoupled input/outputwm4
Until now, the decoding API was restricted to outputting 0 or 1 frames per input packet. It also enforces a somewhat rigid dataflow in general. This new API seeks to relax these restrictions by decoupling input and output. Instead of doing a single call on each decode step, which may consume the packet and may produce output, the new API requires the user to send input first, and then ask for output. For now, there are no codecs supporting this API. The API can work with codecs using the old API, and most code added here is to make them interoperate. The reverse is not possible, although for audio it might. From Libav commit 05f66706d182eb0c36af54d72614bf4c33e957a9. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-04-21avformat/utils: Remove use of caps_internal as it is not public APIMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-19Merge commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310'Derek Buitenhuis
* commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310': file: Add an option for following a file that is being written Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-18Merge commit 'ccea588f831906084b8c8235222920e6984beb72'Derek Buitenhuis
* commit 'ccea588f831906084b8c8235222920e6984beb72': avio: Add an option 'rw_timeout' Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-18Merge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'Derek Buitenhuis
* commit 'd44f3e4059506a182f59218b1e967d42b01e097c': avio: Apply avoptions on the URLContext itself as well Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'Derek Buitenhuis
* commit '65a802401c6cc136576bb2e613c0577cbf622aa8': build: Add component for the SRTP common code Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'Derek Buitenhuis
* commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc': nuv: Use the correct context for av_image_check_size Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'Derek Buitenhuis
* commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab': lavc: add a new bitstream filtering API Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com> Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17avformat/hashenc: add missing avio_flush to hash_write_trailerJames Almer
It was accidentally deleted in the previous hashenc commit Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-16avformat/matroskaenc: Undo bits_per_coded_sample change as ↵Michael Niedermayer
bits_per_raw_sample is available again Reminded-by: James Almer Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-15lavf/bink: Cosmetics: Reindent after last commit.Carl Eugen Hoyos
2016-04-15lavf/bink: Support Monkey Island 4 (SMUSH) files.Carl Eugen Hoyos
Fixes ticket #5410.
2016-04-15avformat/hashenc: simplify hash_write_trailerJames Almer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-14avformat/yop: alloc codecpar extradata only onceJames Almer
Fixes memleak Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-14avformat: add AVFormatContext to ff_get_extradata()Paul B Mahol
Needed for av_log() inside that function. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-14Merge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'Derek Buitenhuis
* commit '9765549f551ff40869aee1a6492b6a976c86cfe9': mpegts: Forward the errors on mpeg4 objects parsing Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-14avformat/framehash: enable new outputJames Almer
Also, make every addition except for sidedata part of version 1 instead of the new version 2. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-14avformat/framehash: add sidedata checksumJames Almer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-14avformat/tee: Refactor close_slaves function in tee muxerJan Sebechlebsky
Closing single slave operation is pulled out into separate function close_slave(TeeSlave*). Both close_slave and close_slaves function are moved before open_slave function. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
2016-04-14avformat/dump: Fix sign bug in reported "start" timeBryan Huh
Previously, the bug was that if -1 < start_time < 0, the reported "start" time would lose the negative-sign. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-13avformat/framehash: add extradata checksumJames Almer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-13avformat/framecrc: enable new outputJames Almer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-13Merge commit '7e01d48cfd168c3dfc663f03a3b6a98e0ecba328'Derek Buitenhuis
* commit '7e01d48cfd168c3dfc663f03a3b6a98e0ecba328': mov: Check the entries value when parsing dref boxes Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13Revert "Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'"Derek Buitenhuis
Broke a lot of stuff and didn't fix anything. This reverts commit 3c461eecd48ba2cf7616d98e6f99954de3ad4b06, reversing changes made to 884dd175f061c03d7ba4896685e81bf8adc3ea94. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13Merge commit 'd40cb726d271b0284642a1ba159eb26a5c579f77'Derek Buitenhuis
* commit 'd40cb726d271b0284642a1ba159eb26a5c579f77': mov: Trim dref absolute path Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'Derek Buitenhuis
* commit '1ceb07eb313c2d51383408025e57a2fe50ccd164': avformat_find_stream_info: move duration guessing after updating codec parameters Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13avformat/uncodedframecrc: fix incompatible pointer type warningJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-12avformat/framehash: Add more information to the outputMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-12avformat: add hash and framehash muxersMoritz Barsnick
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-12avformat/utils: use av_codec_g/set_lowres()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-11avformat/concatdec: Use correct stream count on closeTimo Rothenpieler
2016-04-11Merge commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc'Derek Buitenhuis
* commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc': lavf: add a missing bump and APIchanges for the codecpar switch Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-11Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'Derek Buitenhuis
* commit 'fa55addd23c2f168163175aee17adb125c2c0710': img2: Drop av_ prefix for a static function Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-11avformat/hdsenc: Pass flags to child contextMichael Niedermayer
This is needed as the bitexact flag is not in the codecpar context, and thus not copied Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-11avformat/dashenc: Pass flags to child contextMichael Niedermayer
This is needed as the bitexact flag is not in the codecpar context, and thus not copied Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-11avformat/segment: Pass flags to child contextMichael Niedermayer
This is needed as the bitexact flag is not in the codecpar context, and thus not copied Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-10Merge commit '9200514ad8717c63f82101dc394f4378854325bf'Derek Buitenhuis
* commit '9200514ad8717c63f82101dc394f4378854325bf': lavf: replace AVStream.codec with AVStream.codecpar This has been a HUGE effort from: - Derek Buitenhuis <derek.buitenhuis@gmail.com> - Hendrik Leppkes <h.leppkes@gmail.com> - wm4 <nfxjfg@googlemail.com> - Clément Bœsch <clement@stupeflix.com> - James Almer <jamrial@gmail.com> - Michael Niedermayer <michael@niedermayer.cc> - Rostislav Pehlivanov <atomnuker@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>