summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-11-18 14:28:50 +0200
committerMartin Storsjö <martin@martin.st>2014-11-19 13:37:00 +0200
commit7fd10f66b722eccc2ada9128766d002f6d751f79 (patch)
tree7f5cc8051965db57ac8ae954ca3094565e5418c2
parentf918b8a2933a65020cbe490ec637d5485c11a692 (diff)
hdsenc: Clear the previous codec tag when setting up the chained muxer
The chained flv muxer wants one set of tags - normally this set could be signaled via the AVOutputFormat codec_tag field (as smoothstreamingenc and dashenc do). hdsenc doesn't signal it, since the FLV codec tag arrays aren't exported from flvenc.c. This can lead to the caller keeping an original codec tag from the originating container here, which would then be a mismatch for the FLV muxer. Since we don't really care about what codec tag the caller might have set, just clear it and let the lavf muxer layer set the right one for the chained FLV muxer later instead. Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavformat/hdsenc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/hdsenc.c b/libavformat/hdsenc.c
index 012de60b1f..d96a3d5599 100644
--- a/libavformat/hdsenc.c
+++ b/libavformat/hdsenc.c
@@ -395,6 +395,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;
}