diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 00:43:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 00:43:45 +0100 |
| commit | bf2f93cdbf15c96c62b5112c1ab7f8093177e508 (patch) | |
| tree | 02992eb3142695332689898d713bef0653f3aa32 /ffmpeg_opt.c | |
| parent | b473c9937ebe9aafef9d2e07f080fb12ecc53ef4 (diff) | |
| parent | 28c8e288fa0342fdef532a7522a4707bebf831cc (diff) | |
Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'
* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
x86: h264_chromamc: port to cpuflags
yop: fix typo
avconv: fix copying per-stream metadata.
doc: avtools-common-opts: Fix terminology concerning metric prefixes
configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
riff: Make ff_riff_tags static and move under appropriate #ifdef
Conflicts:
libavformat/riff.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 09b4aaf361..612bdc65fb 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -456,9 +456,9 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor METADATA_CHECK_INDEX(index, context->nb_programs, "program")\ meta = &context->programs[index]->metadata;\ break;\ - default: av_assert0(0);\ case 's':\ - break;\ + break; /* handled separately below */ \ + default: av_assert0(0);\ }\ SET_DICT(type_in, meta_in, ic, idx_in); |