Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b'
[ffmpeg.git] / libavcodec / mpl2dec.c
2012-12-30 Clément BœschAdd MPL2 subtitles demuxer and decoder.