summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* lavf/segment: add a few log messages when avio_open2() failsStefano Sabatini2013-11-25
|
* lavf/segment: add segment_list_entry_prefix optionStefano Sabatini2013-11-25
| | | | | | | | | This option allows to add a prefix to the segment list entry filenames. Also set by default the list entry filenames to the corresponding segment basename, consistent with the HLS muxer. Based on an idea by Steven Liu <lingjiujianke@gmail.com>.
* lavf: Exporting opus pre_skip in AVCodecContextVignesh Venkatasubramanian2013-11-25
| | | | | | | | | Opus Pre Skip is exported in AVCodecContext->delay similar to how it is done for matroska. Doing the same for ogg too. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/asfdec: ignore packet_segmentsMichael Niedermayer2013-11-24
| | | | | | | Fixes Ticket1708 Based on patch by Alberto Delmás Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/asfdec: reset packet_time_start when asf_read_frame_header() failedAlberto Delmás2013-11-24
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/asfdec: remove duplicated packet_segments resetMichael Niedermayer2013-11-24
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/mpegenc: Print a warning if ac3, pcm_s16be or dts are muxed into mpeg1.Carl Eugen Hoyos2013-11-24
| | | | | Some media players don't play the resulting files. The warning should help users to avoid the issues described in ticket #1720.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun2013-11-23
| |
* | avformat/hnm: check chunk_size == 0Michael Niedermayer2013-11-22
| | | | | | | | | | | | Fixes potential infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Check that we have a stream before accessing it in mov_read_ares()Michael Niedermayer2013-11-22
| | | | | | | | | | | | | | | | Fixes out of array read Fixes: signal_sigsegv_6f1855_3910_avid_test_alpha.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/ipmovie: check OPCODE_INIT_VIDEO_BUFFERS size more completelyMichael Niedermayer2013-11-22
| | | | | | | | | | | | | | | | | | Fixes use of uninitialized data Fixes: signal_sigsegv_1571228_5930_ipmovie_interplayvideo_interplay_dpcm__bislogo.mve Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-22
|\| | | | | | | | | | | | | * qatar/master: hls: Avoid reading outside of the allocated array Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Avoid reading outside of the allocated arrayMartin Storsjö2013-11-22
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8c929098141ebc94ad3f303521c520bb3dc6d8f6'Michael Niedermayer2013-11-22
|\| | | | | | | | | | | | | * commit '8c929098141ebc94ad3f303521c520bb3dc6d8f6': hls: Check whether the AVIOContext contains a new redirected URL Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Check whether the AVIOContext contains a new redirected URLMartin Storsjö2013-11-22
| | | | | | | | | | | | | | This allows both the main playlist itself as well as the variant playlists to handle redirects combined with relative URLs. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'be4edda6731a341d3fdeaa0e57753dc396790362'Michael Niedermayer2013-11-22
|\| | | | | | | | | | | | | | | | | | | | | * commit 'be4edda6731a341d3fdeaa0e57753dc396790362': http: Expose the content location via an AVOption Conflicts: libavformat/http.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Expose the content location via an AVOptionMartin Storsjö2013-11-22
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '393d80cc278e2b2f5c9e7805db176e6f28335a33'Michael Niedermayer2013-11-22
|\| | | | | | | | | | | | | | | | | | | | | * commit '393d80cc278e2b2f5c9e7805db176e6f28335a33': http: Support relative URL redirection Conflicts: libavformat/http.c See: 4a4c93cb3f2f564263f4b20446a7d500772e0d40 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Support relative URL redirectionZhang Rui2013-11-22
| | | | | | | | | | | | | | | | | | In RFC 2616, this was explicitly said to be an absolute URL, while in an upcoming draft [1] it is allowed to be relative as well. [1] http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-25#section-7.1.2 Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8'Michael Niedermayer2013-11-22
|\| | | | | | | | | | | | | * commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8': http: Remove an unrelated and mistakenly set AVOption unit name Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Remove an unrelated and mistakenly set AVOption unit nameMartin Storsjö2013-11-22
| | | | | | | | | | | | This was due to a copypaste oversight. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avidec: fix a memleak in the dv init code.Anton Khirnov2013-11-21
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
| * matroskadec: use correct compression parameters for current track CodecPrivateAurelien Jacobs2013-11-21
| | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * matroskadec: pad EBML_BIN data.Anton Khirnov2013-11-21
| | | | | | | | | | | | | | | | It might be passed to code requiring padding, such as lzo decompression. Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | avformat/avidec: Dont assert the existence of an index for video streams.Michael Niedermayer2013-11-22
| | | | | | | | | | | | | | | | | | Its possible in various rare cases that an index cannot be created or allocated. Fixes assertion failure Fixes: signal_sigabrt_7ffff7126425_7712_pokem.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: Skip duplicate strf chunksMichael Niedermayer2013-11-22
| | | | | | | | | | | | Fixes Ticket3119 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: also print position in print_tag()Michael Niedermayer2013-11-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: inject audio skip side data before the side data merge codeMichael Niedermayer2013-11-21
| | | | | | | | | | | | This ensures that its handled the same way as other side data Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: move side data merge after parserMichael Niedermayer2013-11-21
| | | | | | | | | | | | | | merging before the parser can conflict with the parser, also future changes depend on it being done later Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: add DYM4 mpeg4 fourccCompn2013-11-19
| |
* | avformat/jacosubdec: make probing less tolerant.Clément Bœsch2013-11-19
| | | | | | | | | | | | | | | | | | | | Fixes a failure with probetest: ./tools/probetest 8192 500000 [...] Failure of jacosub probing code with score=51 type=1 p=CAB size=16 Random data was: 00000000 40 37 40 30 93 01 48 e0 09 96 10 90 78 0f 0c 10 @7@0..H.....x...
* | avformat/mpegts: fix resync seekMichael Niedermayer2013-11-18
| | | | | | | | | | | | | | | | The seek ended up seeking before the begin, which caused problems Fixes initial sync issues with libbluray Fixes Ticket3117 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-18
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmphttp: Check for both 0 and AVERROR_EOF Conflicts: libavformat/rtmphttp.c See: d04b7de786780747878c080ba522405c6f542ccb Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmphttp: Check for both 0 and AVERROR_EOFValeriy Argunov2013-11-18
| | | | | | | | | | | | This makes RTMPT work again - it was broken by 5d876be87a. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/utils: dont count attached pics toward the probesizeMichael Niedermayer2013-11-18
| | | | | | | | | | | | | | Such pics behave more like headers which we also dont count. Fixes Ticket3146 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'Michael Niedermayer2013-11-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b9c3b4505206143d85398c1410949319fa1180f': Replace all instances of avcodec_alloc_frame() with av_frame_alloc(). Conflicts: doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c libavcodec/alacenc.c libavcodec/libopenjpegenc.c libavcodec/libvpxenc.c libavcodec/pcm.c libavcodec/xbmenc.c libavcodec/xwdenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all instances of avcodec_alloc_frame() with av_frame_alloc().Anton Khirnov2013-11-16
| |
* | avformat/rtmphttp: Partial fix for the ticket #3127 (second try)Byte2013-11-16
| | | | | | | | | | Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroskadec ReferenceBlock is a signed integerJan Gerber2013-11-16
| | | | | | | | | | | | | | according to the Matroska Specification ReferenceBlock is a signed integer too. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroska*: DiscardPadding is a signed integerJan Gerber2013-11-16
| | | | | | | | | | | | | | | | | | | | according to the Matriska Specification http://matroska.org/technical/specs/index.html DiscardPadding is a signed integer. Tested-by: Jan Gerber <j@v2v.cc> Tested-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroska: simplify signed int access codeMichael Niedermayer2013-11-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroska*: add support for signed integersJan Gerber2013-11-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: add G264 to mpeg4, only decodes keyframesCompn2013-11-15
| |
* | Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'Michael Niedermayer2013-11-15
|\| | | | | | | | | | | | | | | | | | | * commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4': dv: Split DV data table declarations into their own header Conflicts: libavcodec/dvdata.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Split DV data table declarations into their own headerDiego Biurrun2013-11-15
| | | | | | | | | | | | This is necessary to avoid target config settings bleeding into the host compilation process with hardcoded tables and the DV VLC tables no longer present as static tables in a header file.
* | Merge commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878': lavf: improve support for AVC-Intra files. Conflicts: libavformat/internal.h libavformat/isom.c libavformat/mxfdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: improve support for AVC-Intra files.Reimar Döffinger2013-11-14
| | | | | | | | | | | | | | | | Generate extradata with SPS/PPS based on container dimensions. Authors of this commit are: Reimar and Thomas Mundt Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mxfdec: update current edit unit when seeking in mxf files without index tablesMarton Balint2013-11-14
| | | | | | | | | | | | | | | | Fixes audio packet pts values in some files generated by AVID TRMG 3.01. Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/nullenc: mark null as VFPSMichael Niedermayer2013-11-13
| | | | | | | | | | | | | | This avoids frame duplication for null output avoiding unneeded computations. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>