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