Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-20 03:33:22 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-05-20 04:01:18 +0400
commitbe2bbc5266d18e61fca60e515c3bf256dfdacc47 (patch)
treec9fd1028e13cbda980cffdf6a9d7872ba01b6a86 /ffmpeg_opt.c
parentb2a8bc3d048280c3fc664250af953821a8784c00 (diff)
ffmpeg_opt: dont copy "encoder" metadata unless stream copy is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
-rw-r--r--ffmpeg_opt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 6f45785192..eefd8f00ec 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -2067,6 +2067,8 @@ loop_end:
continue;
ist = input_streams[output_streams[i]->source_index];
av_dict_copy(&output_streams[i]->st->metadata, ist->st->metadata, AV_DICT_DONT_OVERWRITE);
+ if (!output_streams[i]->stream_copy)
+ av_dict_set(&output_streams[i]->st->metadata, "encoder", NULL, 0);
}
/* process manually set metadata */