Merge commit '0309ddcfb25fd44883bfcdb07509eb4907576b97'
authorClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 11:57:08 +0000 (13:57 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 11:57:08 +0000 (13:57 +0200)
* commit '0309ddcfb25fd44883bfcdb07509eb4907576b97':
  lavc: handle MP3 in get_audio_frame_duration()

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/utils.c

Simple merge