summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* avformat/mp3dec: fix start time in light of initial skip samplesMichael Niedermayer2014-01-051-0/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/file: fix help message first character casing for trunc optionStefano Sabatini2014-01-051-1/+1
|
* lavf/file: file_check: Handle file URLs that start with "file:"Alexander Strasser2014-01-041-5/+10
| | | | | | | | | | Handle the URL analog to file_open, it may contain a "file:" prefix. Skip it. Make access checks to file URLs starting with "file:" work. Fix part of ticket #3249. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* avformat/oggparseopus: fix segmented timestampsMark Harris2014-01-041-9/+6
| | | | | | | | | | | | Fix timestamp calculation for code 3 Ogg Opus packets with less than 2 bytes in the last segment (e.g. packet length 255 or 256). A sample that would seek incorrectly in ffplay can be created with: ffmpeg -i in.wav -b:a 34k -vbr off -frame_duration 60 out.opus and libopus 1.1 Also do not read past the end of the buffer when a packet has length 0. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/oggdec: dont read timestamps from EOS pages of ogm videosMichael Niedermayer2014-01-041-0/+5
| | | | | | | Some muxers store invalid timestamps there, which breaks seeking Fixes Ticket2739 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: fix rounding error accumulation for generated dts in ↵Michael Niedermayer2014-01-041-2/+5
| | | | | | | | | compute_pkt_fields() This only updates the case where there is no B frame reordering delay. Tested-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/nut: add support for per frame side & meta data with version 4Michael Niedermayer2014-01-043-6/+268
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d'Michael Niedermayer2014-01-041-2/+4
|\ | | | | | | | | | | | | | | | | | | | | * commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d': pmpdec: check that there is at least one audio packet. Conflicts: libavformat/pmpdec.c See: 8b1cd25ca7e64e6128fa2902d78e48bfeeec9786 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pmpdec: check that there is at least one audio packet.Anton Khirnov2014-01-031-0/+5
| | | | | | | | | | | | | | | | The code cannot handle there being none, but that should not happen for valid files. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | avformat/utils: fix order of buffers in timestamp update codeMichael Niedermayer2014-01-031-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/bink: display audio track idsPeter Ross2014-01-031-0/+1
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: decouple playlists from variantsAnssi Hannula2014-01-031-178/+257
| | | | | | | | | | | | | | | | | | | | | | | | Not all "sub-playlists" are variant playlists (containing the same content with a different bitrate, etc) in the current version of the HLS specification. They can now also be alternative renditions, containing e.g. alternative audio tracks etc. Decouple playlists from variants to prepare for handling the new features. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/http: always allow no-op seekAnssi Hannula2014-01-031-0/+2
| | | | | | | | | | | | This also allows checking stream position as per ffurl_seek() doxy. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/bink: seek to first framePeter Ross2014-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Some rare bink files include unused bytes between the frame table index and first frame data. Fixes ticket #3266. This patch has also been tested with non-seekable protocols. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: Export the MuxingApp element value as metadataJames Almer2014-01-031-1/+3
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/bink: recognize bink2 filesPeter Ross2014-01-021-2/+10
| | | | | | | | | | | | | | Support demuxing of audio streams in bink2 files. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mux: fix "no tag found" check in validate_codec_tag()Michael Niedermayer2014-01-011-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/vqf: check avio_read()s return value more completelyMichael Niedermayer2014-01-011-1/+1
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f180a523a71_5052_esvorbei_extd.vqf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/protocols/rtsp, lavf/rtsp: fix/extend options documentationStefano Sabatini2014-01-011-15/+15
| |
* | avformat/version: bump micro for addition of internal field to AVStreamMichael Niedermayer2013-12-311-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: dont run update_initial_duration() twiceMichael Niedermayer2013-12-312-0/+7
| | | | | | | | | | | | This should avoid floods of first_dts not matching debug messages Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/id3v2: allow ID3 parsing without AVFormatContextAnssi Hannula2013-12-312-43/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ff_id3v2_read_dict() for parsing without AVFormatContext, but instead with AVIOContext and AVDictionary. AVFormatContext is still used for logging, if available. Chapter parsing is the only non-logging functionality that actually needs AVFormatContext, and AFAICS it should be modified to write the data to ID3v2ExtraMeta first, from where it can be implanted to AVFormatContext by a separate function (like it is done with read_apic() and ff_id3v2_parse_apic()). That is outside the scope of this patch, though. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/http: allow the caller to select a request rangeAnssi Hannula2013-12-311-3/+11
| | | | | | | | | | | | | | Add AVOptions for setting the initial offset and the ending offset, so they can be used for setting an appropriate Range header. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/id3v2: parse ID3 Private frames as extra metadataAnssi Hannula2013-12-312-0/+52
| | | | | | | | | | | | They are used in HLS. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/mpegts: demux timed ID3 metadataAnssi Hannula2013-12-311-0/+1
| | | | | | | | | | | | | | | | | | | | Used in some HLS streams ("Timed Metadata for HTTP Live Streaming"). This is just ID3 tags at arbitrary stream positions, but I still added "timed" to the codec name to avoid confusion with regular non-stream ID3 tags. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | oggdec: add support for VP8 demuxingJames Almer2013-12-305-1/+141
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer2013-12-291-5/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | * lukaszmluki/master: lavf/libssh: improve authentication lavf/libssh: fix file mode Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/libssh: improve authenticationLukasz Marek2013-12-291-4/+7
| | | | | | | | | | | | | | | | | | | | | - Add authentication using keys - Provide better message on fail Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
| * | lavf/libssh: fix file modeLukasz Marek2013-12-291-1/+2
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | | avformat/wc3movie: Check strings before printing.Michael Niedermayer2013-12-291-0/+7
|/ / | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f7812ca062f_2812_SC_32_part.MVE Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/siff: check avio_read() return value before returning packetMichael Niedermayer2013-12-291-1/+4
| | | | | | | | | | | | | | Fixes: /ld/michael/ffmpeg_uninit/ffmpeg_uninit/done/msan_uninit-mem_7fb3e0fa86e9_1980_INTRO_B.VB Fixes use of uninitialized memory Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | omadec: Disable "Unsupported codec ATRAC3+" warningMaxim Poliakovski2013-12-291-1/+1
| | | | | | | | | | | | Also add a list of supported decoders. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/iff: check avio_read() return in get_metadata()Michael Niedermayer2013-12-291-1/+1
| | | | | | | | | | | | | | Fixes: msan_uninit-mem_7f9539ba8461_4760_dasboot_in_compressed Fixes use of uninitialized memory Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: clear padding area in mov_read_extradata()Michael Niedermayer2013-12-281-0/+1
| | | | | | | | | | | | | | Fixes: msan_uninit-mem_7f58816b71e3_7025_mov_svq3___svq3_weird_prediction2.mov Fixes use of uninitialized memory Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: check avio_read() return in mov_read_dref()Michael Niedermayer2013-12-271-1/+2
| | | | | | | | | | | | | | Fixes: msan_uninit-mem_7f4960453a02_7264_mr_cork_jpeg.mov Fixes use of uninitialized memory Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'Michael Niedermayer2013-12-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0': avutil: Move library version related macros to version.h Conflicts: libavcodec/version.h libavresample/version.h libavutil/avutil.h libavutil/utils.c See: 183117fed7d0a910b5f65e5c78b065f125abf369 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: Move library version related macros to version.hDiego Biurrun2013-12-261-1/+1
| | | | | | | | This is a more sensible place for these macros.
* | avformat/mpegts: check sl.timestamp_lenMichael Niedermayer2013-12-271-0/+5
| | | | | | | | | | | | | | Fixes: msan_uninit-mem_7ff4404547ba_4883_dmbts.ts Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggparseogm: check input size before reading tMichael Niedermayer2013-12-261-0/+2
| | | | | | | | | | | | | | | | | | | | Makes no difference in outcome, as the checks on t have no effect when t was uninitialized Fixes use of uninitialized memory Fixes: msan_uninit-mem_7fa2b7b5d97c_3598_anOTHERS_DixX_in_Ogg_Sample.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggparseogm: check input size before reading parametersMichael Niedermayer2013-12-261-0/+6
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f4d0daad100_3599_anOTHERS_DixX_in_Ogg_Sample.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-262-2/+2
|\ \ | |/ | | | | | | | | | | * qatar/master: mms: Remove non-utf8 characters Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mms: Remove non-utf8 charactersLuca Barbato2013-12-262-2/+2
| | | | | | | | | | | | Certain softwares get badly confused. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/rmdec: move packet allocation downMichael Niedermayer2013-12-261-10/+10
| | | | | | | | | | | | | | Fixes memleak Fixes: msan_uninit-mem_7fc5d73327d4_6192_kuerti.ra Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rmdec: check against mismatching int4 interleaver parameters which ↵Michael Niedermayer2013-12-261-0/+4
| | | | | | | | | | | | | | | | | | would leave uninitialized holes Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f9cf38857c0_4582_coop.ra Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpc8: check avio_read() return in mpc8_parse_seektable()Michael Niedermayer2013-12-261-2/+7
| | | | | | | | | | | | no sample / testcase known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpc8: clear buffer padding areaMichael Niedermayer2013-12-251-0/+2
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7fa6a48cd1d5_8853_sv8_notags.mpc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/protocols/tcp,lavf/tcp: apply minor fixes to TCP protocol documentationStefano Sabatini2013-12-251-2/+2
| |
* | lavf/tcp: honor listen option value in a tagStefano Sabatini2013-12-251-2/+7
| | | | | | | | | | Consistent with what is done in udp.c, allow to explicitly disable listen with listen=0.
* | doc/protocols/udp,lavf/udp: apply minor documentation fixesStefano Sabatini2013-12-251-10/+10
| |
* | avformat/westwood_vqa: use ff_get_extradata()Michael Niedermayer2013-12-251-5/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud