Merge commit '7fd10f66b722eccc2ada9128766d002f6d751f79'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Nov 2014 19:29:05 +0000 (20:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Nov 2014 19:30:07 +0000 (20:30 +0100)
* commit '7fd10f66b722eccc2ada9128766d002f6d751f79':
  hdsenc: Clear the previous codec tag when setting up the chained muxer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/hdsenc.c

index 6ee0e73..33d7c3a 100644 (file)
@@ -396,6 +396,7 @@ static int hds_write_header(AVFormatContext *s)
             goto fail;
         }
         avcodec_copy_context(st->codec, s->streams[i]->codec);
+        st->codec->codec_tag = 0;
         st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
         st->time_base = s->streams[i]->time_base;
     }