aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-081-3/+6
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: fix the comparison in an overflow check Conflicts: libavformat/utils.c See: a5d67bc796e1f9a2b99b43ea807166b655e4bdbc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: fix the comparison in an overflow checkAnton Khirnov2013-09-071-1/+1
| | | | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat: make avformat_close_input() more tolerant.Clément Bœsch2013-09-041-2/+8
| | | | | | | | | | The purpose of this commit is to make error management simpler and less error prone, just like av_free() which is safe with NULL.
* | avformat/utils: assert position monotonicity in ff_find_last_ts()Michael Niedermayer2013-09-041-0/+1
| | | | | | | | | | | | | | This ensures that no read timestamp functions finds packets before the search window in ff_find_last_ts() which could cause an infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Fix bitrate overflow checkMichael Niedermayer2013-09-031-6/+3
| | | | | | | | | | | | | | | | | | The check added in df33a58e5311ee9a64a573889b883a80e981af7b does not work at all, rather it broke the summing of bitrates completely. The comparission was wrong way around. This commit replaces it by a simpler and hopefully clearer check Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'df33a58e5311ee9a64a573889b883a80e981af7b'Michael Niedermayer2013-09-031-2/+7
|\| | | | | | | | | | | | | * commit 'df33a58e5311ee9a64a573889b883a80e981af7b': lavf: avoid integer overflow when estimating bitrate Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: avoid integer overflow when estimating bitrateAnton Khirnov2013-09-021-2/+7
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'Michael Niedermayer2013-09-031-2/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303': lavf: move a variable declaration to the block where it's used Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move a variable declaration to the block where it's usedAnton Khirnov2013-09-021-2/+2
| |
* | avformat/utils: fix duration_fields calculation when need_parsing=0Michael Niedermayer2013-09-011-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: fix av_probe_input_buffer2() so it returns the probe scoreMichael Niedermayer2013-08-291-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: export probe scoreMichael Niedermayer2013-08-281-4/+19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: move PROBE_BUF_M* to internal.hMichael Niedermayer2013-08-261-4/+0
| | | | | | | | | | | | They will be used by the mp3 probe function in the next commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove FF_API_PKT_DUMP cruft. Not compiled since libavformat 54.Alexis Ballier2013-08-131-16/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Integrate accessors.h header into internal.hReimar Döffinger2013-08-101-1/+0
| | | | | | | | | | | | | | I have no idea why I added a separate header, I think there is no good reason for it. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Reduce MAKE_ACCESSORS code duplication via a new header.Reimar Döffinger2013-08-081-4/+1
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avformat/utils: fix memleak with nobufferMichael Niedermayer2013-08-071-3/+3
| | | | | | | | | | | | Fixes Ticket2802 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'Michael Niedermayer2013-08-031-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7950e519bb094897f957b9a9531cc60ba46cbc91': Disable deprecation warnings for cases where a replacement is available Conflicts: libavcodec/avpacket.c libavcodec/pthread.c libavcodec/utils.c libavdevice/v4l2.c libavfilter/avfiltergraph.c libavfilter/buffersrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Disable deprecation warnings for cases where a replacement is availableDiego Biurrun2013-08-021-0/+3
| |