[FFmpeg-cvslog] Merge commit '0309ddcfb25fd44883bfcdb07509eb4907576b97'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Apr 17 13:57:08 2017 +0200| [b5a42c7f098a0eaee9cb08ce8b26b0c9a307d9c4] | committer: Clément Bœsch

Merge commit '0309ddcfb25fd44883bfcdb07509eb4907576b97'

* commit '0309ddcfb25fd44883bfcdb07509eb4907576b97':
  lavc: handle MP3 in get_audio_frame_duration()

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5a42c7f098a0eaee9cb08ce8b26b0c9a307d9c4
---

 libavcodec/utils.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index ae245c833e..56e58cc426 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -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) {


======================================================================