From 618bdb7f580003012568573b3ce0551a789d2f60 Mon Sep 17 00:00:00 2001 From: James Almer Date: Fri, 6 Dec 2013 00:35:35 -0300 Subject: [PATCH] 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 Signed-off-by: Michael Niedermayer --- 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 eff7caab25..79625c6547 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 b77476d294..9e9cc7ea6b 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