Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 02:57:46 +0000 (03:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 02:58:00 +0000 (03:58 +0100)
commitc47fc0339a7fae6a39508dd3f7fbcac5cf27fda8
tree90f3229f5447380470cec2559f8d3949b0c8d6aa
parentd9481dcd612b5f020e3c2137c301406a5eb1aa90
parent02b9fafcca581158444e480b6c46fed704e24535
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: do not use avcodec header in frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/frame.h