diff options
author | Clément Bœsch <u@pkh.me> | 2017-04-17 13:57:08 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-04-17 13:57:08 +0200 |
commit | b5a42c7f098a0eaee9cb08ce8b26b0c9a307d9c4 (patch) | |
tree | da9b5eb8a99dfa90d03512d539e1c644be737fb9 /libavformat/tls_gnutls.c | |
parent | 5eba94a8c392be44a868183cdacff9a38fe55448 (diff) | |
parent | 0309ddcfb25fd44883bfcdb07509eb4907576b97 (diff) | |
download | ffmpeg-b5a42c7f098a0eaee9cb08ce8b26b0c9a307d9c4.tar.gz |
Merge commit '0309ddcfb25fd44883bfcdb07509eb4907576b97'
* commit '0309ddcfb25fd44883bfcdb07509eb4907576b97':
lavc: handle MP3 in get_audio_frame_duration()
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat/tls_gnutls.c')
0 files changed, 0 insertions, 0 deletions