ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Aug 10
01:21:30 2014 +0200| [287602f9d80f4a816c0e9a3a9c0d810de8dc94cb] | committer:
Michael Niedermayer
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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=287602f9d80f4a816c0e9a3a9c0d810de8dc94cb
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
