[FFmpeg-cvslog] lavf/mux: Don't write "encoder" metadata tag when bitexact is requested

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Dec  6 00:35:35 2013 -0300| [618bdb7f580003012568573b3ce0551a789d2f60] | committer: Michael Niedermayer

lavf/mux: Don't write "encoder" metadata tag when bitexact is requested

Since we don't write lavf's string when bitexact is requested, this will
prevent the tag from being copied from the source stream.

Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/mux.c           |    2 ++
 tests/ref/lavf-fate/ogg_vp3 |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index eff7caa..79625c6 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -339,6 +339,8 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
     /* set muxer identification string */
     if (s->nb_streams && !(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
         av_dict_set(&s->metadata, "encoder", LIBAVFORMAT_IDENT, 0);
+    } else {
+        av_dict_set(&s->metadata, "encoder", NULL, 0);
     }
 
     if (options) {
diff --git a/tests/ref/lavf-fate/ogg_vp3 b/tests/ref/lavf-fate/ogg_vp3
index b77476d..9e9cc7e 100644
--- a/tests/ref/lavf-fate/ogg_vp3
+++ b/tests/ref/lavf-fate/ogg_vp3
@@ -1,3 +1,3 @@
-adbe6c30bdfe934dc5ae397f4db2960d *./tests/data/lavf-fate/lavf.ogg
-417644 ./tests/data/lavf-fate/lavf.ogg
+4bd51dac3194fa88ae33767c25b4b1e6 *./tests/data/lavf-fate/lavf.ogg
+417621 ./tests/data/lavf-fate/lavf.ogg
 ./tests/data/lavf-fate/lavf.ogg CRC=0x037e3e79