summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6'Michael Niedermayer2014-10-091-0/+69
|\ | | | | | | | | | | | | * commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6': mov: support the Color Parameter Atoms 'colr' Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: support the Color Parameter Atoms 'colr'Vittorio Giovara2014-10-081-0/+69
| |
* | Merge commit '167e6f1489368a4693145da61cb022c113a285bc'Michael Niedermayer2014-10-091-1/+1
|\ \ | |/ | | | | | | | | | | | | * commit '167e6f1489368a4693145da61cb022c113a285bc': dump: Update streams and chapters printout format See: cab2860c8a49756daccde3111eb27271209495cd Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: Update streams and chapters printout formatSylvain Rabot2014-10-081-2/+2
| | | | | | | | This matches the -map option which requires '%d:%d' format.
* | avformat: Allow choosing the dump format field separator.Michael Niedermayer2014-10-094-2/+15
| | | | | | | | | | | | The default is to maintain the previous ", " for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8'Michael Niedermayer2014-10-091-12/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8': dump: split audio and video probing on multiple lines Conflicts: libavcodec/utils.c libavformat/dump.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: split audio and video probing on multiple linesVittorio Giovara2014-10-081-8/+14
| | | | | | | | Also always report pixel format.
* | Merge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579'Michael Niedermayer2014-10-081-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '7ae9791b641d1183910b6e7faca23f7ae08f8579': avformat: bump version after mime_type change Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: bump version after mime_type changeVittorio Giovara2014-10-081-2/+2
| |
* | Merge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7'Michael Niedermayer2014-10-082-4/+8
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7': avformat: use const char* instead of uint8_t* for AVProbeData.mime_type Conflicts: libavformat/format.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: use const char* instead of uint8_t* for AVProbeData.mime_typeAndreas Cadhalpun2014-10-082-4/+8
| | | | | | | | | | | | | | This makes the field consistent with AVInputFormat.mime_type and the argument type of av_match_name. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/matroskadec: do not trust the default duration to be the real ↵Michael Niedermayer2014-10-081-1/+2
| | | | | | | | | | | | | | | | 1/timebase if its less than 5fps Fixes Ticket3980 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/tiertexseq: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-071-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: read reel_name and source timecode from physical source packageMark Reid2014-10-071-21/+99
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '28816050e47b6dba430a52e429d21a864cffda8e'Michael Niedermayer2014-10-075-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '28816050e47b6dba430a52e429d21a864cffda8e': lavf: Set the stream time base hint properly for chained muxers Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Set the stream time base hint properly for chained muxersMartin Storsjö2014-10-065-0/+5
| | | | | | | | | | | | | | This avoids warnings about using the codec time base as time base hint. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7'Michael Niedermayer2014-10-071-30/+12
|\ \ | |/ | | | | | | | | | | * commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7': sdp: Simplify parsing/conversion of H264 extradata Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sdp: Simplify parsing/conversion of H264 extradataMartin Storsjö2014-10-061-30/+12
| | | | | | | | | | | | | | | | | | | | | | | | By using ff_avc_write_annexb_extradata instead of the h264_mp4toannexb BSF, the code for doing the conversion itself is kept much shorter, there's less state to restore at the end, we don't risk leaving the AVCodecContext in an inconsistent state if returning early due to errors, etc. Also add a missing free if the base64 encoding fails. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mov: do not overwrite extradata in mov_read_glbl()Michael Niedermayer2014-10-061-0/+4
| | | | | | | | | | | | | | | | | | | | Fixes regression from Ticket3962 This basically favors the first global header while since 34751f8313a41bf94e004ffa9491f35d96763558 it was the last. If this heuristic turns out worse, do not hesitate to revert this and reopen 3962 as a feature request for multiple STSD Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: remove obsolete FF_API_READ_PACKET cruftJames Almer2014-10-053-28/+0
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_CLOSE_INPUT_FILE cruftJames Almer2014-10-053-21/+0
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_SET_PTS_INFO cruftJames Almer2014-10-053-20/+0
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_NEW_STREAM cruftJames Almer2014-10-053-28/+0
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_FORMAT_PARAMETERS cruftJames Almer2014-10-053-30/+0
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_ALLOC_OUTPUT_CONTEXT cruftJames Almer2014-10-053-23/+0
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/options_table: add FF_COMPLIANCE_UNOFFICIALMichael Niedermayer2014-10-051-0/+1
| | | | | | | | | | | | Fixes ticket 3959 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: Attempt to detect non-escaped glob patterns too ↵Alexander Strasser2014-10-051-0/+2
| | | | | | | | | | | | | | | | | | | | (-pattern_type glob) Fixes ticket #3948 Based-on-patch-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: Support -loop with pipesMichael Niedermayer2014-10-051-0/+8
| | | | | | | | | | | | Fixes Ticket3976 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/assdec: make sure pos is initializedClément Bœsch2014-10-041-2/+2
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: signal_sigsegv_504fb0_10_signal_sigsegv_504fb0_343_mewmew_ssa.avi Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
* | avformat/mpegts: use a padded buffer in read_sl_header()Michael Niedermayer2014-10-041-1/+5
| | | | | | | | | | | | | | | | Fixes overread Fixes: asan_heap-oob_84f75d_8_asan_heap-oob_a2a00a_341_mbc.ts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Check desc_len / get8() return codeMichael Niedermayer2014-10-041-1/+1
| | | | | | | | | | | | | | | | Fixes out of array read Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sdp: add support for H.261Thomas Volkert2014-10-042-1/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '55f03d872640175a00bfa262da4652b7312b905f'Michael Niedermayer2014-10-032-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '55f03d872640175a00bfa262da4652b7312b905f': hlsenc: Add parameter -hls_allow_cache Conflicts: doc/muxers.texi libavformat/hlsenc.c libavformat/version.h See: 3edb9aaea6aaa6b93d708693cfa6454c17e03732 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: Add parameter -hls_allow_cacheJoakim Roubert2014-10-032-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | The -hls_allow_cache parameter enables explicitly setting the EXT-X-ALLOW-CACHE tag in the manifest file. That tag indicates whether the client MAY or MUST NOT cache downloaded media segments for later replay. Valid values are 1 (=YES) or 0 (=NO) and the EXT-X-ALLOW-CACHE will not show in the manifest for other values (or if -hls_allow_cache is not used. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Revert "avformat/img2dec: reduce bmppipe probe score"Michael Niedermayer2014-10-031-1/+1
| | | | | | | | | | | | | | | | This seems not needed anymore This reverts commit 321c3cd1a97b9307760c3ebb175296590c382eca. Found-by: carl
* | lavf/webm_dash: some fields should go into RepresentationVignesh Venkatasubramanian2014-10-021-24/+92
| | | | | | | | | | | | | | | | | | | | | | Width, Height and Sample Rate should be in the AdaptationSet tag only if all the contained representations have the same width, height and sampling rate. Otherwise they should go into the Representation tag. This patch adds this functionality and a fate test for the same. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/avstring: Factor av_match_list() outMichael Niedermayer2014-10-021-17/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support decoding 32bit pcm audio in mov.Carl Eugen Hoyos2014-10-021-0/+4
| | | | | | | | Such files are written by Convergent Design's Odyssey 7Q recorder.
* | Stop demuxing wtv on eof.Carl Eugen Hoyos2014-10-021-0/+2
| | | | | | | | | | | | | | | | | | Fixes ticket #3991. Fixes ticket #3995. Fixes ticket #3997. Reviewed-by: Peter Ross Reviewed-by: Paul B Mahol
* | avformat/mxfenc: add jpeg2000 support.Benoit Fouet2014-10-021-0/+7
| | | | | | | | | | | | | | Fixes ticket #1542 reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvenc: fix codec_id_text checkMichael Niedermayer2014-10-021-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/webm_dash: Fix incorrect bandwidth computationVignesh Venkatasubramanian2014-10-011-47/+49
| | | | | | | | | | | | | | | | | | Fix incorrect bandwidth computation in some cases. When the cue end descriptor is null (i.e.) start_time_ns == -1, existing bandwidth computed (if any) should be returned rather than returning 0. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/webm_dash: fix hardcode in cues_end computationVignesh Venkatasubramanian2014-10-011-4/+7
| | | | | | | | | | | | | | | | | | | | Fix an incorrect hard code in cues_end computation. Updating the fate test reference files related to the fix as well. The earlier computation was clearly wrong as the cues_end field was greater than the file size itself in some cases. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: automatically set AVC-Intra tagMichael Niedermayer2014-10-011-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: AVC Intra supportMichael Niedermayer2014-10-011-4/+60
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: fix avio_flush() for read streamswm42014-09-302-3/+9
| | | | | | | | | | | | | | avio_flush() did nothing useful for read streams. Fix it to behave as expected, and discard the currently read buffer properly. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvenc: When using "-c:d copy", don't require a codec for passing ↵Jeffrey Wescott2014-09-301-13/+19
| | | | | | | | the AMF metadata through from input to output.
* | Kill timed SRTClément Bœsch2014-09-304-53/+6
| |
* | RTMP: fix FD leak in rtmp_open()Alexander Drozdov2014-09-301-1/+1
| | | | | | | | | | | | | | | | If we setup AVIO interrupt callback and it will be returns 1 on socket timeouts and we try to connect to non-existing streams on some servers (like nginx-rtmp) we got FD leak. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status