Merge commit '472f9ed312ec784f7c72876b77163f4741880d05'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 23:21:30 +0000 (01:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 23:29:24 +0000 (01:29 +0200)
commit287602f9d80f4a816c0e9a3a9c0d810de8dc94cb
tree06bd62c1fe2e58ca1bd2578fe5effe60e60f9a28
parent97f8c7a03eddacd9b6450423cc21a801e002f01f
parent472f9ed312ec784f7c72876b77163f4741880d05
Merge commit '472f9ed312ec784f7c72876b77163f4741880d05'

* commit '472f9ed312ec784f7c72876b77163f4741880d05':
  Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.

Conflicts:
libavcodec/utils.c
libavutil/frame.h
libavutil/version.h

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