aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
* | avformat/utils: Check av_packet_new_side_data() return before using itMichael Niedermayer2013-10-201-2/+4
| | | | | | | | | | | | Fixes null pointer dereference Fixes CID1108592 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: use ff_alloc_extradata()Paul B Mahol2013-10-131-8/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat: add ff_alloc_extradata() helperPaul B Mahol2013-10-131-0/+20
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat: add support to force specific AVCodecsMichael Niedermayer2013-10-021-0/+15
| | | | | | | | | | | | | | | | previously only codec_ids could be forced, which did not allow forcing a specific implementation like libopenjpeg vs jpeg2000. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: pass AVFormatContext to find_decoder()Michael Niedermayer2013-10-021-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: factor find_decoder() outMichael Niedermayer2013-09-281-5/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'Michael Niedermayer2013-09-231-1/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4': lavf: Avoid setting avg_frame_rate if delta_dts is negative Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Avoid setting avg_frame_rate if delta_dts is negativeMartin Storsjö2013-09-221-1/+2
| | | | | | | | | | | | | | | | | | This avoids setting avg_frame_rate to invalid (negative) values. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat: remove duplicate includesMichael Niedermayer2013-09-211-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: remove unused variableMichael Niedermayer2013-09-201-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer2013-09-191-6/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5626f994f273af80fb100d4743b963304de9e05c': avformat: Use av_reallocp() where suitable Conflicts: libavformat/avidec.c libavformat/avienc.c libavformat/aviobuf.c libavformat/oggparsevorbis.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-181-1/+2
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/utils: Print warning if reallocating probe buffer failedMichael Niedermayer2013-09-171-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '68b467742092364f9306283f40effde2c12efe08'Michael Niedermayer2013-09-171-6/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '68b467742092364f9306283f40effde2c12efe08': lavf: Make probe_codec return an error code Conflicts: libavformat/utils.c A failure to reallocate should not free the array as it is used to probe the codec. And failure to reallocate if the following probe succeeds isnt a fatal error for probe_codec(). Thus this is only partially merged to ensure probing still is attempted with the data available. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Make probe_codec return an error codeAlexandra Khirnova2013-09-161-7/+14
| | | | | | | | | | | | This allows handling errors from av_realloc properly. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Do not suggest to increase probesize for image2 files.Carl Eugen Hoyos2013-09-171-1/+2
| |
* | avformat/utils: use av_realloc_array()Michael Niedermayer2013-09-111-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: functions that add entries should not destroy the whole list ↵Michael Niedermayer2013-09-111-8/+10
| | | | | | | | | | | | | | | | | | | | | | on failure The caller does not expect this, and in case of adding new streams would then not even be able to deallocate them anymore. This reverts a hunk from "avformat: Use av_reallocp_array() where suitable" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'Michael Niedermayer2013-09-111-10/+8
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f369b9356c4606cd4d713d60f7db5de119d901fa': avformat: Use av_reallocp_array() where suitable Conflicts: libavformat/asfenc.c libavformat/gxfenc.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use av_reallocp_array() where suitableAlexandra Khirnova2013-09-101-10/+8
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>