generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
60,431 Commits 24 Branches 241 Tags
c72f587353d9f88c7fbbbf6ef78b1d9ba3d38fd7
Commit Graph

279 Commits

Author SHA1 Message Date
Nicolas George
a55692a960 ffprobe: check av_frame_alloc() failure. 2013-12-30 10:58:01 +01:00
Michael Niedermayer
565f786d1d ffprobe: Dont clear AVFrame between uses. 
The old API required this clearing in the past, the new API does not
require it.

Fixes memleak
Regression introduced by 37a749012a

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-25 20:53:37 +01:00
Michael Niedermayer
bf1c87ee7a ffprobe: drop dependancy on sizeof(AVFrame) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-17 17:11:00 +01:00
wm4
5f6c21117f ffprobe: show best_effort_timestamp in the frame section 
This is useful for debugging.

Reference and ffprobe.xsd changes done and tested by Stefano Sabatini.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-12-15 10:46:46 +01:00
Stefano Sabatini
66a703ea01 ffprobe: only show tags when explicitly requested 2013-12-14 13:22:04 +01:00
Stefano Sabatini
65a3429e7a ffprobe: add cosmetical empty line 2013-12-13 09:42:15 +01:00
Stefano Sabatini
704cc5e75d ffprobe: free shared writer context on exit 
Fix leak.

Spotted-by: Michael Niedermayer
 2013-12-03 21:27:14 +01:00
Timothy Gu
82b2e9cb1d build: rename version.h to libavutil/ffversion.h 
Also the libavutil/ffversion.h will be installed.

Rationale:
* Applications might want to know FFmpeg's version besides the individual
  libraries'.
* Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when
  a library source file includes both and is compiled on an out-of-tree build.

Fixes #1769.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-30 21:42:55 +01:00
Michael Niedermayer
0075a22f41 Revert "configure: add #include "version.h" to config.h" 
This reverts commit ca21116b3f.

Revert suggested by Jamal:
"Bad secondary effect i just noticed: Every time version.h is changed
 (git pull for example), anything that includes config.h will be
 recompiled. And that means pretty much every single file in the tree.
"
 2013-11-28 00:19:45 +01:00
Timothy Gu
ca21116b3f configure: add #include "version.h" to config.h 
Avoid clash with version.h of the libraries.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-27 23:06:13 +01:00
Stefano Sabatini
8bf7ea8ac2 cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead 
Simplify.
 2013-11-26 10:03:32 +01:00
Marton Balint
a02860351d ffprobe: add support for subtitle frames 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-11-25 19:51:27 +01:00
Paul B Mahol
638d79a9d0 ffprobe: use designated initializer for AVClass 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-23 22:23:52 +00:00
Stefano Sabatini
d20241c9b1 ffprobe: remove various useless "," 
Nitted-By: ubitux
 2013-11-22 16:58:24 +01:00
Stefano Sabatini
cbba331aa0 ffprobe: implement string validation setting 
This should fix trac tickets #1163, #2502.
 2013-11-22 16:51:56 +01:00
Stefano Sabatini
11cba3ba9d ffprobe: add support for nested options in writer contexts 2013-11-22 16:51:19 +01:00
Stefano Sabatini
e87190f5d2 ffprobe: check for errors, and abort immediately 
This allows to make use of validation features.
 2013-11-22 16:51:12 +01:00
Stefano Sabatini
ddaf33f5bb ffprobe: fix consistency checks in parse_read_intervals() 
Move array size assert after the count increment, and avoid strchr() NULL
dereference on p.

Should fix FFmpeg coverity issue #1108581.
 2013-10-21 13:33:06 +02:00
Stefano Sabatini
f5b27b6d5f ffprobe: print stream channel_layout when available 
Fix trac ticket #3006.
 2013-10-03 09:19:38 +02:00
Stefano Sabatini
7bac6e5cf8 ffprobe: fix uninitialized variable warning 
Fix warning:
ffprobe.c:1684:21: warning: ‘start’ may be used uninitialized in this function [-Wmaybe-uninitialized] end = start + interval->end;

The warning is a false positive, since the variable is accessed only if
has_start is set, and in that case start has been already set.
 2013-09-23 14:16:34 +02:00
Stefano Sabatini
f0606a28de ffprobe: add -read_intervals option 
This is also useful to test seeking on an input file.

This also addresses trac ticket #1437.
 2013-09-19 10:10:30 +02:00
Stefano Sabatini
5d12ec8fb7 ffprobe: downgrade log level for non fatal errors in open_input_file() 
Since the errors are not fatal, it is less confusing not to show them as
errors but as warnings.

Arbitrarily fixes trac ticket #2419.
 2013-09-17 15:59:48 +02:00
Nicolas George
83635ac67b ffprobe: show bitmap subtitles size. 
Fix trac ticket #2930.
 2013-09-04 16:36:28 +02:00
Stefano Sabatini
291ad12ea2 ffprobe: show probe_score in the format section 
Should address trac ticket #2621.
 2013-09-01 11:34:18 +02:00
Florent Tribouilloy
2186a7e547 ffprobe: add -show_programs option 
The option is used to sort the streams by program.

Signed-off-by: Florent Tribouilloy <florent.tribouilloy@smartjog.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-07-28 16:39:06 +02:00
Stefano Sabatini
2fcd400669 ffprobe: do not treat array elements as nested in the compact writer 
This fixes rendering of sections containing nested elements followed by
an array, for example as in the case:
programs->streams->stream

enabled by the -show_programs option.
 2013-07-28 16:38:50 +02:00
Michael Niedermayer
f982d006bb Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 
* commit '636ced8e1dc8248a1353b416240b93d70ad03edb':
  cmdutils: wrap exit explicitly

Conflicts:
	avprobe.c
	cmdutils.c
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 04:34:11 +02:00
Stefano Sabatini
5c616fe48b ffprobe: always exit 1 in case of errors 
This is consistent with the other ff* tools, and also avoids spurious
success reports when ret%256 = 0.
 2013-06-27 00:20:36 +02:00
Stefano Sabatini
1fc626f8d0 ffprobe: reindent after previous commit 2013-06-27 00:20:28 +02:00
Nicolas George
a334b00cf6 ffprobe: fix exit code with stream specifiers 
Without this fix, ffprobe would exit with a failure exit code if a stream
specifier is given that selects the last stream.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
 2013-06-27 00:20:20 +02:00
Stefano Sabatini
205092bf47 ffprobe: simplify branching logic in probe_file() 2013-06-27 00:20:11 +02:00
Stefano Sabatini
4da5402256 ffprobe: show chapter and chapter metadata information 
Address trac ticket #2636.
 2013-06-06 16:49:53 +02:00
Stefano Sabatini
e292d75113 ffprobe: set writer context to 0 after allocation 
Avoid access to uninitialized values, which may result in a crash.

This happens for example in case of option parsing failure, since in that
case the internal AVBprint buffers are not initialized.
 2013-03-19 18:00:34 +01:00
Stefano Sabatini
f7ab23b0d0 ffprobe: remove deprecated frame "reference" field 2013-03-17 00:27:48 +01:00
Stefano Sabatini
1019cef329 ffprobe: support codec options 
Make ffprobe honour codec options, and support stream specifiers like it
is done in ffplay.

In particular, address Trac ticket #1859.
 2013-03-13 00:34:36 +01:00
Michael Niedermayer
3ded235f59 ffprobe: use AVFrame accessor functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 23:18:22 +01:00
Clément Bœsch
d079d1d368 ffprobe: do not escape '"' between single quotes. 2013-01-01 13:32:51 +01:00
Stefano Sabatini
1a490df12f ffprobe: show pkt_size in frame 
Fix trac ticket #2027.
 2012-12-15 11:46:47 +01:00
Stefano Sabatini
9a7256e8e0 ffprobe: free dictionary in opt_show_entries() 
Fix memleak.
 2012-11-23 18:49:26 +01:00
Stefano Sabatini
c8a5365dcf ffprobe: implement -sections option 2012-11-22 14:19:29 +01:00
Stefano Sabatini
196765a7cc ffprobe: implement subsection field selection through the -show_entries option 2012-11-22 14:19:25 +01:00
Stefano Sabatini
64dc383de5 ffprobe: fix typo in a comment 2012-11-21 20:17:57 +01:00
Stefano Sabatini
6ca9c74cc6 ffprobe: add "," at the end of enum list 2012-11-21 20:17:57 +01:00
Stefano Sabatini
29d46d7bce ffprobe: fix potential NULL pointer dereference 
Found by Coverity, should fix CID 733741.
 2012-11-06 22:59:24 +01:00
Stefano Sabatini
a945607a78 ffprobe: add an array of section print buffers to the WriterContext 
Allow to factorize buffers initialization/release, for all the writers
which use it. Simplify.
 2012-10-24 23:40:21 +02:00
Michael Niedermayer
4334ba043e ffprobe: fix use of uninitialized pointer in av_strtok() 
Fixes CID733837
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 03:37:43 +02:00
Stefano Sabatini
531872d763 ffprobe: reindent after previous commit 2012-10-05 23:58:23 +02:00
Stefano Sabatini
3d189d41c1 ffprobe: add -select_streams option 2012-10-05 23:58:18 +02:00
Michael Niedermayer
8f0168a3b9 fix exit_program() prototypes 
This fixes 2 warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-02 21:55:31 +02:00
Michael Niedermayer
032ba74ed2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ARM: fix Thumb PIC on Apple
  nut: add do {} while (0) to GET_V
  tiffenc: Check av_malloc() results.
  tiffenc: Simplify pixel format setup using AVPixFmtDescriptor.
  Use atexit() instead of defining a custom exit_program() interface.
  msvc: Fix detection of VFW & Avisynth required libs

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c
	ffserver.c
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-02 19:48:54 +02:00