highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions 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

17
cmdutils.c
View File

@ -674,14 +674,16 @@ void show_banner(int argc, char **argv, const OptionDef *options)
print_all_libs_info(INDENT|SHOW_VERSION, AV_LOG_INFO);
}
int opt_version(const char *opt, const char *arg) {
int show_version(const char *opt, const char *arg)
{
av_log_set_callback(log_callback_help);
print_program_info (0 , AV_LOG_INFO);
print_all_libs_info(SHOW_VERSION, AV_LOG_INFO);
return 0;
}
int opt_license(const char *opt, const char *arg)
int show_license(const char *opt, const char *arg)
{
printf(
#if CONFIG_NONFREE
@ -748,10 +750,11 @@ int opt_license(const char *opt, const char *arg)
program_name, program_name, program_name
#endif
);
return 0;
}
int opt_formats(const char *opt, const char *arg)
int show_formats(const char *opt, const char *arg)
{
AVInputFormat *ifmt = NULL;
AVOutputFormat *ofmt = NULL;
@ -925,7 +928,7 @@ int show_encoders(const char *opt, const char *arg)
return 0;
}
int opt_bsfs(const char *opt, const char *arg)
int show_bsfs(const char *opt, const char *arg)
{
AVBitStreamFilter *bsf = NULL;
@ -936,7 +939,7 @@ int opt_bsfs(const char *opt, const char *arg)
return 0;
}
int opt_protocols(const char *opt, const char *arg)
int show_protocols(const char *opt, const char *arg)
{
void *opaque = NULL;
const char *name;
@ -951,7 +954,7 @@ int opt_protocols(const char *opt, const char *arg)
return 0;
}
int opt_filters(const char *opt, const char *arg)
int show_filters(const char *opt, const char *arg)
{
AVFilter av_unused(**filter) = NULL;
char descr[64], *descr_cur;
@ -983,7 +986,7 @@ int opt_filters(const char *opt, const char *arg)
return 0;
}
int opt_pix_fmts(const char *opt, const char *arg)
int show_pix_fmts(const char *opt, const char *arg)
{
enum PixelFormat pix_fmt;