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