summaryrefslogtreecommitdiff
path: root/ffprobe.c
Commit message (Collapse)AuthorAge
* ffprobe: prefer av_freep() over av_free() for global print_format option.Clément Bœsch2011-10-18
| | | | | It could be re-used for instance in case ffprobe would support multiple input files.
* ffprobe: fix weird alignStefano Sabatini2011-10-18
|
* ffprobe: prefer av_strtok() over av_get_token() for parsing print_format stringStefano Sabatini2011-10-18
| | | | Simplify, and avoid the need for multiple escaping levels.
* ffprobe: move up ESCAPE_CHECK_SIZE and ESCAPE_REALLOC_BUF macrosStefano Sabatini2011-10-18
| | | | So they can be used by other escaping routines.
* ffprobe: redesign json_escape_str(), to make use of a global bufferStefano Sabatini2011-10-18
| | | | | | | | The new code avoids to call av_malloc/av_free when escaping is needed (possibly faster), avoids an integer overflow in case of a huge string, and provides feedback when a string cannot be escaped. When a string cannot be escaped, a special string is printed instead.
* ffprobe: add AVClass to writersStefano Sabatini2011-10-15
| | | | It is useful for logging messages from a writer context.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) tiffenc: initialize forgotten avctx. avplay: free the active audio packet at exit. avplay: free rdft data used for spectrogram analysis. log.h: make AVClass a named struct fix ac3 encoder documentation vc1: more prettyprinting cosmetics vc1: prettyprint some tables vc1: K&R formatting cosmetics AVOptions: bump minor and add APIchanges entry. cmdutils/avtools: simplify show_help() by using av_opt_child_class_next() AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* Remove all uses of deprecated AVOptions API. AVOptions: add av_opt_next, deprecate av_next_option. AVOptions: add functions for evaluating option strings. AVOptions: split get_number(). AVOptions: add av_opt_get*, deprecate av_get*. AVOptions: add av_opt_set*(). AVOptions: add new API for enumerating children. rv34: move inverse transform functions to DSP context flvenc: Write the right metadata entry count ... Conflicts: avconv.c cmdutils.c doc/APIchanges ffplay.c ffprobe.c libavcodec/ac3dec.c libavcodec/h264.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options.c libavdevice/libdc1394.c libavdevice/v4l2.c libavfilter/vf_drawtext.c libavformat/flvdec.c libavformat/mpegtsenc.c libavformat/options.c libavutil/avutil.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: show sample_fmt in the stream sectionStefano Sabatini2011-10-12
| |
* | ffprobe: prefer lowercase section names over uppercase onesStefano Sabatini2011-10-11
| | | | | | | | | | This is consistent with chapter names. The default writer section names are converted to uppercase for keeping backward compatibility.
* | ffprobe: parse arguments for -print_format writerStefano Sabatini2011-10-09
| | | | | | | | | | This allows -print_format to accept string of the form WRITER=OPTIONS, as required by the pending compact writer patch.
* | ffprobe: extend writers API, and move the writers up in the fileStefano Sabatini2011-10-09
| | | | | | | | | | The new provided API is more flexible and is decoupled from the application level code, so it is easier to maintain.
* | ffprobe: fix trailing '=' in stream id.Clément Bœsch2011-09-28
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) fate: allow testing with libavfilter disabled x86: XOP/FMA4 CPU detection support ws_snd: misc cosmetic clean-ups ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead. ws_snd: use memcpy() and memset() instead of loops ws_snd: use samples pointer for loop termination instead of a separate iterator variable. ws_snd: make sure number of channels is 1 ws_snd: add some checks to prevent buffer overread or overwrite. ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16. flacdec: fix buffer size checking in get_metadata_size() rtp: Simplify ff_rtp_get_payload_type rtpenc: Add a payload type private option rtp: Correct ff_rtp_get_payload_type documentation avconv: replace all fprintf() by av_log(). avconv: change av_log verbosity from ERROR to FATAL for fatal errors. cmdutils: replace fprintf() by av_log() avtools: parse loglevel before all the other options. oggdec: add support for Xiph's CELT codec sol: return error if av_get_packet() fails. cosmetics: reindent and pretty-print ... Conflicts: avconv.c cmdutils.c libavcodec/avcodec.h libavcodec/version.h libavformat/oggparsecelt.c libavformat/utils.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: remove misplaced and pointless comment.Clément Bœsch2011-09-22
| |
* | ffprobe: use av_get_pix_fmt_name() instead of accessing av_pix_fmt_descriptors.Clément Bœsch2011-09-22
| |
* | ffprobe: remove media_type_string() by inlining av_x_if_null().Clément Bœsch2011-09-22
| |
* | ffprobe: fix crash with -h.Clément Bœsch2011-09-16
| |
* | 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.