Merge commit 'eb800f120d2d42590fde2302fe828c847e41e773'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 11:35:17 +0000 (13:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 11:39:31 +0000 (13:39 +0200)
commit0ccfcb0638be99d1fc2c2c1dea6850b3b257ae01
tree704e2d18e4ba8862bd143cd625f4f605ac550727
parent6e8e9f1e517ee52fe439f3e8ca762f09d235f21e
parenteb800f120d2d42590fde2302fe828c847e41e773
Merge commit 'eb800f120d2d42590fde2302fe828c847e41e773'

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

Conflicts:
libavcodec/utils.c

See: a80e622924c89df69fb1c225ba432fe12fe6648e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c