diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:00:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:01:39 +0200 |
| commit | b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2 (patch) | |
| tree | 519a70950e58fd451aad4bffb53b987a2482068a /ffmpeg_opt.c | |
| parent | d6c342fdc0b434b514f99e1feaa108ab17bba806 (diff) | |
| parent | bc4620e5d61a4dd9a1f654fadd281a172aab04be (diff) | |
| download | ffmpeg-b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2.tar.gz | |
Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'
* commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be':
Remove libmpeg2 #define remnants
De-doxygenize some top-level files
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index fba7cb4f0b..fefb785945 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -367,7 +367,7 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg) } /** - * Parse a metadata specifier in arg. + * Parse a metadata specifier passed as 'arg' parameter. * @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 @@ -541,10 +541,8 @@ static AVCodec *choose_decoder(OptionsContext *o, AVFormatContext *s, AVStream * return avcodec_find_decoder(st->codec->codec_id); } -/** - * Add all the streams from the given input file to the global - * list of input streams. - */ +/* Add all the streams from the given input file to the global + * list of input streams. */ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) { int i; |