summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* lavf/bink: fix latest header and add all existing revisionsbnnm2017-08-20
| | | | | | | KB2 'i' found in Life is Strange (Xbox 360), rest verified against binkconv.exe Signed-off-by: bnnm <bananaman255@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavformat/mov: Fix inserting frames before current_frame.Jacob Trimble2017-08-18
| | | | | | | | | | When using streaming input, it may be possible to see frames that appear before the current_frame. When these frames are inserted into the index, the current_frame needs to be updated so it is still pointing at the same frame. Signed-off-by: Jacob Trimble <modmaker@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/utils: always av_reduce r_frame_rateMarton Balint2017-08-17
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mov: Fix memory leak when reading DDTS box.Nikolas Bowe2017-08-16
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/avidec: Move packet skip after prefix and related checksMichael Niedermayer2017-08-11
| | | | | | | This fixes loosing packets Fixes: big.avi Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/movenc: reindent after the previous commitJames Almer2017-08-09
|
* lavf/movenc.c: Set sgpd and sbgp atoms to represent decoder delay for AAC.Sasi Inguva2017-08-10
| | | | | | | | According to https://developer.apple.com/library/content/documentation/QuickTime/QTFF/QTFFAppenG/QTFFAppenG.html and ISO-IEC-14496-12 Section 10.1.1.1 and 10.1.1.3 Signed-off-by: Sasi Inguva <isasi@google.com> Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hlsenc: allow dynamic encryption key rotationDeHackEd2017-08-06
| | | | | | | | Makes behaviour of 805ce25b1d2f optional, re-enables HLS key rotation feature Reviewed-by: Steven Liu <lq@onvideo.cn> Signed-off-by: DHE <git@dehacked.net>
* avformat/utils: fix memory leak in avformat_free_contextSteven Siloti2017-08-05
| | | | | | | | The pointer to the packet queue is stored in the internal structure so the queue needs to be flushed before internal is freed. Signed-off-by: Steven Siloti <ssiloti@bittorrent.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hlsenc: support fmp4 single file modeSteven Liu2017-08-04
| | | | | | | add byterange mode of the hls fmp4 Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Steven Liu <lq@onvideo.cn>
* avformat/riff: remove useless tag correlation 'mpg2'->MPEG1VIDEO.Aleksandr Slobodeniuk2017-08-02
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/riff.h : remove unused function parameter "const AVCodecTag *tags" ↵Aleksandr Slobodeniuk2017-08-02
| | | | | | | of "void ff_put_bmp_header()" Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/os_support: Use existing WinRT config value.Matt Oliver2017-07-30
| | | | Signed-off-by: Matt Oliver <protogonoi@gmail.com>
* avformat/rtmppkt: Convert ff_amf_get_field_value() to bytestream2Michael Niedermayer2017-07-29
| | | | | | | Fixes: out of array accesses Found-by: JunDong Xie of Ant-financial Light-Year Security Lab Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/rtmppkt: Convert ff_amf_tag_size() to bytestream2Michael Niedermayer2017-07-29
| | | | | | | | Fixes: out of array accesses Fixes: crash-9238fa9e8d4fde3beda1f279626f53812cb001cb-SEGV Found-by: JunDong Xie of Ant-financial Light-Year Security Lab Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/s337m: fix potentially undefined pointer arithmeticfoo862017-07-26
| | | | | Use integer position instead of pointer for loop variable. Also only skip header fields after header has been fully validated.
* avformat/oggparsecelt: Do not re-allocate os->privateMichael Niedermayer2017-07-25
| | | | | | | | | Fixes: double free Fixes: clusterfuzz-testcase-minimized-5080550145785856 Found-by: ClusterFuzz Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hlsenc: improve hls encrypt get key file operationSteven Liu2017-07-25
| | | | | | | | get key file only once time is ok, no need more times. Ticket-id: #6545 Found-by: JohnPi Signed-off-by: Steven Liu <lq@onvideo.cn>
* lavf/movenc: support GPMF track (gpmd) remuxingClément Bœsch2017-07-24
| | | | | See https://github.com/gopro/gpmf-parser for more information on the data stream itself.
* avformat/hlsenc: fix hls fmp4 extention name bugSteven Liu2017-07-24
| | | | | | | | | ticket-id: #6541 when use hls fmp4 muxer, the extention name is not .m4s, this code can fix it. Found-by: JohnPi Signed-off-by: Steven Liu <lq@onvideo.cn>
* avcodec/dca: remove GetBitContext usage from ↵James Almer2017-07-21
| | | | | | | | | avpriv_dca_parse_core_frame_header() This prevents potential ABI issues with GetBitContext. Reviewed-by: foo86 <foobaz86@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat: add SMPTE 337M demuxerfoo862017-07-19
|
* libavformat/fifo: Fix initialization of underlying AVFormatContextJan Sebechlebsky2017-07-19
| | | | | | | | | | | | | Muxers may want to directly access filename in stored in AVFormatContext. For example in case of RTSP, the filename (url) is used by the muxer to extract parameters of the connection. These muxers will fail when used with fifo pseudo-muxer. This commit fixes this issue by passing filename from AVFormatContext of fifo pseudo-muxer to all AVFormatContext(s) of underlying muxers during initialization. Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
* avformat/dtsdec: switch to common frame header parsing functionfoo862017-07-18
| | | | | | | | | | | This makes probing for regular DTS more strict because more header fields are checked and values not supported by decoder are now rejected. Also fixes an issue original code had with 14-bit streams: 96 bits of header were expected, however only 84 bits were converted, which was not enough to parse LFE flag. Signed-off-by: James Almer <jamrial@gmail.com>
* webmdashenc: Fix memory leakDerek Buitenhuis2017-07-16
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* hdsenc: Remove dead storeDerek Buitenhuis2017-07-14
| | | | | | | This is apparently not supposed to error out anyway. Reviewed-by: Steven Liu <lq@onvideo.cn> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* movenc: Add 'keywords' metadataKieran O'Leary2017-07-13
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* rtspdec: Fix return errorDerek Buitenhuis2017-07-10
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* avcodec/magicyuv: add 12 bit formatsPaul B Mahol2017-07-10
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/avio: Remove no-op code in url_find_protocol().Wan-Teh Chang2017-07-10
| | | | | | | | | | | | | In url_find_protocol(), proto_str is either "file" or a string consisting of only the characters in URL_SCHEME_CHARS, which does not include ','. Therefore the strchr(proto_str, ',') call always returns NULL. Note: The code was added in commit 6161c41817f6e53abb3021d67ca0f19def682718. Signed-off-by: Wan-Teh Chang <wtc@google.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* rtmpproto: Fix error returnDerek Buitenhuis2017-07-07
| | | | | | Mistake was added in 5840473890440dbe0bd2cce530ebb3d93e187ae6. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* avformat: remove obsolete commented-out DEBUG defineTobias Rapp2017-07-07
| | | | | Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* avformat/hlsenc: Add missing error checkDerek Buitenhuis2017-07-07
| | | | | Reviewed-by: Steven Liu <lq@onvideo.cn> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* avformat/hlsenc: add warn message when use both fmp4 and single_fileSteven Liu2017-07-07
| | | | | | | have not implementation the fmp4 single file yet before this commit. Suggested-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Steven Liu <lq@onvideo.cn>
* mpegtsenc: Don't pass NULL to memcpyDerek Buitenhuis2017-07-06
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* concatdec: Do not pass NULL to memcmpDerek Buitenhuis2017-07-06
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* libavformat/gdv: Fix parsing for soundless videoAzamat H. Hackimov2017-07-05
| | | | | | | Added 2 byte skipping if there no sound present, that fixes playback files without sound stream. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* movenc: allow alternative hvc1 h.265 codec tagJohn Stebbins2017-07-05
| | | | | | | | If AVCodecParameters.codec_tag is 'hvc1' use it instead of 'hev1' for h.265 streams. QuickTime (and other Apple software) requires 'hvc1'. (cherry picked from commit 84ab1cc437fa47a00532f305b9fe15b5b66c8c5e) Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* movenc: write correct format hvcc when tag is hvc1John Stebbins2017-07-05
| | | | | (cherry picked from commit 1ea9b7fdf99b60c0db95a2ce97b2108469bbb245) Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* movenc: move tags definitions to where they are usedJohn Stebbins2017-07-05
| | | | | (cherry picked from commit 1c64bae648eeb39c8d8a8d81ee142b9eec9fae7b) Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* movenc: simplify codec_tag lookupJohn Stebbins2017-07-05
| | | | | | | | | | | mux.c init_muxer() already sets codec_tag correctly in the cases simplified here. This also adds the capability to support alternative tags for the same codec_id. (cherry picked from commit f6f86f432fe51526a7aad2bdb025d6a45d239883) Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* avformat/hlsenc: copy codec_tag when stream copySteven Liu2017-07-05
| | | | | | | | | | | | | when use fmp4 segment type in hls and use codec copy, there have an error message. error message: [mp4 @ 0x25df020] Tag avc1 incompatible with output codec id '28' ([33][0][0][0]) [hls @ 0x2615c80] Some of the provided format options in '(null)' are not recognized Could not write header for output file #0 (incorrect codec parameters ?): Invalid argument this patch can fix it. Signed-off-by: Liu Qi <w_liuqi@kingsoft.com> Signed-off-by: Steven Liu <lq@onvideo.cn>
* avformat/hlsenc: optimize help message default value.Steven Liu2017-07-05
| | | | | | show the hls_segment_type default always 0, show the flag name better Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* movenc: use correct tag list for AVOutputFormat.codec_tagJohn Stebbins2017-07-04
| | | | | | | | | | | | | | ff_mp4_obj_type contains the wrong type of tags for AVOutputFormat.codec_tag. AVOutputFormat.codec_tag is used to validate AVCodecParameters.codec_tag so needs to be the same type of tag. Creates new tag lists for mp4 and ismv. New tag lists support same list of codecs found in ff_mp4_obj_type. psp uses the same tag list as mp4 since these both use mp4_get_codec_tag to look up tags. (cherry picked from commit 713efb2c0d013a42be4051adb7cd90a7c2cbbb4f) Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* lavf: Remove codec_tag from dashenc and smoothstreamingencMartin Storsjö2017-07-04
| | | | | | | | | Skip the codec_tag altogether here, to let the user (try to) set whichever codec/tag is preferred; the individual chained muxer will reject invalid codecs anyway. (cherry picked from commit 61f589e31e84ae02d7ac6837f30f19c437b1fc2e) Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* avfomat/hlsenc: support fmp4 format in hlsSteven Liu2017-07-03
| | | | | | | | | | | add the fmp4 format into hlsenc because the fmp4 format add into hls from version 7. the spec link is: https://tools.ietf.org/html/draft-pantos-http-live-streaming-20 and the describe on WWDC https://developer.apple.com/videos/play/wwdc2017/515/ Signed-off-by: Steven Liu <lq@onvideo.cn>
* libavformat/avformat.h: Move docs inside of #ifMax Weber2017-06-30
| | | | | | | Otherwise AVTimebaseSource gets av_apply_bitstream_filters' documentation in doxygen. Signed-off-by: Max Weber <mii7303@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/gdv: add decompression for 2 and 5 methodPaul B Mahol2017-06-29
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Update mp4 object type for VP9KongQun Yang2017-06-28
| | | | | | Updated to the standard value 0xB1 defined in mp4ra.org. Signed-off-by: James Almer <jamrial@gmail.com>
* Interplay MVE: Implement frame format 0x10Hein-Pieter van Braam2017-06-27
| | | | | | | | | | | | | | | | | | | | This implements the 0x10 frame format for Interplay MVE movies. The format is a variation on the 0x06 format with some changes. In addition to the decoding map there's also a skip map. This skip map is used to determine what 8x8 blocks can change in a particular frame. This format expects to be able to copy an 8x8 block from before the last time it was changed. This can be an arbitrary time in the past. In order to implement this this decoder allocates two additional AVFrames where actual decoding happens. At the end of a frame decoding changed blocks are copied to a finished frame based on the skip map. The skip map's encoding is a little convulted, I'll refer to the code for details. Values in the decoding map are the same as in format 0x06. Signed-off-by: Hein-Pieter van Braam <hp@tmm.cx>