diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-29 10:46:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-29 10:56:36 +0100 |
| commit | 8ed9d34aa7f0002d46fa78bbda58a816edaf1169 (patch) | |
| tree | 872d2d4581b0ebb1b99979f9a79a66c682b55f78 | |
| parent | 24cfe91a220204e56394c85bca51799b77df175b (diff) | |
| parent | c3d015775388882b8a122afc337ea35108f652be (diff) | |
| download | ffmpeg-8ed9d34aa7f0002d46fa78bbda58a816edaf1169.tar.gz | |
Merge commit 'c3d015775388882b8a122afc337ea35108f652be'
* commit 'c3d015775388882b8a122afc337ea35108f652be':
flvdec: use the correct audio codec id when parsing metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/flvdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index d0511f1582..0121e3db46 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -415,7 +415,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; |