[FFmpeg-cvslog] Merge commit 'eb800f120d2d42590fde2302fe828c847e41e773'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun  1 13:35:17 2014 +0200| [0ccfcb0638be99d1fc2c2c1dea6850b3b257ae01] | committer: Michael Niedermayer

Merge commit 'eb800f120d2d42590fde2302fe828c847e41e773'

* commit 'eb800f120d2d42590fde2302fe828c847e41e773':
  libavcodec: set AVFrame colorspace fields on decoding

Conflicts:
	libavcodec/utils.c

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

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