summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
* | lavf: add uncodedframecrc test muxer.Nicolas George2014-02-11
| |
* | lavf: add write_uncoded_frame() API.Nicolas George2014-02-11
| |
* | avformat/libssh: Fix libssh defaulting to shared linkage.Matt Oliver2014-02-11
| | | | | | | | | | | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com> See: [FFmpeg-devel] Fix libssh static linkage on Windows Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703': lavf: always unref the packet passed to av_interleaved_write_frame() on error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: always unref the packet passed to av_interleaved_write_frame() on errorAnton Khirnov2014-02-10
| |
* | avformat/concatdec: pass the interrupt callback onZhang Rui2014-02-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '18c896be3d8e926ef806e7de29c4a168d7763389'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit '18c896be3d8e926ef806e7de29c4a168d7763389': lavf: extend / improve the AVFormatContext doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: extend / improve the AVFormatContext doxyAnton Khirnov2014-02-10
| |
* | Merge commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2': lavf: add some basic documentation of the muxing process Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add some basic documentation of the muxing processAnton Khirnov2014-02-10
| |
* | Merge commit '4c750599509c3973afbe2850953a1fb963f696e5'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit '4c750599509c3973afbe2850953a1fb963f696e5': lavf: rewrite the av_write_frame() doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: rewrite the av_write_frame() doxyAnton Khirnov2014-02-10
| | | | | | | | | | Remove some vague / incorrect statements and make the text more specific and less confusing.
* | Merge commit 'ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit 'ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b': lavf: rewrite the av_interleaved_write_frame() doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: rewrite the av_interleaved_write_frame() doxyAnton Khirnov2014-02-10
| | | | | | | | | | Remove some vague / incorrect statements and make the text more specific and less confusing.
| * pcmdec: replace a reachable assert with an error checkAnton Khirnov2014-02-10
| | | | | | | | | | | | Libavformat should not make any assumptions about values returned from other libraries. This assert is easily reachable by using a non-raw codec id.
| * mxfdec: free descriptor extradata in .read_close()Janne Grunau2014-02-09
| | | | | | | | Fixes memleak in fate-mxf-demux.
* | lavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED ↵Marton Balint2014-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | wanted_streams Previously these type of streams were not returned even if wanted stream was set to a stream of such. Now they are only skipped if they are not wanted streams. Fixes ffplay -sst <stream number> out.ts where stream number is a *_IMPAIRED stream. Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e'Michael Niedermayer2014-02-09
|\| | | | | | | | | | | | | * commit 'b0c2c097e422b9e10a7d856582f8321d28af821e': lavf: default .ogg audio to libvorbis if we can Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: default .ogg audio to libvorbis if we canAndrew Kelley2014-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Since 2007, the Xiph.org Foundation recommends that .ogg only be used for Ogg Vorbis audio files. Source: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions However we only do it if we have libvorbis available because the built in vorbis encoder is not as good. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * Add raw HEVC muxerDerek Buitenhuis2014-02-09
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Add raw HEVC muxerDerek Buitenhuis2014-02-09
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Mirillis FIC video decoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Mirillis FIC video decoderKostya Shishkov2014-02-08
| | | | | | | | | | | | Does not contain cursor rendering yet. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | vorbis: extract metadata from the middle of a streamBen Boeckel2014-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | If a special comment packet shows up in the middle of the stream, we should extract it out into the vorbis stream metadata dictionary. Also, if there is metadata in the packet on the way in, it might linger since we only add data to the dictionary causing stale metadata to be inserted into the stream. Instead, clear it to remove any doubt about what is new and old. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vorbis: append data from tags togetherBen Boeckel2014-02-05
| | | | | | | | | | | | | | | | Currently, if there are multiple 'performer' tags, the last one is the only one which appears. Instead, join them with a semicolon. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ogg: allow streams to update metadataBen Boeckel2014-02-05
| | | | | | | | | | Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/oggparseopus: Setting seek_preroll in AVCodecContextVignesh Venkatasubramanian2014-02-05
| | | | | | | | | | | | | | | | | | Setting seek_preroll value in AVCodecContext for Opus streams embedded in ogg container. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'Michael Niedermayer2014-02-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931': lavf: improve handling of sparse streams when muxing Conflicts: doc/APIchanges libavformat/avformat.h libavformat/mux.c libavformat/options_table.h libavformat/version.h See: 37ed5df5c5e06a55724fb9eb215da1594b648282 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: improve handling of sparse streams when muxingLuca Barbato2014-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently ff_interleave_packet_per_dts() waits until it gets a frame for each stream before outputting packets in interleaved order. Sparse streams (i.e. streams with much fewer packets than the other streams, like subtitles or audio with DTX) tend to add up latency and in specific cases end up allocating a large amount of memory. Emit the top packet from the packet_buffer if it has a time delta larger than a specified threshold. Original report of the issue and initial proposed solution by mus.svz@gmail.com. Bug-id: 31 Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27'Michael Niedermayer2014-02-05
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27': jvdec: K&R formatting cosmetics Conflicts: libavcodec/jvdec.c libavformat/jvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jvdec: K&R formatting cosmeticsVittorio Giovara2014-02-04
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'Michael Niedermayer2014-02-04
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '33c859c142ef3f49b7a6227014ad92a680cf4d74': lavf: ignore attachment streams for interleaving purposes Conflicts: libavformat/avformat.h libavformat/internal.h libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: ignore attachment streams for interleaving purposesAnton Khirnov2014-02-04
| | | | | | | | Those streams should never get any packets by definition.
* | Merge commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6'Michael Niedermayer2014-02-04
|\| | | | | | | | | | | | | * commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6': lavf: do basic sanity checking on muxed packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: do basic sanity checking on muxed packetsAnton Khirnov2014-02-04
| | | | | | | | Reject packets for non-existing or attachment streams.
* | libavformat/utils.c: Cosmetics: Fix incorrect comma placementStåle Kristoffersen2014-02-03
| |
* | RoQ encoder: support different integer frameratesaddr-see-the-website@aetey.se2014-02-03
| | | | | | | | | | | | | | Even though the most common framerate for RoQ is 30fps, the format supports other framerates too. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: use AVPROBE_SCORE_STREAM_RETRY, instead of AVPROBE_SCORE_RETRY - 1Michael Niedermayer2014-02-02
| | | | | | | | | | | | This makes the code clearer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: dvd still frames read thru libdvdnav ended up in internal ↵Voyager12014-02-02
| | | | | | | | | | | | | | | | | | | | | | lavf buffer This is the solution we've been using in XBMC for over 2 years for dvd still frames. The problem is that the demuxer asks for probing of the codec in the mpeg stream. This causes lavf to read the whole menu structure into internal buffers. After which, it won't read from input stream anymore and no events triggers. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add output_ts_offset option to AVFormatContextStefano Sabatini2014-02-02
| | | | | | | | | | This option can be generally useful to set an output offset, needed when setting an absolute index in the output.
* | lavf/avformat.h: fix typosStefano Sabatini2014-02-02
| |
* | libavformat/mtv: add test for audio magicReynaldo H. Verdejo Pinochet2014-02-01
| | | | | | | | | | | | | | MTV files have the string "MP3" as audio magic on their header. Always. Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | Merge commit 'c716624853339ea4b1086a3957b334829370204c'Michael Niedermayer2014-02-02
|\| | | | | | | | | | | | | | | | | | | * commit 'c716624853339ea4b1086a3957b334829370204c': mxf: Read field dominance flag Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Read field dominance flagMatthieu Bouron2014-02-01
| | | | | | | | | | | | And export the information in field_order. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '7d56f2fffc14ad02001ee0689bee76a759da9ede'Michael Niedermayer2014-02-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '7d56f2fffc14ad02001ee0689bee76a759da9ede': mxf: Handle negative edit_rate Conflicts: libavformat/mxfdec.c See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Handle negative edit_rateLuca Barbato2014-02-01
| | | | | | | | Default to 1/25.
* | Auto-detect hevc in mpeg-ts.Ståle Kristoffersen2014-01-31
| | | | | | | | | | | | Fixes decoding of files without PMT/PAT. Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | avformat/flac_picture: clear padding areaMichael Niedermayer2014-01-31
| | | | | | | | | | | | | | | | aviod use of uninitialized memory Fixes: asan_heap-oob_1487fa4_4706_cov_364534849_cover_art.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flac_picture: allocate buffer padding for pictureMichael Niedermayer2014-01-31
| | | | | | | | | | | | | | Fixes: heap array overread Fixes: asan_heap-oob_14876d9_4706_cov_815472558_cover_art.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '78987a88a88b28d93d03ed6c228bcb33f178444f'Michael Niedermayer2014-01-31
|\| | | | | | | | | | | | | * commit '78987a88a88b28d93d03ed6c228bcb33f178444f': lavf: include 60 fps in guessed standard frame rates Merged-by: Michael Niedermayer <michaelni@gmx.at>