mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-12-24 04:26:14 +00:00
Merge commit 'c3d015775388882b8a122afc337ea35108f652be'
* commit 'c3d015775388882b8a122afc337ea35108f652be': flvdec: use the correct audio codec id when parsing metadata Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
8ed9d34aa7
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user