1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

329 Commits

Author SHA1 Message Date
Hendrik Leppkes
3bf142c773 cmdutils: remove the current working directory from the DLL search path on win32
Reviewed-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-08 18:36:55 +02:00
Dmitry Vagin
dc151d138c ffprobe: add missing PROGRAM_STREAM_TAGS case
ffprobe did not show tags with only '-show_entries programs'

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-07-26 19:22:47 +02:00
Clément Bœsch
c8550e8244 ffprobe: print stereo3d information
Based on 8e757716c6

See https://github.com/mpv-player/mpv/issues/1045 for mk3d
elektranox.org samples.
2016-06-23 13:48:14 +02:00
Clément Bœsch
ccf942a0c2 ffprobe: refactor pkt side data printing 2016-06-23 13:48:14 +02:00
Derek Buitenhuis
e8373143e1 ffprobe: Don't try and decode things that have no dec_ctx
The last instance of a missing dec_ctx check from the merge.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-12 17:24:07 +01:00
Derek Buitenhuis
9cb1ed5735 ffprobe: Fix missing dec_ctx check
Missed it during the merge of ffprobe codecpar conversion.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-12 16:50:01 +01:00
Derek Buitenhuis
9080dc7f07 Merge commit 'ba357e98691ee4fe1a503b8830c0050be4127475'
* commit 'ba357e98691ee4fe1a503b8830c0050be4127475':
  avprobe: switch to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-12 15:38:03 +01:00
Derek Buitenhuis
48fb5294d0 Merge commit '567d6d5f9d1400f00445183b3477391f58979aa3'
* commit '567d6d5f9d1400f00445183b3477391f58979aa3':
  avprobe: add local per-stream state

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-11 16:46:30 +01:00
Derek Buitenhuis
9d48aa6d7d Merge commit 'c9478410c68c04261f9cfcd80474607e50bd1852'
* commit 'c9478410c68c04261f9cfcd80474607e50bd1852':
  avprobe: add local per-file state

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-11 16:33:13 +01:00
Derek Buitenhuis
6614214ece Merge commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7'
* commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7':
  avprobe: print information from the codec descriptor

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-11 16:01:22 +01:00
Derek Buitenhuis
80195236c8 Merge commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd'
* commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd':
  avprobe: remove a pointless condition and a dead branch

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-11 15:30:55 +01:00
Derek Buitenhuis
b62825a480 ffprobe: Deprecate stream timecode field and add frame side data timecode field
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-01 18:19:30 +00:00
Ganesh Ajjanagadde
4a44bc5588 ffprobe: avoid unnecessary pow and exp2 calls
These are just for prefixes and may be hardcoded easily; see lavu/eval
for this approach.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-12-29 08:59:16 -08:00
Stefano Sabatini
91c2a33d01 ffprobe: use print_val to print the frame pkt_size value
This allows to honour formatting options.
2015-12-16 18:59:23 +01:00
Timothy Gu
9670165cc2 ffprobe: Do not print profile names in -bitexact
Instead, print "unknown" if it's unknown, or their numerical values if
they are known.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-06 14:37:40 +01:00
Marton Balint
d9611864c2 ffprobe: add support for printing packet strings metadata as packet tags
ffprobe.xsd already contains the tag element.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-30 20:47:43 +01:00
Michael Niedermayer
057ce755b9 ffprobe: Remove abort()
Found-by: Ganesh Ajjanagadde and wm4
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-28 10:12:15 +01:00
Hendrik Leppkes
fe3c22e0c0 Merge commit 'f0ca6ffa0ae5d5564516ee7a18aa1e234751444a'
* commit 'f0ca6ffa0ae5d5564516ee7a18aa1e234751444a':
  avprobe: Unref the packet once it is used

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-27 14:10:04 +01:00
Ganesh Ajjanagadde
38f4e973ef all: fix -Wextra-semi reported on clang
This fixes extra semicolons that clang 3.7 on GNU/Linux warns about.
These were trigggered when built under -Wpedantic, which essentially
checks for strict ISO compliance in numerous ways.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-24 17:58:17 -04:00
Clément Bœsch
306ff40988 ffprobe: use AV_OPT_TYPE_BOOL for writers options 2015-09-12 17:50:22 +02:00
Hendrik Leppkes
5d8e836d0e Replace all remaining occurances of step/depth_minus1 and offset_plus1 2015-09-08 17:10:48 +02:00
Michael Niedermayer
a75d22445e ffprobe: check av_asprintf() for failure
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-13 01:45:27 +02:00
Dave Rice
09ec31ce3a ffprobe: print stream_index with frame data
This makes it easier to relate frame data to its associated stream.
2015-05-27 11:19:19 +02:00
Michael Niedermayer
5f0ebe865c ffprobe: Use av_packet_side_data_name() to find the side data name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 21:20:26 +02:00
Michael Niedermayer
a72b61a317 ffprobe: support printing AVStream and AVPacket side data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-03 00:53:19 +02:00
Michael Niedermayer
08152f2df2 ffprobe: Add Support to print information about AV_FRAME_DATA_DISPLAYMATRIX
Idea from 709e1c91ea by Martin Storsjö
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-03 00:39:47 +02:00
Michael Niedermayer
2a3270b66c ffprobe: add writer_print_integers() to allow printing formated 1d and 2d arrays of integers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-03 00:38:52 +02:00
Michael Niedermayer
fa14685a57 Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'
* commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f':
  avprobe: Export coded_{width,height} in -show_streams

