virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
38,029 Commits 37 Branches 400 Tags 460 MiB
d9b3097ba2
Commit Graph

141 Commits

Author SHA1 Message Date
Clément Bœsch
8688e6acba ffprobe: fix crash if the file can't be opened. 2012-02-18 21:35:09 +01:00
Matthieu Bouron
29b9aee49f ffprobe: add count_frames and count_packets options 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-02-17 01:06:43 +01:00
Stefano Sabatini
1ca0812d90 ffprobe: fix typo in ESCAPE_CHECK_SIZE 2012-02-06 11:30:45 +01:00
Clément Bœsch
dc386a5e3c ffprobe: use av_mpegtc_to_timecode_string(). 2012-02-02 14:31:17 +01:00
Stefano Sabatini
23934e5f41 ffprobe: increase precision for the shown float values 2012-01-20 13:27:57 +01:00
Stefano Sabatini
4601ad769d ffprobe: fix value_string() prefix printing for values with negative logarithm 
The index for the binary_unit_prefixes array is expected to be positive,
so avoid to use negative indexes for accessing it.
 2012-01-20 13:27:52 +01:00
Stefano Sabatini
eef4b70450 ffprobe: reindent after previous commit 2012-01-20 13:27:46 +01:00
Stefano Sabatini
58b10b4c7e ffprobe: factorize common code in value_string() 2012-01-20 13:27:41 +01:00
Michael Niedermayer
c130428ab5 Merge remote-tracking branch 'qatar/master' 
* 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>
 2012-01-19 01:19:38 +01:00
Stefano Sabatini
140a9afcf2 ffprobe: add more safe casts in value_string() 
Second attempt at fixing ticket #921.
 2012-01-18 00:44:28 +01:00
Stefano Sabatini
2c8d37c2fb ffprobe: use safer type for index variable in value_string() 
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).
 2012-01-18 00:43:55 +01:00
Stefano Sabatini
54661219c1 ffprobe: fix printing of unit values which cannot be contained in an int 
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.
 2012-01-18 00:01:07 +01:00
Michael Niedermayer
b18e17eabf Merge remote-tracking branch 'qatar/master' 
* 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>
 2012-01-13 01:29:48 +01:00
Stefano Sabatini
bb4c18881a ffprobe: reindent after previous commit 2012-01-12 17:35:17 +01:00
Stefano Sabatini
b25c239c7a ffprobe: add support to audio frame information printing 2012-01-12 17:34:16 +01:00
Stefano Sabatini
58e1de724d ffprobe: set AV_LOG_SKIP_REPEATED log flag 
Consistent with ffmpeg and ffplay.
 2012-01-12 17:34:07 +01:00
Stefano Sabatini
4fd1e2e432 ffprobe: fix leak in show_packets() 
Call av_free_packets() at each demuxing loop iteration, not only when
decoding.

X-ColaCount: +10l
 2012-01-12 10:39:24 +01:00
Stefano Sabatini
7328c2fc21 ffprobe: replace av_destruct_packet() with av_free_packet() 
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.
 2012-01-12 10:39:24 +01:00
Stefano Sabatini
0cc8864687 ffprobe: use av_toupper() in upcase_string() 2012-01-10 22:49:15 +01:00
Stefano Sabatini
93d49cba7f ffprobe: add compact option to JSON writer 2012-01-10 18:24:18 +01:00
Stefano Sabatini
5226be0dd5 ffprobe: add -show_program_version and -show_library_versions options 2012-01-10 18:24:07 +01:00
Stefano Sabatini
d3e435164b ffprobe: make upcase_string() ignore non-ASCII characters 
This is required as some section names may contain non-ASCII characters
(e.g. '_').
 2012-01-10 18:19:31 +01:00
Stefano Sabatini
3b1355bb93 ffprobe: change formatting logic in the JSON writer 
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.
 2012-01-09 13:41:35 +01:00
Stefano Sabatini
48f37b1d21 ffprobe: implement generic reindent logic in the JSON writer 
Clarify/generalize indent logic.
 2012-01-09 13:36:10 +01:00
Stefano Sabatini
5ccdb907c1 ffprobe: use more meaningful names for writer chapter/section header/footer function 
The passed argument is supposed to be the chapter/section name, rather
than the header/footer. Less confusing.
 2012-01-08 11:20:31 +01:00
Stefano Sabatini
ec624d7c5c ffprobe: use "%*" printf syntax in XML_INDENT() in place of a loop 
Possibly faster/cleaner.

Suggested-By: Clément Bœsch <ubitux@gmail.com>
 2012-01-08 11:19:27 +01:00
Stefano Sabatini
9997d41672 ffprobe: add support to video frame information printing 
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.
 2012-01-07 22:26:46 +01:00
