aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | avformat: Remove use of AVFrac and AVStream->ptsMichael Niedermayer2015-08-231-1/+5
| | | | | | | | | | | | | | Move field to internal part of AVStream and struct to internal.h Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-271-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-271-2/+2
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-271-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-271-2/+2
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/utils: Fix regression with H264 stream probingMichael Niedermayer2015-07-161-1/+9
| | | | | | | | | | | | Fixes Ticket4725 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/utils: Print stream number in max_analyze_duration exit pathMichael Niedermayer2015-07-161-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/utils: inform the user if the protocol cannot be determinedMichael Niedermayer2015-07-151-0/+7
| | | | | | | | | | | | Assuming the wrong protocol can lead to suboptimal seeking performance Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/utils: adjust short skip threshold in ↵Michael Niedermayer2015-07-151-0/+6
| | | | | | | | | | | | | | | | ff_configure_buffers_for_index() to avoid seeking if a packet is skiped Fixes Ticket4126 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat: don't crash API users when demuxing mp4wm42015-07-141-1/+1
| | | | | | | | | | | | This code is one big chunk of WTF. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/utils: Skip ff_configure_buffers_for_index() for local filesMichael Niedermayer2015-07-131-0/+5
| | | | | | | | | | | | | | Theres no known case where its use on local files improves performance if you know of such a case, please contact us Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat: Add ff_configure_buffers_for_index()Michael Niedermayer2015-07-131-0/+39
| | | | | | | | | | | | This allows configuring the io buffer in such way that few seeks are needed for playback Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Redesign scoring in av_find_default_stream_index()Michael Niedermayer2015-07-011-10/+10
| | | | | | | | | | | | | | | | | | | | This avoids empty streams from being selected if a equivalent non empty one is available The new system is also clearer and more systematic This may need finetuning, which should be easy to do ... Fixes Ticket2687 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>