summaryrefslogtreecommitdiff
path: root/ffprobe.c
Commit message (Collapse)AuthorAge
* ffprobe: rename print_{int,str}_f callbacks to print_{integer,string}.Clément Bœsch2011-09-13
| | | | | Renamed for consistency. Also, since print_int() and print_str() are already defined as macros, the long name version is preferred.
* ffprobe: add JSON output printing format.Clément Bœsch2011-09-13
|
* ffprobe: replace fmt callback with str callback.Clément Bœsch2011-09-13
| | | | | | | | | Having a string callback is much more simpler than a variable args one for writers to deal with, especially when dealing with escaping. This patch also introduces a local fast_asprintf() function which is similar to av_asprintf() but avoids reallocating at each print (leading to a performance issue).
* ffprobe: replace specific ## GNU cpp extension with __VA_ARGS__.Clément Bœsch2011-09-09
|
* ffprobe: replace simple string printing with the appropriate helper.Clément Bœsch2011-09-08
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-05
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: fix type for thread_type option avconv: move format to options context avconv: move limit_filesize to options context avconv: move start_time, recording_time and input_ts_offset to options context avconv: add a context for options. cmdutils: allow storing per-stream/chapter/.... options in a generic way cmdutils: split per-option code out of parse_options(). cmdutils: add support for caller-provided option context. cmdutils: declare only one pointer type in OptionDef cmdutils: move grow_array() from avconv to cmdutils. cmdutils: move exit_program() declaration to cmdutils from avconv http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes nutenc: add namespace to the api facing functions Conflicts: avconv.c cmdutils.c cmdutils.h ffmpeg.c ffplay.c ffprobe.c ffserver.c libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: AVOptions: fix av_set_string3() doxy to match reality. cmdutils: get rid of dummy contexts for examining AVOptions. lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions. AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find(). cpu detection: avoid a signed overflow Conflicts: avconv.c cmdutils.c doc/APIchanges ffmpeg.c libavcodec/options.c libavcodec/version.h libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: directly use va args in print fmt callbacks.Clément Bœsch2011-09-01
| |
* | ffprobe: introduce output format writers.Clément Bœsch2011-08-30
| |
* | ffprobe: fix deprecated call to av_find_stream_info.Clément Bœsch2011-08-26
| |
* | ffprobe: use av_get_media_type_string() in media_type_string(), simplifyStefano Sabatini2011-08-20
| |
* | ffprobe: in value_string(), do not print trailing space in case of no suffixStefano Sabatini2011-08-17
| |
* | NoMerge commit '4d58e4cb4ca8e04317fecea432ea3272a445877c'Michael Niedermayer2011-08-10
|\| | | | | | | | | | | | | | | | | * commit '4d58e4cb4ca8e04317fecea432ea3272a445877c': Rename ffserver to avserver. Rename ffprobe to avprobe. Rename ffplay to avplay. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Rename ffprobe to avprobe.Anton Khirnov2011-08-09
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dnxhddec: optimise dnxhd_decode_dct_block() rtp: remove disabled code eac3enc: use different numbers of blocks per frame to allow higher bitrates dnxhd: add regression test for 10-bit dnxhd: 10-bit support dsputil: update per-arch init funcs for non-h264 high bit depth dsputil: template get_pixels() for different bit depths dsputil: create 16/32-bit dctcoef versions of some functions jfdctint: add 10-bit version mov: add clcp type track as Subtitle stream. mpeg4: add Mpeg4 Profiles names. mpeg4: decode Level Profile for MPEG4 Part 2. ffprobe: display bitstream level. imgconvert: remove unused glue and xglue macros Conflicts: libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffprobe: display bitstream level.Thierry Foucu2011-07-21
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'Michael Niedermayer2011-07-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: introduce avcodec_open2() as a replacement for avcodec_open().Anton Khirnov2011-07-10
| | | | | | | | | | Adds support for decoder-private options and makes setting other options simpler.
| * Fix segmentation fault in ffprobeGavin Kinsey2011-07-03
| |
* | ffprobe: flush stdout after each group.Nicolas George2011-07-02
| |
* | ffprobe: fix opt_pretty() signatureStefano Sabatini2011-07-01
| | | | | | | | This is required after the OPT_FUNC2 removal.
* | Make all option parsing functions match the function pointer type through ↵Jeff Downs2011-06-30
| | | | | | | | | | | | | | | | | | which they are called. All option parsing functions now match the function pointer signature through which they are called (int f(const char *, const char *), thereby working reliably on all platforms. Prefix all option processing functions with opt_
* | ffprobe: remove duplicate avformat_alloc_context()Michael Niedermayer2011-06-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix segmentation fault in ffprobeGavin Kinsey2011-06-21
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: add opt_find to AVCodecContext class. h264: Complexify frame num gap shortening code intreadwrite.h: fix AV_RL32/AV_RB32 signedness. Fix decoding of mpegts streams with h264 video that does *NOT* have b frames Add minor bumps and APIChanges entries for lavf private options. ffmpeg: deprecate -vc and -tvstd ffmpeg: use new avformat_open_* API. ffserver: use new avformat_open_* API. ffprobe: use new avformat_open_* API. ffplay: use new avformat_open_* API. cmdutils: add opt_default2(). dict: add AV_DICT_APPEND flag. lavf: add avformat_write_header() as a replacement for av_write_header(). Deprecate av_open_input_* and remove their uses. lavf: add avformat_open_input() as a replacement for av_open_input_* AVOptions: add av_opt_find() as a replacement for av_find_opt. AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context. ffmpeg: don't abuse a global for passing frame size from input to output ffmpeg: don't abuse a global for passing pixel format from input to output ffmpeg: initialise encoders earlier. Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c ffprobe.c libavcodec/h264.c libavformat/avformat.h libavformat/utils.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffprobe: use new avformat_open_* API.Anton Khirnov2011-06-16
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove all uses of now deprecated metadata functions.Anton Khirnov2011-06-08
| |
| * cmdutils: remove OPT_FUNC2Stefano Sabatini2011-05-28
| | | | | | | | | | | | | | | | | | Make ff* tools only accept opt_* functions taking two arguments. The distinction between functions with one and two arguments is quite pointless. Simplify parse_options() code. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * ffprobe: tweak error message in open_input_file()Stefano Sabatini2011-05-12
| | | | | | | | | | | | | | Replace "codec (id=%d)" with "codec with id %d", slightly more readable. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | ffprobe: implement -i FILE optionStefano Sabatini2011-06-05
| | | | | | | | Useful for mimicking the ffmpeg -i FILE syntax.
* | cmdutils: change the signature of the function argument in parse_options()Stefano Sabatini2011-06-05
| | | | | | | | This is required for a pending simplification.
* | cmdutils: remove OPT_FUNC2Stefano Sabatini2011-05-28
| | | | | | | | | | | | | | Make ff* tools only accept opt_* functions taking two arguments. The distinction between functions with one and two arguments is quite pointless. Simplify parse_options() code.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Handle unicode file names on windows rtp: Rename the open/close functions to alloc/free Lowercase all ff* program names. Refer to ff* tools by their lowercase names. NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg. Replace `` by $() syntax in shell scripts. patcheck: Allow overiding grep program(s) through environment variables. NOT Pulled Remove stray libavcore and _g binary references. vorbis: Rename decoder/encoder files to follow general file naming scheme. aacenc: Fix whitespace after last commit. cook: Fix small typo in av_log_ask_for_sample message. aacenc: Finish 3GPP psymodel analysis for non mid/side cases. Remove RDFT dependency from AAC decoder. Add some debug log messages to AAC extradata Fix mov debug (u)int64_t format strings. bswap: use native types for av_bwap16(). doc: FLV muxing is supported. applehttp: Handle AES-128 encrypted streams Add a protocol handler for AES CBC decryption with PKCS7 padding doc: Mention that DragonFly BSD requires __BSD_VISIBLE set Conflicts: ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Lowercase all ff* program names.Diego Biurrun2011-04-23
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove the FF_API_SET_STRING_OLD cruft.Anton Khirnov2011-04-19
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavf: add av_ prefix to dump_format()Anton Khirnov2011-02-16
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | ffprobe: provide format parameters to av_open_input_file()Stefano Sabatini2011-03-26
| | | | | | | | | | | | | | | | | | Provide a non-NULL AVFormatParameters structure to av_open_input_file() in open_input_file(). This is required because otherwise av_open_input_file() will allocate and use a new format context, discarding the options set in the provided format context.
* | ffprobe: tweak error message in open_input_file()Stefano Sabatini2011-03-21
| | | | | | | | | | Replace "codec (id=%d)" with "codec with id %d", slightly more readable.
* | lavf: add av_ prefix to dump_format()Anton Khirnov2011-02-18
|/ | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 610219a598095f938705f200dfe3946455ef871a)
* Make ffprobe print stream language only once, also remove usage of theAnton Khirnov2010-10-16
| | | | | | | | deprecated field AVStream.language. Patch by Anton Khirnov %name%@%surname% dot net. Originally committed as revision 25507 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffmpeg.c/ffprobe.c: remove all uses of av_metadata_conv()Anton Khirnov2010-10-16
| | | | | | patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25503 to svn://svn.ffmpeg.org/ffmpeg/trunk
* User application side of Codec specific parameters.Michael Niedermayer2010-09-29
| | | | Originally committed as revision 25266 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ffprobe able to set AVFormatContext options.Stefano Sabatini2010-09-25
| | | | Originally committed as revision 25187 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement ffprobe -show_packets.Stefano Sabatini2010-07-28
| | | | Originally committed as revision 24577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement av_get_codec_tag_string() and use it in ffprobe.Stefano Sabatini2010-06-02
| | | | Originally committed as revision 23421 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent after the last commit.Stefano Sabatini2010-04-27
| | | | Originally committed as revision 22984 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ffprobe show sample_aspect_ratio and display_aspect_ratio only ifStefano Sabatini2010-04-27
| | | | | | | | | | | sample_aspect_ratio is known. Avoid to show bogus values, which may confuse both the human and the machine reader. Based on a patch by Robert Krüger $(echo lsvfhfs@tjhobm7.ef | tr "b-za" "a-z"). Originally committed as revision 22983 to svn://svn.ffmpeg.org/ffmpeg/trunk