diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-19 20:29:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-19 20:30:07 +0100 |
| commit | fbb6de2ad774880b5db08df476050e84fe3446bc (patch) | |
| tree | 28e26bd46ec9afbafc59a77994c2e5f7714c6a40 | |
| parent | f3dcabef33249b6e900edd9e601dbac0a8899876 (diff) | |
| parent | 7fd10f66b722eccc2ada9128766d002f6d751f79 (diff) | |
| download | ffmpeg-fbb6de2ad774880b5db08df476050e84fe3446bc.tar.gz | |
Merge commit '7fd10f66b722eccc2ada9128766d002f6d751f79'
* commit '7fd10f66b722eccc2ada9128766d002f6d751f79':
hdsenc: Clear the previous codec tag when setting up the chained muxer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/hdsenc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/hdsenc.c b/libavformat/hdsenc.c index 6ee0e7358d..33d7c3a3a8 100644 --- a/libavformat/hdsenc.c +++ b/libavformat/hdsenc.c @@ -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; } |