aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Use a colon in the stream description, this matches how -map works now.Carl Eugen Hoyos2011-09-231-1/+1
| |
* | lavf/utils: only complain about aspect missmatch when the difference is ↵Michael Niedermayer2011-09-221-1/+3
| | | | | | | | | | | | "meassureable" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/utils: better dts wrap correction.Michael Niedermayer2011-09-201-2/+1
| | | | | | | | | | | | Fixes Ticket488 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: movenc: fix NULL reference in mov_write_tkhd_tag rmdec: Reject invalid deinterleaving parameters rv34: Fix potential overreads rv34: Fix buffer size used for MC of B frames after a resolution change rv34: Avoid NULL dereference on corrupted bitstream rv10: Reject slices that does not have the same type as the first one vf_yadif: add an option to enable/disable deinterlacing based on src frame "interlaced" flag vsrc_color: set output pos values to -1 vsrc_color: add @file doxy vsrc_buffer: remove duplicated file description eval: implement not() expression eval: add sqrt function for computing the square root rmdec: use the deinterleaving mode and not the codec when creating audio packets. lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails Conflicts: doc/eval.texi doc/filters.texi libavcodec/rv10.c libavfilter/vsrc_color.c libavformat/rmdec.c libavutil/avutil.h libavutil/eval.c tests/ref/fate/eval Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Fix context pointer in av_open_input_stream when avformat_open_input failsDavid Goldwich2011-09-191-1/+1
| | | | | | | | | | Signed-off-by: David Goldwich <david.goldwich@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavf/utils: rewrite real fps calculation code.Michael Niedermayer2011-09-161-17/+27
| | | | | | | | | | | | | | The new code is free of biasing to the first timestamps Fixes fraps.fps.test.zip Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ProRes DecoderElvis Presley2011-09-151-0/+1
| | | | | | | | Signed-off-by: Elvis Presley <elvis@e.p>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-141-6/+5
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf utils: Remove write-only variable lavf utils: Rename shadowing variable smacker: fix a few off by 1 errors Check for invalid VLC value in smacker decoder. Check and propagate errors when VLC trees cannot be built in smacker decoder. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf utils: Remove write-only variableAlex Converse2011-09-141-2/+1
| |
| * lavf utils: Rename shadowing variableAlex Converse2011-09-141-4/+4
| |
* | Don't override duration from file header with bitrate durationJoakim Plate2011-09-141-3/+5
| | | | | | | | | | This is most noticable on matroska files which has duration as part of it's header.
* | libavformat/utils: print ts in the "invalid dts/pts combination" case.Michael Niedermayer2011-09-131-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-121-2/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) audioconvert: add explanatory comments to channel_names array audioconvert: K&R whitespace cosmetics avconv: use correct index when selecting metadata to write to. avconv: fix inverted variable doc/avconv: document option types (input/output/per-stream/...) doc/avtools-common-opts: write a section about stream specifiers. doc/avconv: remove two pointless paragraphs. doc/avconv: document that global options should be specified first. doc/avconv: remove entries for nonexistent options doc/avconv: remove documentation for removed 'timestamp' option doc: cosmetics, rename fftools-common-opts to avtools-.... avconv: move streamid_map to options context. avconv: extend -vf syntax avconv: move top_field_first to options context. avconv: move inter/intra matrix to options context. avconv: remove -psnr option. avconv: remove me_threshold option. avconv: move video_rc_override_string to options context. avconv: move frame pixel format to the options context. avconv: move frame aspect ratio to the options context. ... Conflicts: avconv.c cmdutils_common_opts.h doc/avconv.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/utils: Only require first packet to be known for all audio and ↵Joakim Plate2011-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | video streams It can take a long time before subtitles or data streams show up, so we shouldn't wait for those before assuming we have all info for streams. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_interleave_packet_per_dts: switch noninterleaved flushing logic to max dts.Wolfram Gloger2011-09-091-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Prevent double free of side_data when AVFMT_FLAG_KEEP_SIDE_DATA flag is setGavin Kinsey2011-09-081-1/+4
| |
* | flvdec: Properly decoding in-band metadata packets as data frames.Joseph Wecker2011-09-071-0/+2
| |
* | libavformat/utils: only run delta_dts_min calculation code when its value is ↵Michael Niedermayer2011-09-071-16/+20
| | | | | | | | | | | | | | | | used. This should improve speed. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/utils: use FFMIN() where possibleMichael Niedermayer2011-09-071-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/utils: Treat subtitle streams as noninterleaved when 20 seconds ↵wg2011-09-071-4/+28
| | | | | | | | | | | | have passed without a packet Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Replace some commented-out debug printf() / av_log() messages with av_dlog().Diego Biurrun2011-09-011-9/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Rename find_program_from_stream to av_find_program_from_stream and add it to ↵Marton Balint2011-08-271-6/+12
| | | | | | | | | | | | | | | | | | avformat.h Also extend the functionality to use the last found program to start the search after that program. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix memory corruption in case of memory allocation failure in ↵Michael Niedermayer2011-08-271-1/+7
| | | | | | | | | | | | | | av_probe_input_buffer() Reported-by: Tanami Ohad Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-241-33/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: Replace goto redo on decode fail with continue. avconv: Remove dead store. libx264: add 'crf_max' private option. libx264: add 'weightp' private option. libx264: add 'rc_lookahead' private option. libx264: add 'psy_trellis' private option. libx264: add 'psy_rd' private option. libx264: add 'aq_strength' private option. libx264: add 'aq_mode' private option. libx264: add 'cqp' private option. libx264: add 'crf' private option. lavc: remove vbv_delay option lavf utils: Fix bad indentation. avconv: use av_clip_int16 for audio clipping Conflicts: libavcodec/libx264.c libavcodec/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf utils: Fix bad indentation.Alex Converse2011-08-231-33/+34
| |
* | lavf: warn when a parser is needed and not found.Nicolas George2011-08-221-0/+3
| |
* | Autodetect LOAS in transport streams.Carl Eugen Hoyos2011-08-201-0/+1
| | | | | | | | Fixes ticket 365.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-171-0/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Revert "avconv: use stream copy by default when possible." avconv: print stream copy information. avconv: use stream copy by default when possible. matroskaenc: vertical alignment. matroskaenc: implement query_codec() lavf: add avformat_query_codec(). lavc: add avcodec_get_type() for mapping codec_id -> type. flvenc: use int64_t to store offsets avconv: don't segfault on 0 input files. Do not write ID3v1 tags by default mpegts: log into an AVFormatContext rather than MpegTSContext. Conflicts: doc/APIchanges libavcodec/version.h libavformat/avformat.h libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add avformat_query_codec().Anton Khirnov2011-08-161-0/+14
| | | | | | | | It allows to check if a given codec can be written into a container.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-021-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Revert "swscale: use 15-bit intermediates for 9/10-bit scaling." swscale: use 15-bit intermediates for 9/10-bit scaling. dct32: Add SSE2 ASM optimizations Correct chroma vector calculation for RealVideo 3. lavf: Add an option to discard corrupted frames mpegts: Mark wrongly-sized packets as corrupted mpegts: Move scan test to handle_packets mpegts: Mark corrupted packets mpegts: Reset continuity counter on seek mpegts: Fix for continuity counter mpegts: Silence "can't seek" warning on unseekable apichange: add an entry for AV_PKT_FLAG_CORRUPT avpacket: signal possibly corrupted packets mpeg4videodec: remove dead code that would have detected erroneous encoding aac: Remove some suspicious illegal memcpy()s from LTP. bink: Eliminate unnecessary shadow declaration. Conflicts: doc/APIchanges libavcodec/version.h libavformat/avformat.h libavformat/options.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Add an option to discard corrupted framesZohar Kelrich2011-08-021-0/+9
| | | | | | | | | | Signed-off-by: Zohar Kelrich <lumimies@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-301-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata. H.264: tweak some other x86 asm for Atom probe: Fix insane flow control. mpegts: remove invalid error check s302m: use nondeprecated audio sample format API lavc: use designated initialisers for all codecs. x86: cabac: add operand size suffixes missing from 6c32576 Conflicts: libavcodec/ac3enc_float.c libavcodec/flacenc.c libavcodec/frwu.c libavcodec/pictordec.c libavcodec/qtrleenc.c libavcodec/v210enc.c libavcodec/wmv2dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * probe: Fix insane flow control.Alex Converse2011-07-291-2/+2
| | | | | | | | A loop control variable was shadowed inside the loop and never updated.
* | prefer "SAR" over "PAR" in av_dump_format()Stefano Sabatini2011-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | "SAR" (Sample Aspect Ratio) is globally preferred over "PAR" (Pixel Aspect Ratio), although the two terms share the same semantics. For example the corresponding AVStream field is called sample_aspect_ratio, and libavfilter has a filter named setsar. Therefore prefer the term "SAR" over "PAR" in the libavformat/utils.c:dump_stream_format() and avcodec_string() output for avoiding confusion.
* | muxer opts: fix avdict use in case of early private context allocMichael Niedermayer2011-07-251-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-171-13/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: rename enc variable in utils.c:has_codec_parameters()Stefano Sabatini2011-07-171-12/+12
| | | | | | | | | | | | | | Rename it to "avctx", the old name was confusing as the function is used also with decoder contexts. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-161-30/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) arm: remove disabled function dct_unquantize_h263_inter_iwmmxt() Remove commented-out call to non-existing function print_pow1(). Do not decode RV30 files if the extradata is too small flashsv: split flashsv_decode_block() off from flashsv_decode_frame(). ppc: remove disabled code libspeexdec: Drop const qualifier to silence compiler warning. libopenjpeg: Drop const qualifier to silence compiler warning. alac: Remove unused dummy code. Remove unused structs and tables. vaapi: do not assert on value read from input bitstream flashsvenc: replace bitstream description by a link to the specification flashsvenc: drop unnecessary cast flashsvenc: improve some variable names and fix corresponding comments flashsvenc: merge two consecutive if-conditions flashsvenc: merge variable declarations and initializations flashsvenc: convert some debug av_log() to av_dlog() flashsvenc: whitespace cosmetics flashsvenc: drop some unnecessary parentheses flashsvenc: fix some comment typos aacps: skip some memcpy() if src and dst would be equal ... Conflicts: libavcodec/vaapi_mpeg2.c libavformat/aviobuf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf/utils: drop av_ prefixes from static functions.Anton Khirnov2011-07-151-30/+30
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: Automatically add more flags required on symbian mem.h: switch doxygen parameter order to match function prototype doxygen: replace @sa tag by the more readable but equivalent @see doxygen: use Doxygen markup for authors and web links where appropriate doxygen: do not include license boilerplate in Doxygen documentation ac3enc: Mark AVClasses const ffserver: Replace two loops with one loop. ffmpeg: Fix the check for experimental codecs swscale: extend mmx padding. swscale: clip unscaled colorspace conversion path. doxygen: misc consistency cosmetics doc: remove file name from @file directive in Doxygen usage example doxygen: consistently place brief description doxygen: place empty line between brief description and detailed description avformat_open_input(): Add braces to shut up gcc warning. Conflicts: libavcodec/8svx.c libavcodec/tiff.c libavcodec/tiff.h libavcodec/vaapi_h264.c libavcodec/vorbis.c libavcodec/vorbisdec.c libavcodec/vp6.c libswscale/swscale_unscaled.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat_open_input(): Add braces to shut up gcc warning.Diego Biurrun2011-07-141-1/+1
| | | | | | | | | | libavformat/utils.c:599: warning: missing braces around initializer libavformat/utils.c:599: warning: (near initialization for ‘ap.time_base’)
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIchanges: fill in missing hashes and dates. Add an APIChanges entry and bump minor versions for recent changes. ffmpeg: print the low bitrate warning after the codec is openend. doxygen: Move function documentation into the macro generating the function. doxygen: Make sure parameter names match between .c and .h files. h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h H.264: Add more x86 assembly for 10-bit H.264 predict functions lavf: fix invalid reads in avformat_find_stream_info() cmdutils: replace opt_default with opt_default2() and remove set_context_opts ffmpeg: use new avcodec_open2 and avformat_find_stream_info API. ffplay: use new avcodec_open2 and avformat_find_stream_info API. cmdutils: store all codec options in one dict instead of video/audio/sub ffmpeg: check experimental flag after codec is opened. ffmpeg: do not set GLOBAL_HEADER flag in the options context Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c libavcodec/version.h libavformat/version.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: fix invalid reads in avformat_find_stream_info()Anton Khirnov2011-07-141-1/+1
| |
* | Merge commit 'b5849f77095439e994b11c25e6063d443b36c228'Michael Niedermayer2011-07-141-7/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5849f77095439e994b11c25e6063d443b36c228': (21 commits) ac3enc: merge AC3MDCTContext with AC3EncodeContext. ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext ac3enc: fix memleak mpeg1video: add CODEC_CAP_SLICE_THREADS. lavf: fix segfault in av_open_input_stream() mpegtsenc: set Random Access indicator on keyframe start packets lavf: Cleanup try_decode_frame() logic. Replace some gotos that lead to single return statements by direct return. build: move tests/seek_test.c to libavformat and reuse generic build rules mxfenc: include needed header for ff_iso8601_to_unix_time() prototype Add a check for strptime(). lavf: factor out conversion of ISO8601 string to unix time wav: parse 'bext' metadata wav: keep parsing until EOF if the input is seekable and we know the size of the data tag wav: Refactor the tag checking into a switch statement wav: make sure neither data_size nor sample_count is negative. wav: refactor the 'fmt ' tag search and parsing. wav: add an option for writing BEXT chunk ffmpeg: get rid of a pointless limit on number of streams. ffmpeg: remove an unused define. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: fix segfault in av_open_input_stream()Anton Khirnov2011-07-131-1/+2
| | | | | | | | ic is NULL in case of error.
| * lavf: Cleanup try_decode_frame() logic.Alex Converse2011-07-131-6/+3
| | | | | | | | This fixes AAC playback in ffplay.
| * Add a check for strptime().Anton Khirnov2011-07-131-0/+6
| | | | | | | | It's an XSI extension, not available on some supported systems.
| * lavf: factor out conversion of ISO8601 string to unix timeAnton Khirnov2011-07-131-0/+7
| |
* | Move resetting of channels, sample_rate back to av_find_stream_info.Reimar Döffinger2011-07-121-0/+9
| | | | | | | | | | | | | | | | | | | | Resetting it on codec init would incorrectly clear the values if av_find_stream_info was already run before, in particular breaking ffplay. This fixes trac tickets #213 and #262. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'Michael Niedermayer2011-07-111-6/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '142e76f1055de5dde44696e71a5f63f2cb11dedf': swscale: fix crash with dithering due incorrect offset calculation. matroskadec: fix stupid typo (!= -> ==) build: remove duplicates from order-only directory prerequisite list build: rework rules for things in the tools dir configure: fix --cpu=host with gcc 4.6 ARM: use const macro to define constant data in asm bitdepth: simplify FUNC/FUNCC macros dsputil: remove ff_emulated_edge_mc macro used in one place 9/10-bit: simplify clipping macros matroskadec: reindent matroskadec: defer parsing of cues element until we seek. lavc: add support for codec-specific defaults. lavc: make avcodec_alloc_context3 officially public. lavc: remove a half-working attempt at different defaults for audio/video codecs. ac3dec: add a drc_scale private option lavf: add avformat_find_stream_info() lavc: introduce avcodec_open2() as a replacement for avcodec_open(). Conflicts: Makefile libavcodec/utils.c libavformat/avformat.h libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 12:43:10 +0000