Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'
[ffmpeg.git] / libavformat / mpl2dec.c
2013-09-08 Clément Bœschavformat/subtitles: add a next line jumper and use it.
2013-09-03 wm4avformat/mpl2dec: handle files with CRLF linebreaks...
2013-04-10 James AlmerReplace all occurrences of PRI in sscanf() calls with SCN
2012-12-30 Clément BœschAdd MPL2 subtitles demuxer and decoder.