Commit b5a42c7f authored by Clément Bœsch's avatar Clément Bœsch

Merge commit '0309ddcf'

* commit '0309ddcf':
  lavc: handle MP3 in get_audio_frame_duration()
Merged-by: 's avatarClément Bœsch <u@pkh.me>
parents 5eba94a8 0309ddcf
......@@ -1691,6 +1691,9 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba,
if (id == AV_CODEC_ID_BINKAUDIO_DCT)
return (480 << (sr / 22050)) / ch;
}
if (id == AV_CODEC_ID_MP3)
return sr <= 24000 ? 576 : 1152;
}
if (ba > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment