aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * avformat: Mark AVOutputFormat argument in avformat_query_codec as constDiego Biurrun2014-07-261-1/+1
| |
| * avformat_new_stream: make the AVCodec parameter constRoman Savchenko2014-07-081-1/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Replace av_malloc() and memset(0) by av_mallocz()Diego Biurrun2014-06-221-4/+2
| |
* | avformat: add av_stream_get_parser() to access avformat AVParserMichael Niedermayer2014-07-141-0/+5
| | | | | | | | | | | | | | | | | | The AVStream.parser field is considered private and its location cannot be preserved while preserving also ABI compatibility to libav, as libav added fields before it. Some tools like ffmpeg.c access this field though Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: do not wait for packets from discarded streams for genptsMichael Niedermayer2014-07-131-1/+2
| | | | | | | | | | | | | | Fixes long loop Fixes Ticket3208 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: dont clear programs during probingMichael Niedermayer2014-07-121-0/+3
| | | | | | | | | | | | Fixes Ticket 3763 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: skip updating programs/streams when determining durationMichael Niedermayer2014-07-111-0/+3
| | | | | | | | | | | | Fixes Ticket2441 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: better probing for duration in estimate_timings_from_pts()Gaullier Nicolas2014-06-191-1/+10
| | | | | | | | | | | | It seems it is more secure to simply duplicate the computing routine from compute_pkt_fields to estimate_timings_from_pts. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '194be1f43ea391eb986732707435176e579265aa'Michael Niedermayer2014-06-181-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '194be1f43ea391eb986732707435176e579265aa': lavf: switch to AVStream.time_base as the hint for the muxer timebase Conflicts: doc/APIchanges libavformat/filmstripenc.c libavformat/movenc.c libavformat/mxfenc.c libavformat/oggenc.c libavformat/swf.h libavformat/version.h tests/ref/lavf/mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: switch to AVStream.time_base as the hint for the muxer timebaseAnton Khirnov2014-06-181-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Previously, AVStream.codec.time_base was used for that purpose, which was quite confusing for the callers. This change also opens the path for removing AVStream.codec. The change in the lavf-mkv test is due to the native timebase (1/1000) being used instead of the default one (1/90000), so the packets are now sent to the crc muxer in the same order in which they are demuxed (previously some of them got reordered because of inexact timestamp conversion).
* | Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'Michael Niedermayer2014-06-161-264/+0
|\| | | | | | | | | | | | | | | | | | | * commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb': lavf: group dump functions together Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: group dump functions togetherVittorio Giovara2014-06-141-246/+0
| |
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-06-101-2/+4
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Allow values >31bit for -analyzeduration. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Allow values >31bit for -analyzeduration.Carl Eugen Hoyos2014-06-101-2/+4
| | |
* | | avformat/utils: dont wait for a first dts on demuxers which have ↵Michael Niedermayer2014-06-101-0/+1
|/ / | | | | | | | | | | AVFMT_NOTIMESTAMPS set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils/avformat_find_stream_info: Move max_analyze_duration setup ↵Michael Niedermayer2014-06-021-8/+8
| | | | | | | | | | | | out of the packet loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Call ff_rfps_add_frame() only for videoMichael Niedermayer2014-06-021-1/+2
| | | | | | | | | | | | This avoids some unneeded computations Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Report "unknown codec" instead of "unspecifed size" if the codec is unknown.Carl Eugen Hoyos2014-06-021-2/+3
| |
* | Use rc_max_rate in av_find_best_stream() if bitrate == 0.Carl Eugen Hoyos2014-05-311-0/+2
| | | | | | | | Fixes ticket #2042.
* | libavformat/utils: Warning about invalid cover art instead of an errorLazaros Koromilas2014-05-281-2/+6
| | | | | | | | | | | | This way other streams can still be used with the -map option. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/utils: Fix segfault on m4a cover artwork parsingLazaros Koromilas2014-05-281-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: set max analyze duration depending on the circumstancesMichael Niedermayer2014-05-261-2/+6
| | | | | | | | | | | | Fixes Ticket3673 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: move default for max_analyze_duration into utils.cMichael Niedermayer2014-05-261-2/+7
| | | | | | | | | | | | this way we can do better tha a single fixed constant value Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add format_probesize to allow tuning the maximum amount of bytes ↵Michael Niedermayer2014-05-251-4/+2
| | | | | | | | | | | | | | | | | | | | to identify the filetype Currently probesize is cliped at 1mb before being used for format detection. Alternatively this cliping could be removed but this would then tie various things like stream analysis to the file detection. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Check end time in avpriv_new_chapter()Michael Niedermayer2014-05-231-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add av_stream_get_end_pts()Michael Niedermayer2014-05-211-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37'Michael Niedermayer2014-05-201-0/+15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37': lavf: add av_stream_get_side_data Conflicts: doc/APIchanges libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add av_stream_get_side_dataJanne Grunau2014-05-201-0/+15
| |
| * probe: Support AAC_LATM in set_codec_from_probe_dataLuca Barbato2014-05-031-0/+1
| |
| * lavc: eliminate tb_unreliable()Anton Khirnov2014-04-281-19/+1
| | | | | | | | | | If framerate estimation is enabled, it makes sense to always apply it, instead of limiting it to a few specific cases.
* | estimate_timings_from_pts: Execute max 1 iteration extra to find more than 1 ↵Michael Niedermayer2014-05-161-10/+15
| | | | | | | | | | | | duration Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_pts: Try to get the duration for all streamsGaullier Nicolas2014-05-161-4/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_pts: simplify filesize end checkMichael Niedermayer2014-05-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_pts: Also consider packet durationGaullier Nicolas2014-05-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_pts: Warn about A/V streams for which no duration ↵Gaullier Nicolas2014-05-161-0/+14
| | | | | | | | | | | | could be set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: if the id3 tag is too large for data after it to become ↵Michael Niedermayer2014-05-121-2/+5
| | | | | | | | | | | | available, use the full AVPROBE_SCORE_EXTENSION if extension matches Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: limit probe score in the id3 case only if there is a chance ↵Michael Niedermayer2014-05-121-1/+3
| | | | | | | | | | | | | | | | that data after the id3 tag will become available Fixes ticket3327 (sample.mp3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: fix const warningsMichael Niedermayer2014-05-071-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Set the average frame rate from the r_frame_rate if the ↵Michael Niedermayer2014-04-281-0/+9
| | | | | | | | | | | | | | | | stream appears to be cfr This permits the average fps to be set in more cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Ensure that average fps is probed if requested by the user ↵Michael Niedermayer2014-04-281-2/+3
| | | | | | | | | | | | even if tb_unreliable() is 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: prevent r frame rate from being set larger than 1/tbMichael Niedermayer2014-04-281-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: add gif to tb_unreliable()Michael Niedermayer2014-04-281-0/+1
| | | | | | | | | | | | This improves the used timebases when gif is the source Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31'Michael Niedermayer2014-04-221-6/+0
|\| | | | | | | | | | | | | * commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31': lavf: do not use the parser duration for video Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: do not use the parser duration for videoAnton Khirnov2014-04-221-6/+0
| | | | | | | | | | The parser has no way of knowing video duration, and therefore no video parsers set it.
* | avformat: Fix decoder search in find stream infoMichael Niedermayer2014-04-211-3/+5
| | | | | | | | | | | | Fixes Ticket3548 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_id3v2_read: add option to limit ID3 magic number searchPeter Ross2014-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 ' chunk tag. If such chunks are stored sequentially, it is possible for the ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g. [1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] [2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: fix typoMichael Niedermayer2014-04-151-1/+1
| | | | | | | | | | Found-by: reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add av_format_inject_global_side_data(), and disable it by defaultMichael Niedermayer2014-04-151-3/+16
| | | | | | | | | | | | | | | | | | | | After this commit applications needs to call av_format_inject_global_side_data() or handle AVStream side data by some other means if they want it not to be lost. This fixes a API incompatibility with libav. libav API does not allow the data to be passed through AVPackets Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: reinject global side data on seeksMichael Niedermayer2014-04-131-0/+2
| | | | | | | | | | | | This fixes ffplay replaygain with seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: factorize if()Michael Niedermayer2014-04-131-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>