aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | parse_packet: use pkt.pos always instead of the avparser offset.Michael Niedermayer2012-07-261-1/+1
| | | | | | | | | | | | | | This is more correct and will be needed when the code is moved to a later point. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | probe_codec: fix memory corruptionMichael Niedermayer2012-07-261-1/+5
| | | | | | | | | | Found-by: Tanami Ohad Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_find_stream_info: skip flushing codecs and estimating timings if ↵Michael Niedermayer2012-07-251-1/+2
| | | | | | | | | | | | probe_size==0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: Set pos for all packets of AVSTREAM_PARSE_FULL_RAW files.Michael Niedermayer2012-07-251-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: factor AVStream st outMichael Niedermayer2012-07-251-4/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | parse_packet: reset pkt->pos after it has been usedMichael Niedermayer2012-07-251-0/+1
| | | | | | | | | | | | This should have no effect as it was not used in this case Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "lavf: count skipped samples for initial timestamps."Michael Niedermayer2012-07-241-4/+0
| | | | | | | | | | | | This reverts commit 885fc058655efee94203314984ce99b301fdebb1. This commit caused timestamps in case of generic seeking to become inconsistent.
* | av_url_split: dont let '/' char whallop '?' charPeter Ross2012-07-221-2/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: make cmdutils's check_stream_specifier public.Nicolas George2012-07-201-0/+61
| | | | | | | | | | The new function is called avformat_match_stream_specifier() and does not include logging the error message.
* | lavf: count skipped samples for initial timestamps.Nicolas George2012-07-191-0/+4
| | | | | | | | | | | | If skip_samples is set and timestamps are synthesized using durations, make them start at -skip_samples (rescaled) instead of 0, so that the timestamp of the first undiscarded sample is 0.
* | lavf: set pkt_timebase at the same time as stream->time_base.Nicolas George2012-07-191-0/+1
| |
* | lavf/utils: show the number of stream in case of missing parameterStefano Sabatini2012-07-181-2/+2
| | | | | | | | Increase feedback provided in avformat_find_stream_info().
* | lavf/utils: suggest what to do in case of missing codec informationStefano Sabatini2012-07-181-1/+2
| | | | | | | | In particular, fix trac issue #218.
* | lavf/utils: extend has_codec_parameters() to make it show what info is missingStefano Sabatini2012-07-181-17/+30
| | | | | | | | Improve feedback.
* | lavf: inject sample skip side data when requested by the demuxerMichael Niedermayer2012-07-121-0/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: limit "Adjusting PTS forward" code to video streamsMichael Niedermayer2012-07-081-0/+1
| | | | | | | | | | | | | | It can end up slightly messing up a series of valid timestamps after a invalid one. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | has_decode_delay_been_guessed: tighten up the heuristic.Michael Niedermayer2012-07-021-1/+4
| | | | | | | | | | | | | | This adds the minimum delay needed with the current decoder to recognize the reorder buffer size for the reference bitstreams. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | has_decode_delay_been_guessed: skip guessing when sps.num_reorder_frames is ↵Michael Niedermayer2012-07-021-0/+5
| | | | | | | | | | | | available Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | has_decode_delay_been_guessed: improve heuristicMichael Niedermayer2012-07-021-2/+4
| | | | | | | | | | | | This allows MR4_TANDBERG_C.264 and MR5_TANDBERG_C.264 to be decoded without -strict 1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: allow multiple names in output devices selected by av_guess_format()Stefano Sabatini2012-06-291-1/+1
| | | | | | | | Consistent with av_find_input_format().
* | avformat: offset fps calculation by one to include 60.00 fpsHendrik Leppkes2012-06-221-3/+3
| | | | | | | | | | | | | | To ensure the full range of values is still used, also adjust all uses of this function to loop from 0 instead of 1. This way only 60.00 is added and nothing lost. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add 48 fps to the NTSC frameratesHendrik Leppkes2012-06-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-201-6/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: MS Screen 1 decoder aacdec: Fix popping channel layouts. av_gettime: support Win32 without gettimeofday() Use av_gettime() in various places Move av_gettime() to libavutil dct-test: use emms_c() from libavutil instead of duplicating it mov: fix operator precedence bug mathematics.h: remove a couple of math defines Remove unnecessary inclusions of [sys/]time.h lavf: remove unnecessary inclusions of unistd.h bfin: libswscale: add const where appropriate to fix warnings bfin: libswscale: remove unnecessary #includes udp: Properly check for invalid sockets tcp: Check the return value from getsockopt network: Use av_strerror for getting error messages udp: Properly print error from getnameinfo mmst: Use AVUNERROR() to convert error codes to the right range for strerror network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows rtmp: Reduce the number of idle posts sent by sleeping 50ms Conflicts: Changelog configure libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dct-test.c libavcodec/version.h libavformat/riff.c libavformat/udp.c libavutil/Makefile libswscale/bfin/yuv2rgb_bfin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move av_gettime() to libavutilMans Rullgard2012-06-201-6/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavf: add field for how duration is estimatedMichael Bradshaw2012-06-181-0/+3
| | | | | | | | Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-161-1/+1
|\| | | | | | | | | | | | | | | * qatar/master: flacdec: read attached pictures. lavf: don't segfault when a NULL filename is passed to avformat_open_input() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: don't segfault when a NULL filename is passed to avformat_open_input()Anton Khirnov2012-06-161-1/+1
| | | | | | | | | | | | | | | | This can easily happen when the caller is using a custom AVIOContext. Behave as if the filename was an empty string in this case. CC: libav-stable@libav.org
* | lavf: cosmetic: format else with indentationMichael Bradshaw2012-06-151-1/+1
| | | | | | | | | | Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add a "warning" when discarding a oddly backward subtitle or data ↵Michael Niedermayer2012-06-121-0/+3
| | | | | | | | | | | | | | starttime Idea-by: ohsix Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: handle data like subtitles in start time calculation.Michael Niedermayer2012-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | This fixes an issue with a crazy data track starting with a large negative timestamp. It could as well be solved in all user apps, but this is looking attractively simpler ... Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: fix missing "parser not found" messageMichael Niedermayer2012-06-071-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-061-32/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vorbis: Validate that the floor 1 X values contain no duplicates. avprobe: Identify codec probe failures rather than calling them unsupported codecs. avformat: Probe codecs at score 0 on buffer exhaustion conditions. avformat: Factorize codec probing. Indeo Audio decoder imc: make IMDCT support stereo output imc: move channel-specific data into separate context lavfi: remove request/poll and drawing functions from public API on next bump lavfi: make avfilter_insert_pad and pals private on next bump. lavfi: make formats API private on next bump. avplay: use buffersrc instead of custom input filter. avtools: move buffer management code from avconv to cmdutils. avconv: don't use InputStream in the buffer management code. avconv: fix exiting when max frames is reached. mpc8: fix maximum bands handling aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. Conflicts: Changelog cmdutils.h ffmpeg.c ffplay.c ffprobe.c libavcodec/avcodec.h libavcodec/mpc8.c libavcodec/v210dec.h libavcodec/version.h libavcodec/vorbisdec.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fifo.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Probe codecs at score 0 on buffer exhaustion conditions.Alex Converse2012-06-051-12/+24
| |
| * avformat: Factorize codec probing.Alex Converse2012-06-051-20/+25
| |
* | lavf: use input keyframe flag when muxer does not provide keyframe flags.Michael Niedermayer2012-06-021-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: print the invalid tb in avpriv_set_pts_info()Michael Niedermayer2012-05-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add needs_parsing type to enable codec TS use.Michael Niedermayer2012-05-221-2/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-211-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dwt: K&R prettyprinting cosmetics Remove libnut wrapper fate: change name of FATE samples location environment variable avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps. http: Factorize the code by adding http_read_header() Conflicts: configure doc/APIchanges doc/fate.texi libavcodec/dwt.c libavcodec/dwt.h libavformat/Makefile libavformat/avformat.h libavformat/libnut.c libavformat/matroskaenc.c libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.James Zern2012-05-201-1/+3
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: indeo: Make ivi_calc_band_checksum() static, it is only used in one file. indeo: Drop unused debug function ivi_check_band(). avcodec/utils: cast a function argument to shut up a compiler warning truemotion1: remove disabled code fix typo in comment fate: fix dependencies for non-SAMPLES avconv tests indeo: check for invalid motion vectors indeo: check that band output buffer exists indeo: clear allocated band buffers indeo: track tile macroblock size indeo: check custom Huffman tables for errors factor out common decoding code for Indeo 4 and Indeo 5 mp3: fix start band index for block type 2 in 8kHz audio lavf: change some (de)muxer names to lowercase lavf: make output format matching case insensitive Conflicts: libavcodec/indeo4.c libavcodec/indeo5.c libavcodec/ivi_common.c libavcodec/utils.c tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: make output format matching case insensitiveMans Rullgard2012-05-191-1/+1
| | | | | | | | | | | | This is consistent with how input formats are matched. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavf: also use codec aspect ratio in av_guess_sample_aspect_ratioMarton Balint2012-05-201-1/+2
| | | | | | | | | | | | | | Use codec aspect ratio for frame aspect ratio if AVFrame is NULL. Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-161-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: Work around non-standard wc implementations at more places fate: work around non-standard wc implementations x86: rv40: Mark rv40_weight functions as MMX2; they use MMX2 instructions. ac3dsp: simplify x86 versions of ac3_max_msb_abs_int16 fate: use standard diff options tta: Fix comment about channel number; TTA supports >2 channels. avfilter: Move ff_get_ref_perms_string() to where it is used. build: Add 'check' target to run all compile and test targets. indeo3: validate new frame size before resetting decoder indeo3: when freeing buffers, set pointers referencing them to NULL as well indeo3: initialise pixel planes on allocation indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder fate: rename psx-str-v3-mdec to mdec-v3 fate: convert psx-str to a demuxer test lavf: add mdec to is_intra_only() list Conflicts: doc/developer.texi libavcodec/indeo3.c libavfilter/video.c libavformat/utils.c tests/fate/demux.mak tests/fate/video.mak tests/lavf-regression.sh tests/ref/vsynth1/cljr tests/ref/vsynth1/ffvhuff tests/ref/vsynth2/cljr tests/ref/vsynth2/ffvhuff Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add mdec to is_intra_only() listMans Rullgard2012-05-151-0/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavf: add av_guess_frame_sample_aspect_ratio functionMarton Balint2012-05-141-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guesses the sample aspect ratio of a frame, based on both the stream and the frame aspect ratio. Since the frame aspect ratio is set by the codec but the stream aspect ratio is set by the demuxer, these two may not be equal. This function tries to return the value that you should use if you would like to display the frame. Basic logic is to use the stream aspect ratio if it is set to something sane otherwise use the frame aspect ratio. This way a container setting, which is usually easy to modify can override the coded value in the frames. Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | update_initial_durations: use av_ts2str()Michael Niedermayer2012-05-141-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | update_initial_durations: add some checks to ensure things match up.Michael Niedermayer2012-05-141-0/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/utils: make use of av_ts2str() to print timestamps.Clément Bœsch2012-05-131-32/+38
| |
* | lavf: extend the avi raw hack to movMichael Niedermayer2012-05-111-2/+5
| | | | | | | | | | | | Fixes ticket1194 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: print a matching tag in case of code tag validation failureMichael Niedermayer2012-05-111-3/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>