Merge commit '9d12dd6fa84d9f6094bdf0fdae62527ecec0bbb6'
[ffmpeg.git] / libavformat / jacosubenc.c
2016-04-10 Derek BuitenhuisMerge commit '9200514ad8717c63f82101dc394f4378854325bf'
2012-08-07 Michael NiedermayerMerge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
2012-05-03 Clément BœschJACOsub demuxer, decoder and muxer.