Stefano Sabatini
9ecccd6e5a ffprobe: move header and trailer print from probe_file() to main() 
Simplify printing from the main() context, in case probe_file() is not
called, as required by the pending -show_version option.
 2012-01-07 11:08:00 +01:00
Stefano Sabatini
fa7d1c39fd ffprobe: move writer context registration and initialization in main() 
Simplify pending changes, as the writer context will be used in the
main() routine.
 2012-01-07 11:02:13 +01:00
Stefano Sabatini
ceef1ee767 cmdutils: make show_usage() use av_log() 
Avoid printing on stdout when show_usage is used in an error message.
 2012-01-07 11:02:13 +01:00
Stefano Sabatini
c5f4abf698 ffprobe: exit in case generic options are incompatible with strict XML output 2012-01-06 10:43:34 +01:00
Stefano Sabatini
49c207b820 ffprobe: fix NULL pointer dereference in writer_close() 
Fix crash.
 2012-01-06 10:43:34 +01:00
Stefano Sabatini
d6da16dca5 ffprobe: add support to option -show_error 2012-01-04 01:06:28 +01:00
Stefano Sabatini
55ed19bf3b ffprobe: remove unused variable in show_format() 2012-01-04 01:06:11 +01:00
Stefano Sabatini
4c5c0609c1 ffprobe: reindent after the last commit 2012-01-04 01:06:03 +01:00
Stefano Sabatini
90347dabc8 ffprobe: change order of operations in probe_file() 
This is required by a pending patch, also fixes a memleak due to the
writer context not being closed in case of open_input_file() failure.
 2012-01-04 01:05:56 +01:00
Stefano Sabatini
c972f91d5b ffprobe: prefer av_log to fprintf(stderr) 2012-01-04 01:05:51 +01:00
Stefano Sabatini
20ac5849f8 ffprobe: add XML writer 2011-12-27 12:58:24 +01:00
Stefano Sabatini
f1a4182e8e ffprobe: add show_private_data option 2011-12-27 12:58:08 +01:00
Stefano Sabatini
93613338fe ff* tools: move descriptions from copyright header to @file doxy 2011-12-27 12:58:08 +01:00
Michael Niedermayer
452406bd5b ff*: Fix duplicatedly printed version info with -version 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 22:23:12 +01:00
Michael Niedermayer
8bc7fe4daf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doxygen: misc consistency, spelling and wording fixes
  vcr1: drop unnecessary emms_c() calls without MMX code
  Replace all uses of av_close_input_file() with avformat_close_input().
  lavf: add avformat_close_input().
  lavf: deprecate av_close_input_stream().
  lavf doxy: add some basic demuxing documentation.
  lavf doxy: add some general lavf information.
  lavf doxy: add misc utility functions to a group.
  lavf doxy: add av_guess_codec/format to the encoding group.
  lavf doxy: add core functions to a doxy group.
  Add basic libavdevice documentation.
  lavc: convert error_recognition to err_recognition.
  avconv: update -map option help text
  x86: Require 7 registers for the cabac asm
  x86: bswap: remove test for bswap instruction
  bswap: make generic implementation more compiler-friendly
  h264: remove useless cast
  proresdec: fix decode_slice() prototype

Conflicts:
	configure
	doc/APIchanges
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/celp_math.h
	libavcodec/h264.c
	libavfilter/src_movie.c
	libavformat/anm.c
	libavformat/avformat.h
	libavformat/version.h
	libavutil/avstring.h
	libavutil/bswap.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 00:39:48 +01:00
Clément Bœsch
fbe6e29646 ffprobe: print codec timecode if available. 2011-11-28 14:06:02 +01:00
Stefano Sabatini
65f24858ed ffprobe: always print int values with print_val() 
In particular, make the json writer write size values, fix regression
introduced with the addition of the print_val() macro.
 2011-11-25 13:25:56 +01:00
Stefano Sabatini
a7e5679054 ffprobe: make writer_print_integer support long long int values 
This makes possible to use writer_print_integer for printing int64_t
values.
 2011-11-18 10:09:26 +01:00
Clément Bœsch
69a501e6a1 ffprobe: small align cosmetic in json writer struct init. 2011-11-16 19:37:11 +01:00
Clément Bœsch
9813af259a ffprobe: make Writers constant. 2011-11-16 19:35:23 +01:00
Stefano Sabatini
f0db05008d ffprobe: apply misc cosmetics to compact writer definition 2011-11-16 18:40:09 +01:00
Stefano Sabatini
1f0d937f77 ffprobe: add csv writer 2011-11-16 18:40:03 +01:00
Stefano Sabatini
1c43713e57 ffprobe: add compact writer 2011-11-16 00:32:08 +01:00