Conflicts:
	avprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-08 23:58:18 +01:00
Michael Niedermayer
fd8c3277c4 ffprobe: Change string_validation to int, its accessed via AVOption as int
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-02 04:06:39 +01:00
Michael Niedermayer
6998400c61 Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'
* commit 'bf704132a51f5d838365158331d4e535e1df4c8e':
  Don't anonymously typedef structs

Conflicts:
	avprobe.c
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 21:27:44 +01:00
Andreas Cadhalpun
103e4c5863 stop embedding the build date
Theis makes the build binary reproducible.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 05:04:14 +01:00
Michael Niedermayer
47111d366d ffprobe: fix memleaks on errors
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-21 13:51:26 +01:00
Michael Niedermayer
eee9b7a673 ffprobe: Support extracting the number of reference frames
Fixes Ticket3141

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 17:55:20 +01:00
Carl Eugen Hoyos
e971eef8c0 Set -scan_all_pmts 1 in ffmpeg, ffplay and ffprobe if not set by user.
Fixes ticket #3762.
2014-11-09 18:28:29 +01:00
Michael Niedermayer
f63d381387 ffprobe: Add support for color_trc/color_pri/chroma_loc
Idea from: a2c00d22e7
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 20:15:37 +02:00
Michael Niedermayer
19b4c0ccf9 ffprobe: Simplify by using av_color_range_name()
Idea from: a2c00d22e7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-10 04:24:55 +02:00
Tobias Rapp
1acc9189b4 ffprobe: add pixel format chroma sub-sampling output
Adds output of chroma sub-sampling information to
ffprobe -show_pixel_formats option.

Note: This patch just prints the "raw" log2_charoma_w/h values instead
of the previously suggested mapping into a chroma sub-sampling pattern
string like "4:2:2".

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-07 23:18:15 +02:00
Tobias Rapp
7d327d6242 ffprobe: add pixel format component bit depth output
Adds output of bit depth per pixel format component to
ffprobe -show_pixel_formats option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-07 23:18:15 +02:00
Tobias Rapp
b36b2c89df ffprobe: add pixel format flags output
Adds output of pixel format flags to ffprobe -show_pixel_formats option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-07 23:18:15 +02:00
Tobias Rapp
143a8a44f4 ffprobe: add -show_pixel_formats option
Adds option -show_pixel_formats to ffprobe which lists all
available pixel formats with some details.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-07 23:18:15 +02:00
Carl Eugen Hoyos
42b4da75b7 Print bits_per_raw_sample for ffprobe -show_streams.
Fixes ticket #3919.
2014-09-08 17:49:20 +02:00
Nicolas George
4f3e2f107b ffprobe: add -show_data_hash option. 2014-08-17 11:30:55 +02:00
Michael Niedermayer
547d64a49a ffprobe: print some basic information about avframe side data
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-30 19:23:08 +02:00
Tobias Rapp
f6e772f9b5 ffprobe: add color_range and color_space to stream output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24 00:35:16 +02:00
Billy Shambrook
3c2d9f86c7 ffprobe: add rc_max_rate to stream output
The value is used by some bitstream to mark the maximum bit rate.

See thread:
Subject: [FFmpeg-devel] [PATCH] Add rc_max_rate to ffprobe stream output
Date: Sun,  1 Jun 2014 17:36:36 +0100
To: ffmpeg-devel@ffmpeg.org

http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/178461

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-06-09 23:19:33 +02:00
Michael Niedermayer
f0211f4189 ffprobe: Use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-21 15:59:22 +02:00
Anshul
73a6063314 ffprobe: fix crash happening because of new streams occuring
Fix trac ticket #3603.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-05-18 20:04:02 +02:00
Nicolas George
43ca94a633 ffprobe: use the codec descriptor if no decoder was found. 2014-04-29 13:25:59 +02:00
Stefano Sabatini
1ba59b1cbe ffprobe: fix scaling of vali in value_string() in case -prefix is selected
Fix trac ticket #3523.
2014-04-23 10:32:42 +02:00
Michael Niedermayer
ca6dd53a73 ffprobe: do not lose non ascii characters in non utf8 strings
Fixes Ticket3363

Using U+FFFD REPLACEMENT CHARACTER as suggested by nicolas

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-13 15:21:20 +02:00