Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Oct 2013 07:20:58 +0000 (09:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Oct 2013 07:22:10 +0000 (09:22 +0200)
commit08b22c0ea536813492c143c97197f7919921ce46
tree6903e716edcfbaf06c7b6bc42b51e655c70e1116
parentbb8ce36dc28576d2abd10afc171499d6a9ce656a
parent054454c63a2e07354c4bca8019a2f1e8060ffca8
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>