summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'Derek Buitenhuis2016-04-171-1/+1
|\ | | | | | | | | | | | | * commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc': nuv: Use the correct context for av_image_check_size Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * nuv: Use the correct context for av_image_check_sizeVittorio Giovara2016-03-221-1/+1
| |
* | Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'Derek Buitenhuis2016-04-171-0/+6
|\ \ | |/ | | | | | | | | | | | | | | * 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>
* | avformat/hashenc: add missing avio_flush to hash_write_trailerJames Almer2016-04-161-0/+1
| | | | | | | | | | | | It was accidentally deleted in the previous hashenc commit Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/matroskaenc: Undo bits_per_coded_sample change as ↵Michael Niedermayer2016-04-161-2/+2
| | | | | | | | | | | | | | bits_per_raw_sample is available again Reminded-by: James Almer Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/bink: Cosmetics: Reindent after last commit.Carl Eugen Hoyos2016-04-151-10/+10
| |
* | lavf/bink: Support Monkey Island 4 (SMUSH) files.Carl Eugen Hoyos2016-04-152-3/+20
| | | | | | | | Fixes ticket #5410.
* | avformat/hashenc: simplify hash_write_trailerJames Almer2016-04-141-23/+5
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/yop: alloc codecpar extradata only onceJames Almer2016-04-141-6/+0
| | | | | | | | | | | | Fixes memleak Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: add AVFormatContext to ff_get_extradata()Paul B Mahol2016-04-1424-31/+31
| | | | | | | | | | | | Needed for av_log() inside that function. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'Derek Buitenhuis2016-04-141-9/+16
|\ \ | |/ | | | | | | | | | | * commit '9765549f551ff40869aee1a6492b6a976c86cfe9': mpegts: Forward the errors on mpeg4 objects parsing Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mpegts: Forward the errors on mpeg4 objects parsingLuca Barbato2016-03-201-9/+16
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * matroska: Support V_QUICKTIME as written in the specificationLuca Barbato2016-03-151-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | Check if the size is written the first 4 bytes and read the next 4 as fourcc candidate, fallback checking the initial for 4 bytes. "The CodecPrivate contains all additional data that is stored in the 'stsd' (sample description) atom in the QuickTime file after the mandatory video descriptor structure (starting with the size and FourCC fields)" CC: libav-stable@libav.org
* | avformat/framehash: enable new outputJames Almer2016-04-135-22/+19
| | | | | | | | | | | | | | Also, make every addition except for sidedata part of version 1 instead of the new version 2. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/framehash: add sidedata checksumJames Almer2016-04-131-3/+29
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/tee: Refactor close_slaves function in tee muxerJan Sebechlebsky2016-04-141-26/+32
| | | | | | | | | | | | | | | | | | | | | | 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>
* | avformat/dump: Fix sign bug in reported "start" timeBryan Huh2016-04-141-3/+5
| | | | | | | | | | | | | | 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>
* | avformat/framehash: add extradata checksumJames Almer2016-04-131-0/+23
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/framecrc: enable new outputJames Almer2016-04-132-2/+2
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '7e01d48cfd168c3dfc663f03a3b6a98e0ecba328'Derek Buitenhuis2016-04-131-1/+3
|\ \ | |/ | | | | | | | | | | * commit '7e01d48cfd168c3dfc663f03a3b6a98e0ecba328': mov: Check the entries value when parsing dref boxes Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mov: Check the entries value when parsing dref boxesLuca Barbato2016-03-111-1/+3
| | | | | | | | | | | | | | | | | | And properly reset the entries count when resetting the entries. CC: libav-stable@libav.org Bug-Id: 929 Bug-Id: CVE-2016-3062
* | Revert "Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'"Derek Buitenhuis2016-04-131-3/+3
| | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'd40cb726d271b0284642a1ba159eb26a5c579f77'Derek Buitenhuis2016-04-131-0/+7
|\ \ | |/ | | | | | | | | | | * commit 'd40cb726d271b0284642a1ba159eb26a5c579f77': mov: Trim dref absolute path Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mov: Trim dref absolute pathVittorio Giovara2016-03-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Samples produced by Omneon (Harmonic) store external references with paths ending with 0s. Such movs cannot be loaded properly since every 0 is converted to '/', to keep the same parsing code for dref type 2 and type 18: this makes the external reference point to a non-existing direactory, rather than to the actual referenced file. Add a brief trimming loop that drops all ending 0s before trying to parse the external reference path. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * asfenc: remove an unused variableAnton Khirnov2016-03-051-1/+0
| |
| * asfenc: fix some possible integer overflowsAnton Khirnov2016-03-051-11/+25
| | | | | | | | | | | | | | | | | | | | Store the file duration in the same timebase it arrives (i.e. milliseconds) and only convert it to the file duration units (100ns) when it's actually written, thus simplifying some calculations. Also, store the duration as unsigned, since it cannot be negative. CC: libav-stable@libav.org Bug-ID: CVE-2016-2326
* | Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'Derek Buitenhuis2016-04-131-3/+3
|\ \ | |/ | | | | | | | | | | * commit '1ceb07eb313c2d51383408025e57a2fe50ccd164': avformat_find_stream_info: move duration guessing after updating codec parameters Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avformat_find_stream_info: move duration guessing after updating codec ↵Anton Khirnov2016-03-041-2/+2
| | | | | | | | | | | | | | | | parameters This bitrate might not be known otherwise. Bug-Id: 926
| * sdp: fix opus sprop-stereo fmtp syntaxMark Harris2016-03-011-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/uncodedframecrc: fix incompatible pointer type warningJames Almer2016-04-131-1/+6
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/framehash: Add more information to the outputMichael Niedermayer2016-04-124-6/+21
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: add hash and framehash muxersMoritz Barsnick2016-04-124-43/+107
| | | | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/utils: use av_codec_g/set_lowres()Michael Niedermayer2016-04-121-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/concatdec: Use correct stream count on closeTimo Rothenpieler2016-04-111-1/+1
| |
* | Merge commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc'Derek Buitenhuis2016-04-111-1/+1
|\ \ | |/ | | | | | | | | | | * commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc': lavf: add a missing bump and APIchanges for the codecpar switch Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavf: add a missing bump and APIchanges for the codecpar switchAnton Khirnov2016-02-261-1/+1
| |
* | Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'Derek Buitenhuis2016-04-111-2/+2
|\ \ | |/ | | | | | | | | | | * commit 'fa55addd23c2f168163175aee17adb125c2c0710': img2: Drop av_ prefix for a static function Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * img2: Drop av_ prefix for a static functionVittorio Giovara2016-02-241-2/+2
| | | | | | | | | | | | This prefix is reserved for public functions only. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/hdsenc: Pass flags to child contextMichael Niedermayer2016-04-111-0/+1
| | | | | | | | | | | | 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>
* | avformat/dashenc: Pass flags to child contextMichael Niedermayer2016-04-111-0/+1
| | | | | | | | | | | | 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>
* | avformat/segment: Pass flags to child contextMichael Niedermayer2016-04-111-0/+1
| | | | | | | | | | | | 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>
* | Merge commit '9200514ad8717c63f82101dc394f4378854325bf'Derek Buitenhuis2016-04-10313-5779/+6240
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavf: replace AVStream.codec with AVStream.codecparAnton Khirnov2016-02-23223-3863/+4075
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
| * lavf: add a protocol whitelist/blacklist for file opened internallyAnton Khirnov2016-02-2210-13/+120
| | | | | | | | | | | | | | | | Should make the default behaviour safer for careless callers that open random untrusted files. Bug-Id: CVE-2016-1897 Bug-Id: CVE-2016-1898
| * urlprotocol: receive a list of protocols from the callerAnton Khirnov2016-02-2224-54/+162
| | | | | | | | | | This way, the decisions about which protocols are available for use in any given situations can be delegated to the caller.
* | lavf/avio: Remove linebreak from https warning.Carl Eugen Hoyos2016-04-101-1/+1
| |
* | avformat/mpegts: Remove unused argument from analyze()Michael Niedermayer2016-04-101-9/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mpegts: Check adaption field control in analyze() more instead of ↵Michael Niedermayer2016-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | transport_error_indicator transport_error_indicator is not required to be 0 Fixes probing Fixes Ticket 4862 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/rawenc: Add a raw gsm muxer.Carl Eugen Hoyos2016-04-094-2/+17
| |
* | lavf/gsmdec: Add raw gsm autodetection.Carl Eugen Hoyos2016-04-091-0/+18
| | | | | | | | Fixes bug 555.
OpenPOWER on IntegriCloud