From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 11 Oct 2013 07:20:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: android-x86-4.4-r1~669
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=08b22c0ea536813492c143c97197f7919921ce46;p=android-x86%2Fexternal-ffmpeg.git

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>
---

08b22c0ea536813492c143c97197f7919921ce46