highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  fate: Add FATE tests for the Ut Video encoder
  lavc: add Ut Video encoder
  mpegvideo_enc: remove stray duplicate line from 7f9aaa4
  swscale: x86: fix #endif comments in rgb2rgb template file
  avconv: mark more options as expert.
  avconv: split printing "main options" into global and per-file.
  avconv: refactor help printing.

Conflicts:
	Changelog
	ffmpeg_opt.c
	ffserver.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-08-20 17:15:15 +02:00
parent aee51039ee b96509c93c
commit bb3ed3bae6
28 changed files with 1612 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmdutils.c
View File

@ -142,7 +142,7 @@ int64_t parse_time_or_die(const char *context, const char *timestr,
}
void show_help_options(const OptionDef *options, const char *msg, int req_flags,
int rej_flags)
int rej_flags, int alt_flags)
{
const OptionDef *po;
int first;
@ -152,6 +152,7 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,
char buf[64];
if (((po->flags & req_flags) != req_flags) ||
(alt_flags && !(po->flags & alt_flags)) ||
(po->flags & rej_flags))
continue;