aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
* avformat: Add integer fps from 31 to 60 to get_std_framerate()Michael Niedermayer2016-01-151-3/+7
| | | | | | | | | Fixes Ticket 5106 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2039b3e7511ef183dae206575114e15b6d99c134) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/utils: estimate_timings_from_pts - increase retry counter, fixes ↵Rainer Hochecker2015-12-141-1/+1
| | | | | | | | | | | | invalid duration for ts files with hevc codec Fixes a mpegts file with hevc that fails estimating duration. Increasing number of retries fixes the issue. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2d8c2f1a28073d451c7db31291c333cb15ca3d0b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/utils: Do not init parser if probing is unfinishedMichael Niedermayer2015-11-161-1/+1
| | | | | | | | | | | Fixes assertion failure Fixes: 136f8b8d47af7892306625e597dee655/signal_sigabrt_7ffff6ae7cc9_8941_ab11bea57c84796418f481f873dc31ba.dvr_ms Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 1ef336e912a7a3a13a9933825a56c421f891e44b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/utils: Do not select audio streams with unknown sample rate in ↵Michael Niedermayer2015-06-061-1/+1
| | | | | | | | | av_find_best_stream() Together with the next commit this prevents non-PCM S302M from being selected unless either it can be decoded or the user selects passthrough/copy Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: Simplify get_std_framerate() checkMichael Niedermayer2015-06-011-1/+1
| | | | | | This also avoids using a floating point operation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: Use av_codec_get_tag2() in avformat_query_codec().Carl Eugen Hoyos2015-05-281-1/+2
| | | | av_codec_get_tag() can return 0 both in case of error and success.
* avformat: add callback for opening further filesMichael Niedermayer2015-05-111-0/+1
| | | | | Previous version reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: Reset global flag on deinitVittorio Giovara2015-04-231-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat: add common mechanism for skipping samples at the start of filewm42015-04-221-0/+4
| | | | | | | This makes using the generic indexing code with mp3 easier at a later point. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: Ensure that AVFMT_FLAG_CUSTOM_IO is set before useMichael Niedermayer2015-04-211-0/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13'Michael Niedermayer2015-04-201-1/+1
|\ | | | | | | | | | | | | * commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13': lavf: Fix variables constness in ff_iso8601_to_unix_time() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Fix variables constness in ff_iso8601_to_unix_time()Vittorio Giovara2015-04-201-1/+1
| | | | | | | | | | | | warning: assigning to 'char *' from 'const char *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
* | avformat/utils: Place timestamp trace logs under FF_FDEBUG_TSMichael Niedermayer2015-04-201-2/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Provide context for av_log() where one is availableMichael Niedermayer2015-04-201-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-201-12/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-191-12/+12
| | | | | | | | This applies to every library where performance is not critical.
* | avformat/utils: Add HEVC to unreliable_tb()Michael Niedermayer2015-04-181-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Use codec_info_duration_fields in fps calculation end ↵Michael Niedermayer2015-04-181-3/+7
| | | | | | | | | | | | | | | | | | decission when no timestamps and thus no duration_count is available This avoids waiting for a count to increase which will always be 0 and may reduce the startup delay for affected streams (rare) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Preserve packet duration when parsing is done only for headersMichael Niedermayer2015-04-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat, avcodec: log discard paddingwm42015-04-141-1/+1
| | | | | | | | | | | | Useful for debugging. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'Michael Niedermayer2015-04-071-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '27f274628234c1f934b9a6a6380ed567c1b4ceae': parseutils: Make av_small_strptime public Conflicts: doc/APIchanges libavformat/utils.c libavutil/parseutils.c libavutil/version.h See: 29e972f67c914d35417bc7368493d2617abdd26e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * parseutils: Make av_small_strptime publicLuca Barbato2015-04-071-9/+2
| | | | | | | | | | | | And use it in libavformat. Based on a similar patch by Stefano Sabatini <stefasab@gmail.com>.
* | avformat/utils: avoid discarded streams in av_find_default_stream_index()Michael Niedermayer2015-04-061-0/+3
| | | | | | | | | | | | Fixes Ticket2010 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Terminate SPS in avci100_1080i_extradata to avoid warnings ↵Michael Niedermayer2015-03-241-1/+1
| | | | | | | | | | | | | | during parsing Fixes: AVCI100_Test.mxf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'Michael Niedermayer2015-03-201-0/+22
|\| | | | | | | | | | | | | | | | | | | * commit '342fc46c69199b076b7c210f42208ce39a2bde1c': cmdutils: Add a stream specifier to map usable streams Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add avformat_flush()wm42015-03-051-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'Michael Niedermayer2015-02-111-45/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '9deaec782810d098bca11c9332fab2d2f4c5fb78': lavf: move internal fields from public to internal context Conflicts: libavformat/avformat.h libavformat/internal.h libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move internal fields from public to internal contextwm42015-02-101-38/+39
| | | | | | | | | | | | | | This is not an API change; the fields were explicitly declared private before. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/utils: Fix division by 0Michael Niedermayer2015-02-091-2/+2
| | | | | | | | | | | | | | Fixes: signal_sigsegv_14999ef_1188_cov_2888512890_SVA_CL1_E.264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/utils: fix if_( styleStefano Sabatini2015-02-041-1/+1
| |
* | avformat: fix mode of img2dec.c and utils.cMichael Niedermayer2015-02-031-0/+0
| | | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: remove the non-negative number requirement for ↵Liviu Oniciuc2015-02-031-0/+2
| | | | | | | | | | | | | | | | | | start_number option industrial cameras usually mark the trigger frame as frame number 0 all frames saved before trigger frame receive a negative sequence number Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/network: Check for av_malloc* failures in ff_tls_init()Michael Niedermayer2015-02-031-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Fix number suffixes in tb_unreliable()Michael Niedermayer2015-02-011-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: remove unneeded #include, there are no assert() only av_assert*Paul B Mahol2015-01-311-2/+0
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'Michael Niedermayer2015-01-271-0/+37
|\| | | | | | | | | | | | | | | | | | | | | * commit '4227e4fe7443733fb906f6fb6c265105e8269c74': lavf: add a convenience function for adding side data to a stream Conflicts: libavformat/internal.h libavformat/replaygain.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add a convenience function for adding side data to a streamAnton Khirnov2015-01-271-0/+37
| |
| * libavformat: Check for malloc failures in avformat_new_streamMartin Storsjö2015-01-041-0/+5
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
| * avformat: Make avformat_free_context handle NULLLuca Barbato2014-10-171-0/+3
| | | | | | | | | | | | | | Work as the other free()-like functions. Bug-Id: CID 1087081 CC: libav-stable@libav.org
* | avformat: Improve data streams/codec supportAnshul Maheshwari2015-01-161-0/+1
| | | | | | | | | | | | | | This adds data codec/stream handling where previously there was only audio/video/subtitles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Use avio_closep() to avoid leaving stale pointers in memoryMichael Niedermayer2015-01-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Clear pointer in ff_alloc_extradata() to avoid leaving a ↵Michael Niedermayer2015-01-061-0/+1
| | | | | | | | | | | | stale pointer in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: add dvbsub to set_codec_from_probe_data()Michael Niedermayer2015-01-051-0/+1
| | | | | | | | | | | | Fixes part of ticket 4221 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add FFMPEG_VERSION into the binary libsMichael Niedermayer2014-12-191-0/+3
| | | | | | | | | | | | This simplifies identifying from which revision a binary of a lib came from Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Do not update programs streams from program-less streams in ↵Michael Niedermayer2014-12-141-0/+2
| | | | | | | | | | | | | | | | update_wrap_reference() Fixes Ticket3686 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: use r_frame_rate only in the demuxer for ↵Michael Niedermayer2014-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | ff_compute_frame_duration() This is primarly to maintain current behavior when r_frame_rate is set for muxers and could be reverted if it has some advantage Fixes Ticket3629 part1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix "than" typoMichael Niedermayer2014-12-131-1/+1
| | | | | | | | | | Found-by reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Do not estimate the container bitrate from the streams if ↵Michael Niedermayer2014-12-131-0/+5
| | | | | | | | | | | | one video stream lacks the bitrate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: check for malloc failurewm42014-12-121-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: change assert to av_assert0()Michael Niedermayer2014-12-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>