diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 15:06:15 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 15:06:15 +0400 |
| commit | 40ea3438661e6cc30b60bc019ae01fb073eabb35 (patch) | |
| tree | 618cba03caedda423e3c34f9bd463afcd94f0800 /cmdutils.h | |
| 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 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdutils.h b/cmdutils.h index 43cb6a09d9..f193132f09 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -305,7 +305,7 @@ int parse_optgroup(void *optctx, OptionGroup *g); */ int split_commandline(OptionParseContext *octx, int argc, char *argv[], const OptionDef *options, - const OptionGroupDef *groups); + const OptionGroupDef *groups, int nb_groups); /** * Free all allocated memory in an OptionParseContext. |