[FFmpeg-cvslog] Merge commit '0cbb1473179d35d4eb9c9446c8ed84e197e5389b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 15 11:34:45 2015 +0200| [0fbe18b63eab17562bea4b98df8307ba3a90686b] | committer: Michael Niedermayer

Merge commit '0cbb1473179d35d4eb9c9446c8ed84e197e5389b'

* commit '0cbb1473179d35d4eb9c9446c8ed84e197e5389b':
  x264: Map color parameters

Conflicts:
	libavcodec/libx264.c

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

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