aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * avformat: utils: K&R formatting cosmeticsDiego Biurrun2014-01-261-776/+910
| | | | | | | | Also adjust some comment wording / spelling and reorder header #includes.
| * lavf: make av_probe_input_buffer more robustAnton Khirnov2014-01-131-2/+1
| | | | | | | | | | | | | | Always use the actually read size as the offset instead of making possibly invalid assumptions. Addresses: CVE-2012-6618
* | AVFormatContext: add metadata_header_padding fieldJames Darnley2014-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This field is used to store the number of bytes that should be written as padding to a metadata header of a file. For example: - The FLAC format's METADATA_BLOCK_PADDING [1] - The ID3v2 tag format's padding [2] [1] http://xiph.org/flac/format.html#metadata_block_padding [2] http://id3.org/id3v2.3.0#ID3v2_overview Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Never favour an audio stream with 0 channels in av_find_best_stream().Carl Eugen Hoyos2014-01-161-0/+2
| | | | | | | | Fixes ticket #3311.
* | avformat/utils: av_probe_input_buffer2 decrease difference to libavMichael Niedermayer2014-01-141-2/+1
| | | | | | | | | | | | | | | | This removes the initialization of 2 unused fields The change was part of c1868e7ee7b07b40a0fe15f50df89fe499a01a50 but wasnt merged as the fields could still be used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils/av_probe_input_buffer2: fix buffer passed to ↵Michael Niedermayer2014-01-131-1/+1
| | | | | | | | | | | | ffio_rewind_with_probe_data() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils/av_probe_input_buffer2: fix offset checkMichael Niedermayer2014-01-131-3/+2
| | | | | | | | | | | | The check could fail if avio_read() read less than requested Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils/av_probe_input_buffer2: Fix pd.buf_sizeMichael Niedermayer2014-01-131-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'Michael Niedermayer2014-01-131-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '8b76362836f3c373c3aadc544522edcbef16dd5f': lavf: use a fixed width type Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use a fixed width typeAnton Khirnov2014-01-131-1/+1
| | | | | | | | It's shorter and more consistent with the rest of the code.
| * lavf: simplify handling of offset in av_probe_input_buuffer()Anton Khirnov2014-01-131-6/+4
| |
* | Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'Michael Niedermayer2014-01-061-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f': lavf: remove a pointless check Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove a pointless checkAnton Khirnov2014-01-061-2/+1
| | | | | | | | AVStream.codec is always non-NULL
* | avformat/utils: fix rounding error accumulation for generated dts in ↵Michael Niedermayer2014-01-041-2/+5
| | | | | | | | | | | | | | | | | | compute_pkt_fields() This only updates the case where there is no B frame reordering delay. Tested-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: fix order of buffers in timestamp update codeMichael Niedermayer2014-01-031-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: dont run update_initial_duration() twiceMichael Niedermayer2013-12-311-0/+3
| | | | | | | | | | | | This should avoid floods of first_dts not matching debug messages Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add ff_get_extradata()Michael Niedermayer2013-12-251-0/+16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: limit rfps to values larger than fpsMichael Niedermayer2013-12-151-0/+6
| | | | | | | | | | | | This avoids some nonsense values being produced by totally corrupted input Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: treat flv like mov with timestamp discardingMichael Niedermayer2013-12-151-1/+2
| | | | | | | | | | | | This prevents a regression when using an avparser with flv h264 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '281a40e18f923510f2067d05c5b0cf08cc49dfee'Michael Niedermayer2013-12-121-1/+0
|\| | | | | | | | | | | | | * commit '281a40e18f923510f2067d05c5b0cf08cc49dfee': lavf: remove an unneeded call to avcodec_get_frame_defaults(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove an unneeded call to avcodec_get_frame_defaults().Anton Khirnov2013-12-111-1/+0
| | | | | | | | avcodec_decode_*() resets the frame itself.
* | Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'Michael Niedermayer2013-12-111-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9': Replace all uses of avcodec_free_frame with av_frame_free(). Conflicts: doc/examples/decoding_encoding.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all uses of avcodec_free_frame with av_frame_free().Anton Khirnov2013-12-111-1/+1
| |
* | avformat/utils: Check avcodec_open2() return code in av_find_stream_info()Michael Niedermayer2013-12-111-5/+6
| | | | | | | | | | | | Fixes CID1135750 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: remove unused variableMichael Niedermayer2013-12-071-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: reject poorly fitting rfps values earlierMichael Niedermayer2013-12-071-7/+27
| | | | | | | | | | | | | | This avoids collecting statistics for rfps values that very likely will get rejected later. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: factor rfps calculation outMichael Niedermayer2013-12-051-67/+92
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: provide more IO statistics in debug output at start and end ↵Michael Niedermayer2013-12-051-2/+4
| | | | | | | | | | | | of av_find_streaminfo() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: move update_wrap_reference() upMichael Niedermayer2013-12-041-67/+64
| | | | | | | | | | | | | | simplifies code also remove extra {} Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: reorder operations in update_wrap_reference()Michael Niedermayer2013-12-041-4/+2
| | | | | | | | | | | | prevents a integer overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: correct for timestamp wrap earlierMichael Niedermayer2013-12-041-13/+23
| | | | | | | | | | | | This uses dts & pts as reference instead of first_dts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: also fix wrapping of start_time in update_initial_timestamps()Michael Niedermayer2013-12-041-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Fix pts_wrap_behavior calculation with negative first_dtsMichael Niedermayer2013-12-041-3/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-241-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-231-0/+2
| |
* | avformat/utils: inject audio skip side data before the side data merge codeMichael Niedermayer2013-11-211-9/+12
| | | | | | | | | | | | 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-211-3/+3
| | | | | | | | | | | | | | 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>
* | avformat/utils: dont count attached pics toward the probesizeMichael Niedermayer2013-11-181-2/+3
| | | | | | | | | | | | | | 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-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-161-1/+1
| |
* | Merge commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878'Michael Niedermayer2013-11-141-4/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-141-0/+102
| | | | | | | | | | | | | | | | 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>
| * lavf: do not use int to store an int64Anton Khirnov2013-11-011-1/+1
| |
| * lavf: remove unreliable timestamp guessing heuristicAnton Khirnov2013-10-281-22/+0
| |
* | avformat/utils: disabled debug code to collect format probing statisticsMichael Niedermayer2013-11-111-0/+5
| | | | | | | | | | | | | | | | | | | | This allows collecting statistics on probing scores and the amount of data probing needed for various files and formats. For example it can be used to find out which formats tend to need more data for probing or which files are probed with less certain/lower scores Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: never decrease has_b_frames in compute_pkt_fields()Michael Niedermayer2013-11-031-1/+2
| | | | | | | | | | | | | | | | The intent of the original check was to increase has_b_frames when it was incorrectly set to 0. Later codecs allowed larger values Found-by: divVerent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: remove unreliable timestamp guessing heuristicAnton Khirnov2013-10-291-24/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: make "first_dts not matching first dts in the queue" message ↵Michael Niedermayer2013-10-271-1/+2
| | | | | | | | | | | | more informative Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: do not override pts in h264 when they are provided from the ↵Michael Niedermayer2013-10-271-2/+4
| | | | | | | | | | | | | | | | demuxer Fixes Ticket2143 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Check size argument in ff_add_index_entry()Michael Niedermayer2013-10-241-0/+3
| | | | | | | | | | | | | | Fixes infinite loop Fixes Ticket3061 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-21 12:45:50 +0000