[FFmpeg-cvslog] ffmpeg_opt: dont copy "encoder" metadata unless stream copy is used

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 20 01:33:22 2014 +0200| [be2bbc5266d18e61fca60e515c3bf256dfdacc47] | committer: Michael Niedermayer

ffmpeg_opt: dont copy "encoder" metadata unless stream copy is used

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be2bbc5266d18e61fca60e515c3bf256dfdacc47
---

 ffmpeg_opt.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 6f45785..eefd8f0 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 */