Merge commit 'e070d0a5ca9047192e324a3f87006b316e2a08a7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Aug 2014 10:34:17 +0000 (12:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Aug 2014 10:34:17 +0000 (12:34 +0200)
* commit 'e070d0a5ca9047192e324a3f87006b316e2a08a7':
  frame: Remove some FF_API_AVFRAME_COLORSPACE leftovers

Conflicts:
libavutil/frame.c

No change, as these leftovers have already been removed

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

Trivial merge