[FFmpeg-cvslog] Merge commit '67e9f3907d6d438a413df72d72c1339a0c11a290'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  3 22:28:25 2015 +0100| [94337f8c2dd9aecf5f8bd219431976d5e982a697] | committer: Michael Niedermayer

Merge commit '67e9f3907d6d438a413df72d72c1339a0c11a290'

* commit '67e9f3907d6d438a413df72d72c1339a0c11a290':
  isom: Decode Prores 4444 XQ with the existing Prores decoder

See: fe47cba7e8daa987ac8c802362d8dad892858cd5
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94337f8c2dd9aecf5f8bd219431976d5e982a697
---