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