Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'
[ffmpeg.git] / libavformat / pjsdec.c
2014-01-11 Clément Bœschavformat/pjsdec: dont increase pointer when its already...
2013-04-10 James AlmerReplace all occurrences of PRI in sscanf() calls with SCN
2012-12-30 Clément BœschAdd PJS subtitles demuxer and decoder.