summaryrefslogtreecommitdiff
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-12-12 18:21:45 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-12-12 18:21:45 +0100
commit7c1c453ce9f0fc71e5c806615d4390d1b9c172d0 (patch)
tree4ba75119cc0efdf5e5841ca4b55fc18f76df4a78 /libavformat/matroskadec.c
parentec11cfdf75d8ad228da6fb159b253a5fc75e8e66 (diff)
lavf/matroskadec: Set codec_tag also for audio codecs.
This was already done for "A_MS/ACM" mkv files and it is done for mov files but was not done for A_QUICKTIME" mkv files.
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r--libavformat/matroskadec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index aad567ac6e..b77e7e8265 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1853,6 +1853,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
if (ret < 0)
return ret;
codec_id = st->codec->codec_id;
+ fourcc = st->codec->codec_tag;
extradata_offset = FFMIN(track->codec_priv.size, 18);
} else if (!strcmp(track->codec_id, "A_QUICKTIME")
&& (track->codec_priv.size >= 86)
@@ -2124,6 +2125,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
}
} else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codec->codec_tag = fourcc;
st->codec->sample_rate = track->audio.out_samplerate;
st->codec->channels = track->audio.channels;
if (!st->codec->bits_per_coded_sample)