diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-01 13:25:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-01 13:25:46 +0100 |
| commit | 7fd9d49ba7fa57629592b1f7064cb12d96984a14 (patch) | |
| tree | 5e28214b75e917193be3699941069c9bbb43ece4 /ffmpeg_opt.c | |
| parent | add7513e64e6db255e30fba544068ed2ab5e7b3e (diff) | |
| parent | 6b07830a77729fe25c30026feabd53e8c4c5eb9e (diff) | |
| download | ffmpeg-7fd9d49ba7fa57629592b1f7064cb12d96984a14.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV
avconv_opt, cmdutils: Add missing function parameter Doxygen
x86: Move optimization suffix to end of function names
Conflicts:
cmdutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index f4067c0415..adf40f2b32 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -368,6 +368,7 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg) /** * Parse a metadata specifier passed as 'arg' parameter. + * @param arg metadata string to parse * @param type metadata type is written here -- g(lobal)/s(tream)/c(hapter)/p(rogram) * @param index for type c/p, chapter/program index is written here * @param stream_spec for type s, the stream specifier is written here |