diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 14:30:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 14:30:25 +0200 |
| commit | fadfbb354b30f018338c66712bfe5a6b58970b9a (patch) | |
| tree | 1dc56195c0aba61f396cb679788ced1a3229fb6f /ffmpeg_opt.c | |
| parent | d6e87190fd0725f3517493f67dca6f8f264bb370 (diff) | |
| parent | 71e92414bfd79e56ea6fff174a665ff7b9b86e68 (diff) | |
| download | ffmpeg-streaming-fadfbb354b30f018338c66712bfe5a6b58970b9a.zip ffmpeg-streaming-fadfbb354b30f018338c66712bfe5a6b58970b9a.tar.gz | |
Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'
* commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68':
lavf: move RIFF INFO tag writing from avienc to riff
avconv: fix disabling auto mappings with -map_metadata
Conflicts:
ffmpeg_opt.c
libavformat/riff.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 1d0cff2..8a2e480 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -428,6 +428,10 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor if (type_in == 'c' || type_out == 'c') o->metadata_chapters_manual = 1; + /* ic is NULL when just disabling automatic mappings */ + if (!ic) + return 0; + #define METADATA_CHECK_INDEX(index, nb_elems, desc)\ if ((index) < 0 || (index) >= (nb_elems)) {\ av_log(NULL, AV_LOG_FATAL, "Invalid %s index %d while processing metadata maps.\n",\ @@ -1706,7 +1710,9 @@ loop_end: av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d while processing metadata maps\n", in_file_index); exit(1); } - copy_metadata(o->metadata_map[i].specifier, *p ? p + 1 : p, oc, in_file_index >= 0 ? input_files[in_file_index]->ctx : NULL, o); + copy_metadata(o->metadata_map[i].specifier, *p ? p + 1 : p, oc, + in_file_index >= 0 ? + input_files[in_file_index]->ctx : NULL, o); } /* copy chapters */ |
