summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
* avformat/tee: Copy interrupt callback and flags to slaveJan Sebechlebsky2016-09-29
| | | | | | | Copy interrupt callback to slave format context to allow user to interrupt IO. Copy format flags as well. Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
* lavf/movenc: Put correct display aspect ratio in ARES atom.Carl Eugen Hoyos2016-09-29
|
* lavf/mov: Read display aspect ratio from ares atom also for dnxhd.Carl Eugen Hoyos2016-09-29
| | | | | Fixes aspect ratio of sample in ticket #2125. Fixes aspect ratio of sample in ticket #5325.
* movenc: Add support for writing language codes into ISML manifestsJan Ekström2016-09-29
| | | | | | | Streaming servers appear to ignore all other language metadata. Signed-off-by: Jan Ekström <jeebjp@gmail.com> Signed-off-by: Josh de Kock <josh@itanimul.li>
* lavf/mov.c: Make audio timestamps strictly monotonically increasing inside ↵Sasi Inguva2016-09-29
| | | | | | | | | an edit list. Fixes gapless decoding. Adjust skip_samples field correctly in case of DISCARDed audio frames. Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* movenc: use similar logic to DASH when writing bit rate to ISMLJan Ekström2016-09-28
| | | | | | | | | | This way, in case of bit rate not being set, max_bitrate will be used instead. This enables, for example, re-using max_bitrate information from the input or doing transcoding with a rate control mode that is not bit rate based. Signed-off-by: Jan Ekström <jeebjp@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/concatdec: don't call open_file when seek position within a fileraymondzheng1412@gmail.com2016-09-28
|
* lavf/mpegtsenc: Set min PID for data pkt to 0x0010.Sylvain Laurent2016-09-28
| | | | Fixes ticket #1673.
* avformat/avidec: Check nb_streams in read_gab2_sub()Michael Niedermayer2016-09-28
| | | | | | | | Fixes null pointer dereference Fixes: 1/null_point.avi Found-by: 连一汉 <lianyihan@360.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/avidec: Remove ancient assertMichael Niedermayer2016-09-28
| | | | | | | | | | | This assert can with crafted files fail, a warning is already printed for this case. Fixes assertion failure Fixes:1/assert.avi Found-by: 连一汉 <lianyihan@360.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/matroskadec: set AVCodecParameters.field_order on progressive videoJames Almer2016-09-27
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/matroskadec: retain error codes in matroska_resync() and ↵Sophia Wang2016-09-28
| | | | | | | matroska_read_packet() Signed-off-by: Sophia Wang <skw@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat: add av_stream_get_codec_timebase()James Almer2016-09-27
| | | | | | This will allow ffmpeg.c to stop using AVStream.codec in some cases Signed-off-by: James Almer <jamrial@gmail.com>
* lavf/movenc: Allow to disable writing the timecode track.Carl Eugen Hoyos2016-09-26
| | | | Fixes ticket #5492.
* avformat/avidec: remove warning about deprecated declarationsJames Almer2016-09-25
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/avidec: Fix memleak with dv in aviMichael Niedermayer2016-09-25
| | | | | Found-by: 连一汉 <lianyihan@360.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/utils: Avoid an overflow for huge negative durations.Carl Eugen Hoyos2016-09-24
| | | | Fixes ticket #5135.
* lavf/aacdec: Do not autodetect a single frame inside the file.Carl Eugen Hoyos2016-09-24
|
* avformat/hls: Fix handling of EXT-X-BYTERANGE streams over 2GBAnssi Hannula2016-09-24
| | | | | | | | Replace uses of atoi() with strtoll() when trying to read values into int64_t variables. Fixes Kodi trac #16926: http://trac.kodi.tv/ticket/16926
* avformat/hlsenc: refine EXT-X-BYTERANGE support for segmentsSteven Liu2016-09-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refine EXT-X-BYTERANGE tag, the spec link: https://tools.ietf.org/html/draft-pantos-http-live-streaming-19#section-4.3.2.2 the apple doc: https://developer.apple.com/library/ios/technotes/tn2288/_index.html# //apple_ref/doc/uid/DTS40012238-CH1-BYTE_RANGE_SUPPORT_FOR_SEGMENTS command line: ./ffmpeg -i ~/Movies/objectC/a.mp4 -c copy -f hls -hls_time 7 -hls_list_size 0 -hls_segment_size 2500000 -t 40 output-test.m3u8 output: localhost:ffmpeg liuqi$ ll *.ts ;cat output-test.m3u8 -rw-r--r-- 1 liuqi staff 2792176 9 12 14:44 output-test0.ts -rw-r--r-- 1 liuqi staff 3112528 9 12 14:44 output-test3.ts -rw-r--r-- 1 liuqi staff 3377420 9 12 14:44 output-test6.ts -rw-r--r-- 1 liuqi staff 1228016 9 12 14:44 output-test7.ts #EXTM3U #EXT-X-VERSION:4 #EXT-X-TARGETDURATION:10 #EXT-X-MEDIA-SEQUENCE:0 #EXTINF:9.021000, #EXT-X-BYTERANGE:1334988@0 output-test0.ts #EXTINF:3.000000, #EXT-X-BYTERANGE:721356@1334988 output-test0.ts #EXTINF:3.000000, #EXT-X-BYTERANGE:735832@2056344 output-test0.ts #EXTINF:6.000000, #EXT-X-BYTERANGE:1645940@0 output-test3.ts #EXTINF:3.000000, #EXT-X-BYTERANGE:715152@1645940 output-test3.ts #EXTINF:3.000000, #EXT-X-BYTERANGE:751436@2361092 output-test3.ts #EXTINF:9.000000, #EXT-X-BYTERANGE:3377420@0 output-test6.ts #EXTINF:3.960000, #EXT-X-BYTERANGE:1228016@0 output-test7.ts #EXT-X-ENDLIST localhost:ffmpeg liuqi$ ticket-id: #5839 Signed-off-by: Steven Liu <lingjiujianke@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/utils: avoid using marked decoders for probingTimo Rothenpieler2016-09-23
| | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/movenc: write pasp atom even if sar.num == sar.denPaul B Mahol2016-09-22
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/utils: force native h264 decoder for probingTimo Rothenpieler2016-09-22
| | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: switch to codecparClément Bœsch2016-09-21
| | | | | | | | | | | | | | | | | | | | This commit is largely based on commit 15e84ed3 from Anton Khirnov <anton@khirnov.net> which was previously skipped in bbf5ef9d. There are still a bunch of things raising codecpar related warnings that need fixing, such as: - the use of codec->debug in the interactive debug mode - read_ffserver_streams(): it's probably broken now but there is no test - lowres stuff - codec copy apparently required by bitstream filters The matroska references are updated because they now properly forward the field_order (previously unknown, now progressive). Thanks to James Almer for fixing a bunch of FATE issues in this commit. Signed-off-by: Clément Bœsch <clement@stupeflix.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/mxfdec: use first valid sourceclip found if material track has ↵Mark Reid2016-09-21
| | | | | | | | | multiple components This commit fixes a issue with mxf footage having multiple components on a material track. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/mov: Add support for edit list parsing.Sasi Inguva2016-09-19
| | | | | Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/utils: Support av_index_search_timestamp in case of AVIndexEntry with ↵Sasi Inguva2016-09-19
| | | | | | | discarded packets. Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/avframe.h: Add a flag in AVIndexEntry to discard frame after decoding.Sasi Inguva2016-09-19
| | | | | Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/http: Fix #ifdef FF_API_HTTP_USER_AGENTMichael Niedermayer2016-09-17
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/http: deprecate user-agent optionSteven Liu2016-09-17
|
* avformat/movenc: Make the packet check more tolerantMichael Niedermayer2016-09-16
| | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/movenc: Check packet in mov_write_single_packet() tooMichael Niedermayer2016-09-16
| | | | | | | | Fixes assertion failure Found-by: durandal117 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/movenc: Factor check_pkt() outMichael Niedermayer2016-09-16
| | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavformat/webm_chunk: Option to specify HTTP headerVignesh Venkatasubramanian2016-09-16
| | | | | | | | Add an option to specify HTTP header in the WebM Chunk Muxer (this works the same way as the 'method' parameter in the HLS muxer). Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/msf: add support for ATRAC3 codecPaul B Mahol2016-09-15
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavf/rtsp: Fix a crash with the RTSP muxer.Martin Storsjö2016-09-15
| | | | | | | | | | | Introduced in 00e122bc / bc2a3296 The whole block that the statement was added to is only relevant when used as a demuxer, but the other statements there have had other if statements guarding them. Make sure to only run this whole block if being used as a demuxer. Fixes ticket #5844.
* avformat/hlsenc: Emulate strftime("%z") using other functions if it does not ↵Michael Niedermayer2016-09-15
| | | | | | | | work This should fix the code on windows Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/utils: fix timebase error in avformat_seek_file()Xinzheng Zhang2016-09-14
| | | | | | | | When there is only one stream and stream_index has not specified, The ts has been transferd by the timebase of stream0 without modifying the stream_index In this condation it cause seek failure. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/flvenc: add no_sequence_end flags for flvflagsSteven Liu2016-09-14
| | | | | | | | | | when split flv file by flv format at first, and cat flvs file into one flv file, the flv sequence end is be used, then the whole flv have many flv sequence end TAG. this flags can give user an option to ignore write sequence end TAG Signed-off-by: Steven Liu <lingjiujianke@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/flvenc: Add () around &Michael Niedermayer2016-09-14
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/utils: add missing ismv in MOV-like formatsClément Bœsch2016-09-14
|
* lavf/utils: simplify matching MOV-like formatsClément Bœsch2016-09-14
|
* lavf: add avformat_transfer_internal_stream_timing_info() and use it in ffmpegClément Bœsch2016-09-14
| | | | | In lavf we have access to st->internal->avctx so it's a better place than in ffmpeg*.c and will allow moving to codecpar.
* avformat/flvenc: add FLVFlags for flvflags optionsSteven Liu2016-09-14
| | | | | | | add FLVFlags type, be used to add new FLVFlags options Signed-off-by: Steven Liu <lingjiujianke@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hlsenc: Assume UTC if "%z" is unsupported in strftime()Michael Niedermayer2016-09-13
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hlsenc: Avoid "%T" "%F" in strftime() to improve compatibilityMichael Niedermayer2016-09-13
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf: add a flag to enable/disable automatic bitstream filteringRodger Combs2016-09-12
| | | | | | | This is mostly useful for muxers that wrap other muxers, such as dashenc and segment. The actual duplicated bitstream filtering is largely harmless, but delaying the header can cause problems when the muxer intended the header to be written to a separate file.
* avformat/tee: Use BSF list APIJan Sebechlebsky2016-09-12
| | | | Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
* avformat/mux: implement AVFMT_FLAG_SHORTESTMichael Niedermayer2016-09-11
| | | | | | This will allow fixing several bugs with the -shortest option Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ivfenc: Add VPX codec tags.Alex Converse2016-09-10
| | | | This fixes remuxing VPX from MP4 without manually overwriting the tag.