Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'
[ffmpeg.git] / libavformat / jacosubenc.c
2012-08-07 Michael NiedermayerMerge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
2012-05-03 Clément BœschJACOsub demuxer, decoder and muxer.