RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
34,269 Commits 37 Branches 400 Tags 280 MiB
Commit Graph

18 Commits

Author SHA1 Message Date
Stefano Sabatini cb50ada4f8 ffprobe: parse arguments for -print_format writer 
This allows -print_format to accept string of the form WRITER=OPTIONS,
as required by the pending compact writer patch.
 2011-10-09 16:03:13 +02:00
Stefano Sabatini 9806dda8a8 ffprobe: create a dedicated "Writers" section in the manual 
Also update documentation related to the output format.
 2011-10-09 16:03:01 +02:00
Clément Bœsch 3fdf519e4b ffprobe: add JSON output printing format. 2011-09-13 23:03:05 +02:00
Michael Niedermayer 411cc5c46a Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  audioconvert: add explanatory comments to channel_names array
  audioconvert: K&R whitespace cosmetics
  avconv: use correct index when selecting metadata to write to.
  avconv: fix inverted variable
  doc/avconv: document option types (input/output/per-stream/...)
  doc/avtools-common-opts: write a section about stream specifiers.
  doc/avconv: remove two pointless paragraphs.
  doc/avconv: document that global options should be specified first.
  doc/avconv: remove entries for nonexistent options
  doc/avconv: remove documentation for removed 'timestamp' option
  doc: cosmetics, rename fftools-common-opts to avtools-....
  avconv: move streamid_map to options context.
  avconv: extend -vf syntax
  avconv: move top_field_first to options context.
  avconv: move inter/intra matrix to options context.
  avconv: remove -psnr option.
  avconv: remove me_threshold option.
  avconv: move video_rc_override_string to options context.
  avconv: move frame pixel format to the options context.
  avconv: move frame aspect ratio to the options context.
  ...

Conflicts:
	avconv.c
	cmdutils_common_opts.h
	doc/avconv.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 00:32:54 +02:00
Anton Khirnov 9e12f0bf5f Rename ffprobe to avprobe. 2011-08-09 19:56:24 +02:00
Anton Khirnov 266463daff Rename ffplay to avplay. 2011-08-09 19:56:21 +02:00
Stefano Sabatini cea87fb2c3 ffprobe: implement -i FILE option 
Useful for mimicking the ffmpeg -i FILE syntax.
 2011-06-05 13:31:47 +02:00
Stefano Sabatini 5e45f03420 doc: add decoders.texi file 2011-05-20 10:00:00 +02:00
Stefano Sabatini 1e31ea71ff ffprobe.texi: remove inclusion of muxers section 
Muxers are not used by ffprobe.
 2011-05-20 09:34:57 +02:00
Michael Niedermayer 7b376b398a Merge remote branch 'qatar/master' 
* qatar/master:
  Handle unicode file names on windows
  rtp: Rename the open/close functions to alloc/free
  Lowercase all ff* program names.
  Refer to ff* tools by their lowercase names.
NOT Pulled  Replace more FFmpeg instances by Libav or ffmpeg.
  Replace `` by $() syntax in shell scripts.
  patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled  Remove stray libavcore and _g binary references.
  vorbis: Rename decoder/encoder files to follow general file naming scheme.
  aacenc: Fix whitespace after last commit.
  cook: Fix small typo in av_log_ask_for_sample message.
  aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
  Remove RDFT dependency from AAC decoder.
  Add some debug log messages to AAC extradata
  Fix mov debug (u)int64_t format strings.
  bswap: use native types for av_bwap16().
  doc: FLV muxing is supported.
  applehttp: Handle AES-128 encrypted streams
  Add a protocol handler for AES CBC decryption with PKCS7 padding
  doc: Mention that DragonFly BSD requires __BSD_VISIBLE set

Conflicts:
	ffplay.c
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-24 03:41:22 +02:00
Diego Biurrun 89b503b55f Lowercase all ff* program names. 2011-04-23 19:12:24 +02:00
Diego Biurrun 3a50894eaa Refer to ff* tools by their lowercase names. 2011-04-23 19:12:23 +02:00
Michael Niedermayer a6be21d3ba Revert "replace FFmpeg with Libav in doc/" 
This reverts commit f8a45fa1b1.

Conflicts:

	doc/optimization.txt
 2011-03-17 17:26:45 +01:00
Janne Grunau f8a45fa1b1 replace FFmpeg with Libav in doc/ 
unless it stands for ffmpeg the program or is historic
 2011-03-16 22:01:01 +01:00
Janne Grunau a8f0814a74 doc: modify style for texi2html 1.78+ 
The generated HTML files are similar to the ones generated with
texi2html 1.56k used on the website.

Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended
version.

The removed @sp from the titlepage section were ignored until
texi2html 5.0. If not removed the pages generated by 5.0 will have ugly
empty space around the title.
 2011-01-29 16:57:29 +01:00
Stefano Sabatini 85466e1e5f Add muxers.texi file. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 17:46:55 +01:00
Stefano Sabatini ef298ea7ac Add demuxers.texi file. 
Originally committed as revision 26282 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 10:22:21 +00:00
Stefano Sabatini 82ccbe6b27 Simplify texi files naming: ff*-doc.texi -> ff*.texi. 
Originally committed as revision 26006 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 18:38:37 +00:00