summaryrefslogtreecommitdiff
path: root/libavformat/mpl2dec.c
Commit message (Collapse)AuthorAge
* avformat/subtitles: add a next line jumper and use it.Clément Bœsch2013-09-08
| | | | | | | | | | | | This fixes a bunch of possible overread in avformat with the idiom p += strcspn(p, "\n") + 1 (strcspn() can focus on the trailing '\0' if no '\n' is found, so the +1 leads to an overread). Note on lavf/matroskaenc: no extra subtitles.o Makefile dependency is added because only the header is required for ff_subtitles_next_line(). Note on lavf/mpsubdec: code gets slightly complex to avoid an infinite loop in the probing since there is no more forced increment.
* avformat/mpl2dec: handle files with CRLF linebreaks correctlywm42013-09-03
| | | | | | | | Skip the "\r" as normal text. Otherwise it will be the first character of the string passed to sscanf(), which then fill fail to match the timestamps. Signed-off-by: Clément Bœsch <u@pkh.me>
* Replace all occurrences of PRI in sscanf() calls with SCNJames Almer2013-04-10
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* Add MPL2 subtitles demuxer and decoder.Clément Bœsch2012-12-30