[FFmpeg-cvslog] Merge commit 'e070d0a5ca9047192e324a3f87006b316e2a08a7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 14 12:34:17 2014 +0200| [de7b08cbc1c11482405504e76f402e5c32b60f22] | committer: Michael Niedermayer

Merge commit 'e070d0a5ca9047192e324a3f87006b316e2a08a7'

* 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 at gmx.at>

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