diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 12:06:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 12:06:15 +0100 |
| commit | 40ea3438661e6cc30b60bc019ae01fb073eabb35 (patch) | |
| tree | 618cba03caedda423e3c34f9bd463afcd94f0800 /ffmpeg_opt.c | |
| parent | 174c483e2e751c71ca9ae4e9ca33082bbb1eea56 (diff) | |
| parent | c661cb6672af5ebcb900ec8766b24761bd2ab011 (diff) | |
Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'
* commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011':
cmdutils: pass number of groups to split_commandline().
mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles
Conflicts:
libavcodec/h264_ps.c
libavformat/isom.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index c5e8e62d7c..a57c88515d 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2266,7 +2266,6 @@ enum OptGroup { static const OptionGroupDef groups[] = { [GROUP_OUTFILE] = { "output file", NULL }, [GROUP_INFILE] = { "input file", "i" }, - { 0 }, }; static int open_files(OptionGroupList *l, const char *inout, @@ -2311,7 +2310,8 @@ int ffmpeg_parse_options(int argc, char **argv) memset(&octx, 0, sizeof(octx)); /* split the commandline into an internal representation */ - ret = split_commandline(&octx, argc, argv, options, groups); + ret = split_commandline(&octx, argc, argv, options, groups, + FF_ARRAY_ELEMS(groups)); if (ret < 0) { av_log(NULL, AV_LOG_FATAL, "Error splitting the argument list: "); goto fail; |