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)
commitb5a42c7f098a0eaee9cb08ce8b26b0c9a307d9c4
treeda9b5eb8a99dfa90d03512d539e1c644be737fb9
parent5eba94a8c392be44a868183cdacff9a38fe55448
parent0309ddcfb25fd44883bfcdb07509eb4907576b97
Merge commit '0309ddcfb25fd44883bfcdb07509eb4907576b97'

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

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