summaryrefslogtreecommitdiff
path: root/ffprobe.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-17
|\ | | | | | | | | | | | | | | | | | | | | * qatar/master: pcmenc: set correct bitrate value avprobe: don't print format entry name when only one was requested Conflicts: ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: remove unused variable i in probe_file()Stefano Sabatini2012-05-16
| | | | | | | | | | | | Fix warning: ffprobe.c: In function ‘probe_file’: ffprobe.c:1576:14: warning: unused variable ‘i’ [-Wunused-variable]
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (26 commits) fate: use diff -b in oneline comparison Add missing version bumps and APIchanges/Changelog entries. lavfi: move buffer management function to a separate file. lavfi: move formats-related functions from default.c to formats.c lavfi: move video-related functions to a separate file. fate: make smjpeg a demux test fate: separate sierra-vmd audio and video tests fate: separate smacker audio and video tests libmp3lame: set supported channel layouts. avconv: automatically insert asyncts when -async is used. avconv: add support for audio filters. lavfi: add asyncts filter. lavfi: add aformat filter lavfi: add an audio buffer sink. lavfi: add an audio buffer source. buffersrc: add av_buffersrc_write_frame(). buffersrc: fix invalid read in uninit if the fifo hasn't been allocated lavfi: rename vsrc_buffer.c to buffersrc.c avfiltergraph: reindent lavfi: add channel layout/sample rate negotiation. ... Conflicts: Changelog doc/APIchanges doc/filters.texi ffmpeg.c ffprobe.c libavcodec/libmp3lame.c libavfilter/Makefile libavfilter/af_aformat.c libavfilter/allfilters.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/defaults.c libavfilter/formats.c libavfilter/src_buffer.c libavfilter/version.h libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c libavfilter/vsrc_buffer.h libavutil/avutil.h tests/fate/audio.mak tests/fate/demux.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: add default_writer priv_size.Michael Niedermayer2012-05-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: replace fast_asprintf() with bprint utils.Clément Bœsch2012-05-14
| | | | | | | | Also remove the unused print_fmt_opt() in the process.
* | ffprobe: add "nokey" option to default writerStefano Sabatini2012-05-14
| | | | | | | | Help simplifying parsing in certain cases.
* | ffprobe: add "noprint_wrappers" option to default writerStefano Sabatini2012-05-14
| | | | | | | | | | | | | | The option is useful for simplifying parsing. Also use the new option in fate, in order to fix the regression introduced by the previous commit.
* | ffprobe: simplify/fix logic for the -show_format_entry optionStefano Sabatini2012-05-14
| | | | | | | | | | Do not skip chapter header/footer printing, which breaks the parsing for most writers.
* | ffprobe: remove unused print_format_entry() functionStefano Sabatini2012-05-14
| | | | | | | | The function was introduced in 653d117c, but is not required.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Support 'rtmp_live', an option which specifies if the media is a live stream. av_samples_fill_array: Mark unmodified function argument as const. lagarith: add YUY2 decoding support Support decoding unaligned rgb24 lagarith. dv: Split profile handling code into a separate file. flvenc: use AVFormatContext, not AVCodecContext for logging. mov: Remove write-only variable in mov_read_chan(). fate: Change the probe-format refs to match the final text format committed. fate: Add avprobe as a make dependency Add probe fate tests to test for regressions in detecting media types. fate: Add oneline comparison method qdm2: clip array indices returned by qdm2_get_vlc(). avplay: properly close/reopen AVAudioResampleContext on channel layout change avcodec: do not needlessly set packet size to 0 in avcodec_encode_audio2() avcodec: for audio encoding, reset output packet when it is not valid avcodec: refactor avcodec_encode_audio2() to merge common branches avcodec: remove fallbacks for AVCodec.encode() in avcodec_encode_audio2() Conflicts: ffplay.c libavcodec/Makefile libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/qdm2.c libavcodec/utils.c libavformat/flvenc.c libavformat/mov.c tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libschroedinger: Switch to function names more in line with Libav style. Move code shared between libdirac and libschroedinger to libschroedinger. lavfi: uninline avfilter_copy_buffer_ref_props(). lavf: add missing '*' in a doxy. h264: Remove a commented-out function pointer typedef. txd: Remove write-only variable in txd_decode_frame(). mmvideo.c: Remove unused variable in mm_decode_pal(). build: cosmetics: Add missing end-of-line backslashes to item lists. build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line. libschroedinger: Move a function to avoid a forward declaration. pthread: warn on high thread counts vf_yadif: fix missing error handling for avfilter_poll_frame() avprobe: allow showing only one container/stream property. lavfi: support audio in avfilter_copy_frame_props(). lavfi: avfilter_merge_formats: handle case where inputs are same lavc: add sample rate and channel layout to AVFrame. zerocodec: check if the previous frame is missing doc: clarify check for NULL pointer style Conflicts: doc/APIchanges doc/developer.texi ffprobe.c libavcodec/Makefile libavcodec/avcodec.h libavcodec/libdirac_libschro.c libavcodec/libdirac_libschro.h libavcodec/mmvideo.c libavcodec/txd.c libavcodec/version.h libavcodec/zerocodec.c libavfilter/Makefile libavfilter/avfilter.c libavfilter/version.h libavformat/Makefile libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: do not try to decode empty packets.Nicolas George2012-04-21
| | | | | | | | Fixes sporadic decode failures and trac ticket #997.
* | ffprobe: use avbprint APIStefano Sabatini2012-04-08
| | | | | | | | Simplify, increase robustness.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo_enc: only allocate output packet when we know there will be output Add names for more channel layouts to the channel layout map. sunrast: Add a sample request for RMP_RAW colormap. avcodec: do not override pts or duration from the audio encoder Add prores regression test. Enable already existing rso regression test. Add regression test for "sox" format muxer/demuxer. Add dpx encoding regression test. swscale: K&R formatting cosmetics for PowerPC code (part I/II) img2: Use ff_guess_image2_codec(filename) shorthand where appropriate. Clarify licensing information about files borrowed from libjpeg. Mark mutable static data const where appropriate. avplay: fix -threads option dvbsubdec: avoid undefined signed left shift in RGBA macro mlpdec: use av_log_ask_for_sample() gif: K&R formatting cosmetics png: make .long_name more descriptive movdec: Adjust keyframe flagging in fragmented files rv34: change most "int stride" into "ptrdiff_t stride". Conflicts: avprobe.c ffplay.c libavcodec/mlpdec.c libavcodec/mpegvideo_enc.c libavcodec/pngenc.c libavcodec/x86/v210-init.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vf_settb.c libavformat/img2.c libavutil/audioconvert.c tests/codec-regression.sh tests/lavf-regression.sh tests/ref/lavf/dpx tests/ref/vsynth1/prores tests/ref/vsynth2/prores Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: report bit rate in stream descriptionMatthieu Bouron2012-02-20
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | ffprobe: fix crash if the file can't be opened.Clément Bœsch2012-02-18
| |
* | ffprobe: add count_frames and count_packets optionsMatthieu Bouron2012-02-17
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | ffprobe: fix typo in ESCAPE_CHECK_SIZEStefano Sabatini2012-02-06
| |
* | ffprobe: use av_mpegtc_to_timecode_string().Clément Bœsch2012-02-02
| |
* | ffprobe: increase precision for the shown float valuesStefano Sabatini2012-01-20
| |
* | ffprobe: fix value_string() prefix printing for values with negative logarithmStefano Sabatini2012-01-20
| | | | | | | | | | The index for the binary_unit_prefixes array is expected to be positive, so avoid to use negative indexes for accessing it.
* | ffprobe: reindent after previous commitStefano Sabatini2012-01-20
| |
* | ffprobe: factorize common code in value_string()Stefano Sabatini2012-01-20
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avprobe, cmdutils: K&R formatting cosmetics tests: K&R formatting cosmetics for test programs lavf: free packets for muxers implementing interleave_packet(). lavf: fix and extend av_interleaved_write_frame() doxy. mov: Remove dead stores for spherical coordinates for channel position. error_resilience: K&R formatting cosmetics RELEASE_NOTES: mention hiding private symbols in shared builds. RELEASE_NOTES: mention some notable API changes in 0.8 Conflicts: cmdutils.h doc/RELEASE_NOTES ffprobe.c libavcodec/error_resilience.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: add more safe casts in value_string()Stefano Sabatini2012-01-18
| | | | | | | | Second attempt at fixing ticket #921.
* | ffprobe: use safer type for index variable in value_string()Stefano Sabatini2012-01-18
| | | | | | | | | | | | There is no guarantee that the casted double which is assigned to the variable will be contained in an int (also if it is almost sure for most non-alien architectures).
* | ffprobe: fix printing of unit values which cannot be contained in an intStefano Sabatini2012-01-18
| | | | | | | | | | | | | | | | Use long long int to contain such values instead of an int, which is required to contain at least 64 bits, so it is guaranteed to contain also int64_t values, which are used by some fields. In particular, should fix trac ticket #921.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) utils: Check for extradata size overflows. ARM: rv34: fix asm syntax in dc transform functions avio: Fix the value of the deprecated URL_FLAG_NONBLOCK rv34: fix and optimise frame dependency checking rv34: NEON optimised dc only inverse transform avprobe: use avio_size() instead of deprecated AVFormatContext.file_size. ffmenc: remove references to deprecated AVFormatContext.timestamp. lavf: undeprecate read_seek(). avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY. lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I lavc: ifdef out parse_only AVOption nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT mpegvideo_enc: ifdef out/replace references to deprecated codec flags. riff: remove references to sonic codec ids indeo4: add some missing static and const qualifiers rv34: DC-only inverse transform avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields lavfi: move version macros to a new installed header version.h vsrc_buffer: release the buffer on uninit. rgb2rgb: rgb12tobgr12() ... Conflicts: avconv.c doc/APIchanges ffprobe.c libavfilter/Makefile libavfilter/avfilter.h libswscale/rgb2rgb.c libswscale/rgb2rgb.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: reindent after previous commitStefano Sabatini2012-01-12
| |
* | ffprobe: add support to audio frame information printingStefano Sabatini2012-01-12
| |
* | ffprobe: set AV_LOG_SKIP_REPEATED log flagStefano Sabatini2012-01-12
| | | | | | | | Consistent with ffmpeg and ffplay.
* | ffprobe: fix leak in show_packets()Stefano Sabatini2012-01-12
| | | | | | | | | | | | | | Call av_free_packets() at each demuxing loop iteration, not only when decoding. X-ColaCount: +10l
* | ffprobe: replace av_destruct_packet() with av_free_packet()Stefano Sabatini2012-01-12
| | | | | | | | | | | | | | | | | | av_destruct_packet() always frees the packet data even when the demuxer is going to re-use it, thus causing crashes when decoding audio frames (as implemented in a pending patch). av_free_packet() is used instead, as it allows each demuxer to set the right packet data releasing mechanism through the pkt->destruct callback.
* | ffprobe: use av_toupper() in upcase_string()Stefano Sabatini2012-01-10
| |
* | ffprobe: add compact option to JSON writerStefano Sabatini2012-01-10
| |
* | ffprobe: add -show_program_version and -show_library_versions optionsStefano Sabatini2012-01-10
| |
* | ffprobe: make upcase_string() ignore non-ASCII charactersStefano Sabatini2012-01-10
| | | | | | | | | | This is required as some section names may contain non-ASCII characters (e.g. '_').
* | ffprobe: change formatting logic in the JSON writerStefano Sabatini2012-01-09
| | | | | | | | | | | | | | | | | | Print a "\n" at the end of each section, also print the section name in the section print function, print the chapter name only in case the chapter contains multiple entries. Increase textual output readability - different sections can be distinguished more easily.
* | ffprobe: implement generic reindent logic in the JSON writerStefano Sabatini2012-01-09
| | | | | | | | Clarify/generalize indent logic.
* | ffprobe: use more meaningful names for writer chapter/section header/footer ↵Stefano Sabatini2012-01-08
| | | | | | | | | | | | | | function The passed argument is supposed to be the chapter/section name, rather than the header/footer. Less confusing.
* | ffprobe: use "%*" printf syntax in XML_INDENT() in place of a loopStefano Sabatini2012-01-08
| | | | | | | | | | | | Possibly faster/cleaner. Suggested-By: Clément Bœsch <ubitux@gmail.com>
* | ffprobe: add support to video frame information printingStefano Sabatini2012-01-07
| | | | | | | | | | | | | | | | | | | | Add -show_frames option to ffprobe. Partially based on the work of Thomas Kuehnel <kuehnelth@googlemail.com> for SOCIS 2011. The wicked idea of creating a special "packets_and_frames" container for structured formats (JSON and XML) comes from Clément.
* | ffprobe: move header and trailer print from probe_file() to main()Stefano Sabatini2012-01-07
| | | | | | | | | | Simplify printing from the main() context, in case probe_file() is not called, as required by the pending -show_version option.
* | ffprobe: move writer context registration and initialization in main()Stefano Sabatini2012-01-07
| | | | | | | | | | Simplify pending changes, as the writer context will be used in the main() routine.
* | cmdutils: make show_usage() use av_log()Stefano Sabatini2012-01-07
| | | | | | | | Avoid printing on stdout when show_usage is used in an error message.
* | ffprobe: exit in case generic options are incompatible with strict XML outputStefano Sabatini2012-01-06
| |
* | ffprobe: fix NULL pointer dereference in writer_close()Stefano Sabatini2012-01-06
| | | | | | | | Fix crash.
* | ffprobe: add support to option -show_errorStefano Sabatini2012-01-04
| |
* | ffprobe: remove unused variable in show_format()Stefano Sabatini2012-01-04
| |
* | ffprobe: reindent after the last commitStefano Sabatini2012-01-04
| |