aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2013-03-21 08:03:58 -0400
committerReinhard Tartler <siretart@tauware.de>2013-03-31 10:38:20 +0200
commitaba56c03b9558b80bd601bc58088a43c9b791ed1 (patch)
treea8a7b978dbf5f736126cc58a235c93b46ffcd963
parent2e06758479650f6e2a8820c7105f2d193a701175 (diff)
downloadffmpeg-aba56c03b9558b80bd601bc58088a43c9b791ed1.tar.gz
flvdec: use the correct audio codec id when parsing metadata
(cherry picked from commit c3d015775388882b8a122afc337ea35108f652be) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r--libavformat/flvdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 403a9b5089..2821dd8c34 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -417,7 +417,8 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
flv_set_video_codec(s, vstream, num_val, 0);
} else
if (!strcmp(key, "audiocodecid") && acodec) {
- flv_set_audio_codec(s, astream, acodec, num_val);
+ int id = ((int)num_val) << FLV_AUDIO_CODECID_OFFSET;
+ flv_set_audio_codec(s, astream, acodec, id);
} else
if (!strcmp(key, "audiosamplerate") && acodec) {
acodec->sample_rate = num_val;