summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'b5f19f7478492307e4b4763aeac3180faf50e17f'James Almer2017-10-302-19/+22
|\ | | | | | | | | | | | | * commit 'b5f19f7478492307e4b4763aeac3180faf50e17f': aac: Split function to parse ADTS header data into public and private part Merged-by: James Almer <jamrial@gmail.com>
| * aac: Split function to parse ADTS header data into public and private partDiego Biurrun2017-05-022-19/+22
| | | | | | | | | | | | This makes the currently semi-public avpriv_aac_parse_header() function private to libavcodec and adds a proper public API function to return the parts of the ADTS header required in libavformat.
* | Merge commit '831018b0bbe26a603802a9022472f714a59293be'James Almer2017-10-302-2/+2
|\ \ | |/ | | | | | | | | | | * commit '831018b0bbe26a603802a9022472f714a59293be': mpeg4audio: Make avpriv_copy_pce_data() inline Merged-by: James Almer <jamrial@gmail.com>
| * mpeg4audio: Make avpriv_copy_pce_data() inlineAnton Khirnov2017-04-282-2/+2
| | | | | | | | | | | | | | | | | | The function currently accepts a PutBitContext and a GetBitContext, which hardcodes their sizes into the lavc ABI. Since the function is quite small and only called in a few places, the simplest solution is making it inline, thus avoiding a runtime dependency completely. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * dump: use av_spherical_projection_name() to print spherical projection namesJames Almer2017-04-271-10/+1
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
| * matroskaenc: don't warn about unknown spherical metadata when there isn't anyJames Almer2017-04-261-3/+1
| | | | | | | | | | | | | | | | The same warning is issued when actual unknown spherical metadata is found further down in the function. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Add ClearVideo decoderKostya Shishkov2017-04-252-0/+3
| | | | | | | | | | | | Only I-frames are decoded for now. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mm: Skip unexpected audio packetsLuca Barbato2017-04-201-0/+6
| | | | | | | | | | Bug-Id: 1046 CC: libav-stable@libav.org
* | libavformat/mov.c: use calculated dts offset when seeking in streamsJonas Licht2017-10-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subtract the calculated dts offset from the requested timestamp before seeking. This fixes an error "Error while filtering: Operation not permitted" observed with a short file which contains only one key frame and starts with negative timestamps. Then, av_index_search_timestamp() returns a valid negative timestamp, but mov_seek_stream bails out with AVERROR_INVALIDDATA. Fixes ticket #6139. Signed-off-by: Jonas Licht <jonas.licht@fem.tu-ilmenau.de> Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | movenc: add m4b to ipod format extensionsLukas Stabe2017-10-301-1/+1
| | | | | | | | | | | | | | | | m4b is commonly used as extension for m4a audiobook files. The format is exactly the same. The only thing that differs is the extension. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/aviobuf: return EINVAL when reading from a write-only context.Nicolas George2017-10-291-1/+1
| | | | | | | | Signed-off-by: Nicolas George <george@nsup.org>
* | lavf/avio: temporarily accept 0 as EOF.Nicolas George2017-10-293-9/+26
| | | | | | | | | | | | | | | | Print a warning to let applicatios fix their use. After a deprecation period, check with a low-level assert. Also make the constraint explicit in the doxygen comment. Signed-off-by: Nicolas George <george@nsup.org>
* | dashenc: copy stream frame rate to output streamPeter Große2017-10-291-0/+1
| | | | | | | | | | | | | | | | Leads to setting of DefaultDuration in Matroska muxer based on frame rate instead of timebase. Fixes playback in Chrome. Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dashenc: Don't output frameRates at both AS and Representation-level. Only ↵Anton Schubert2017-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | output maxFrameRate at AS-level. Fix conformance regarding section "3.2.4. Presence of Attributes and Element" of the "Guidelines for Implementation: DASH-IF Interoperability Points V4.1" (http://dashif.org/guidelines/) Signed-off-by: Anton Schubert <ischluff@mailbox.org> Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dashenc: allow AdaptationSets to have different average frame ratesPeter Große2017-10-291-10/+9
| | | | | | | | | | Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dashenc: don't write header data before the first packet arrivesPeter Große2017-10-291-1/+1
| | | | | | | | | | | | Fixes: 1b8ef01f04ab ("dashenc: add webm support") Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dashenc: set DASH related options for the subsequent matroska muxer when ↵Peter Große2017-10-291-0/+3
| | | | | | | | | | | | | | | | | | | | using webm This patch is inspired by the ffmpeg webm_chunk muxer and fixes that all resulting tracks have the same track number. Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dashenc: fix bitrate estimation with correct scalingAnton Schubert2017-10-291-1/+2
| | | | | | | | | | | | Signed-off-by: Anton Schubert <ischluff@mailbox.org> Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/rtpenc: Add support for 24 bit pcm encoding as defined by RFC 3190.Carl Eugen Hoyos2017-10-293-1/+10
| | | | | | | | Fixes ticket #6770.
* | avformat/avformat.h: fix pairs typoJames Almer2017-10-291-2/+2
| | | | | | | | | | Found-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: deprecate getters and setters for AVFormatContext and AVStream fieldsJames Almer2017-10-293-1/+36
| | | | | | | | | | | | | | The fields can be accessed directly, so these are not needed anymore. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: move public AVStream fields up in the structJames Almer2017-10-291-37/+28
| | | | | | | | | | | | | | Remove the silly second notice. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/hlsenc: reindent hlsenc codeSteven Liu2017-10-291-10/+10
| | | | | | | | Signed-off-by: Steven Liu <lq@onvideo.cn>
* | avformat/hlsenc: fix missing first segment bug in fmp4 modeSteven Liu2017-10-291-4/+2
| | | | | | | | | | | | | | fix ticket id: #6776 fix code logic error, need not check first segment. Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* | avformat/hlsenc: fix base_output_dirname is null when basename_size is 0 bugSteven Liu2017-10-291-5/+11
| | | | | | | | | | | | | | fix ticket id: #6777 when use argument hls_segment_filename, the basename_size will be 0 Signed-off-by: Steven Liu <lq@onvideo.cn>
* | avformat: remove use of deprecated AVFMT_FLAG_KEEP_SIDE_DATA flagJames Almer2017-10-293-4/+2
| | | | | | | | | | | | | | It has no effect whatsoever since the major bump. Replace the flag's documentation to reflect this as well. Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '279e3aaa14daba6b7a37d75f3fb6e29c732d123f'James Almer2017-10-281-0/+6
|\ \ | |/ | | | | | | | | | | * commit '279e3aaa14daba6b7a37d75f3fb6e29c732d123f': flv: Validate the packet size Merged-by: James Almer <jamrial@gmail.com>
| * flv: Validate the packet sizeLuca Barbato2017-04-201-0/+6
| | | | | | | | | | | | | | Size can be negative at that point. Bug-Id: 1041 CC: libav-stable@libav.org
| * utvideodec: Support ULY4 and ULH4Paul B Mahol2017-04-151-0/+2
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * utvideodec: Support UQRA and UQRGPaul B Mahol2017-04-151-0/+2
| |
| * utvideodec: Support UQY2Paul B Mahol2017-04-131-0/+1
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/ac3dec: Check buf2 before adding 16 in ac3_eac3_probe()Michael Niedermayer2017-10-281-1/+4
| | | | | | | | | | | | | | | | | | This is needed since e0250cf3651e6417e0117486a7816b45fb2d34cd as that uses end-buf2 Note, there are more than 16 bytes allocated beyond "end" Fixes: regression (segfault) with probetest Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/mov.c: Fix parsing of edit list atoms with invalid elst entry count.Sasi Inguva2017-10-281-1/+20
| | | | | | | | | | Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dashenc: move UTCTiming element to the end of the manifestPeter Große2017-10-281-2/+4
| | | | | | | | | | | | | | | | Required by comformance XSD [1]. [1] https://github.com/Dash-Industry-Forum/Conformance-and-reference-source/blob/master/conformance/MPDValidator/schemas/DASH-MPD.xsd Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dashenc: use av_dict_set_int instead of static functionPeter Große2017-10-281-10/+2
| | | | | | | | | | Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d'James Almer2017-10-281-6/+1
|\ \ | |/ | | | | | | | | | | * commit '9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d': avformat: Free the internal codec context at the end Merged-by: James Almer <jamrial@gmail.com>
| * avformat: Free the internal codec context at the endLuca Barbato2017-04-131-5/+1
| | | | | | | | | | | | Avoid a use after free in avformat_find_stream_info. CC: libav-stable@libav.org
| * Add FM Screen Capture Codec decoderPaul B Mahol2017-04-131-0/+1
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '50a1c66cf6ab7eb683daaa9e2da3869fa3a54609'James Almer2017-10-272-22/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '50a1c66cf6ab7eb683daaa9e2da3869fa3a54609': ac3_parser: add a public function for parsing the data required by the demuxer avpriv_ac3_parse_header() is left in place but without the GetBitContext parameter, as the mov muxer requires a lot more fields than just bitstream_id and frame_size from the AC3HeaderInfo struct. Merged-by: James Almer <jamrial@gmail.com>
| * ac3_parser: add a public function for parsing the data required by the demuxerAnton Khirnov2017-04-121-8/+11
| | | | | | | | | | | | Make the current semi-public avpriv_ac3_parse_header() private to lavc. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * matroska: Read only the data written in the scratch bufferLuca Barbato2017-04-101-2/+2
| | | | | | | | | | The private buffer is 20bytes but depending on the type only 12 bytes are actually filled.
* | flvdec: Check the avio_seek return value after reading a metadata packetMartin Storsjö2017-10-271-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | merge from libav: 585dc1aecef0371ad6f16cb3750ae2a6da9cf00a If the metadata packet is corrupted, flv_read_metabody can accidentally read past the start of the next packet. If the start of the next packet had been flushed out of the IO buffer, we would be unable to seek to the right position (on a nonseekable stream). Prefer to clearly error out instead of silently trying to read from a desynced stream which will only be interpreted as garbage.
* | Revert "flvdec: Check the avio_seek return value after reading a metadata ↵Steven Liu2017-10-271-7/+1
| | | | | | | | | | | | packet" This reverts commit ef7fe81b8554a2865d47a55edf47420878fa3d91.
* | lavf: Remove AVFMT_RAWPICTURE.Carl Eugen Hoyos2017-10-262-7/+0
| | | | | | | | Deprecated since October 2015.
* | Merge commit '604fbb3132e88727e496c96c92cfe02748c25a1a'James Almer2017-10-264-40/+59
|\ \ | |/ | | | | | | | | | | * commit '604fbb3132e88727e496c96c92cfe02748c25a1a': mov: Move code shared with CAF to a separate file Merged-by: James Almer <jamrial@gmail.com>
| * mov: Move code shared with CAF to a separate fileDiego Biurrun2017-04-034-40/+59
| |
| * takdec: Use ISO C printf conversion specifiers where appropriateDiego Biurrun2017-03-311-1/+1
| | | | | | | | libavformat/takdec.c:144:20: warning: format '%X' expects argument of type 'unsigned int', but argument 4 has type 'uint32_t'
| * nsvdec: don't ignore the return value of av_get_packet()Sean McGovern2017-03-261-2/+5
| | | | | | | | | | | | | | Fixes invalid reads with corrupted files. CC: libav-stable@libav.org Bug-Id: 1039
| * rtmpproto: send swfverify value as swfurl if latter is unusedRicardo Constantino2017-03-261-2/+5
| | | | | | | | | | | | | | | | | | Replicates lavf/librtmp.c behavior in L145-152 and rtmpdump's behavior with "--swfVfy <url>" passing the url to swfUrl. Fixes bug 943. Signed-off-by: Martin Storsjö <martin@martin.st>
| * spherical: Change types of bounding and pad to uint32_tVittorio Giovara2017-03-233-8/+7
| | | | | | | | | | | | | | | | | | These values are defined to be 32bit in the specification, so it makes more sense to store them as fixed width. Based on a patch by Micahel Niedermayer <michael@niedermayer.cc>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
OpenPOWER on IntegriCloud