aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpegenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-11 09:20:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-11 09:22:10 +0200
commit08b22c0ea536813492c143c97197f7919921ce46 (patch)
tree6903e716edcfbaf06c7b6bc42b51e655c70e1116 /libavformat/mpegenc.c
parentbb8ce36dc28576d2abd10afc171499d6a9ce656a (diff)
parent054454c63a2e07354c4bca8019a2f1e8060ffca8 (diff)
downloadffmpeg-08b22c0ea536813492c143c97197f7919921ce46.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: mxf: Add jpeg2000 codec to intra only codecs See: c461265a769e9ddadc2e3ee5b759937646fcc839 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegenc.c')
0 files changed, 0 insertions, 0 deletions