Merge commit 'f7986239f4dbec91c743c4c5eb0a2339bd325bf6'
[ffmpeg.git] / libavformat / lrc.c
2014-07-13 Star BrilliantAVFormat: LRC demuxer and muxer