eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 02:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf'

Browse Source 
* commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf':
  avconv: get rid of ugly casts in the options table.
  avconv: try to match codecs by codec descriptor name as a last resort.
  avtools: fix show_foo() signatures.

Conflicts:
	cmdutils.c
	cmdutils.h
	cmdutils_common_opts.h
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-08-20 15:48:21 +02:00
parent a5a0dedf11 d3810c47fe
commit 927022a753
7 changed files with 134 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmdutils.h
View File

@@ -277,21 +277,21 @@ void show_banner(int argc, char **argv, const OptionDef *options);
* libraries.
* This option processing function does not utilize the arguments.
*/
int opt_version(const char *opt, const char *arg);
int show_version(const char *opt, const char *arg);
/**
* Print the license of the program to stdout. The license depends on
* the license of the libraries compiled into the program.
* This option processing function does not utilize the arguments.
*/
int opt_license(const char *opt, const char *arg);
int show_license(const char *opt, const char *arg);
/**
* Print a listing containing all the formats supported by the
* program.
* This option processing function does not utilize the arguments.
*/
int opt_formats(const char *opt, const char *arg);
int show_formats(const char *opt, const char *arg);
/**
* Print a listing containing all the codecs supported by the
@@ -317,28 +317,28 @@ int show_encoders(const char *opt, const char *arg);
* program.
* This option processing function does not utilize the arguments.
*/
int opt_filters(const char *opt, const char *arg);
int show_filters(const char *opt, const char *arg);
/**
* Print a listing containing all the bit stream filters supported by the
* program.
* This option processing function does not utilize the arguments.
*/
int opt_bsfs(const char *opt, const char *arg);
int show_bsfs(const char *opt, const char *arg);
/**
* Print a listing containing all the protocols supported by the
* program.
* This option processing function does not utilize the arguments.
*/
int opt_protocols(const char *opt, const char *arg);
int show_protocols(const char *opt, const char *arg);
/**
* Print a listing containing all the pixel formats supported by the
* program.
* This option processing function does not utilize the arguments.
*/
int opt_pix_fmts(const char *opt, const char *arg);
int show_pix_fmts(const char *opt, const char *arg);
/**
* Print a listing containing all the sample formats supported by the