[FFmpeg-cvslog] Merge commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 16:45:52 2014 +0100| [30056fd0be8ace0754e0568787bb4c18ea49edeb] | committer: Michael Niedermayer

Merge commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb'

* commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb':
  h264: do not use 422 functions for monochrome

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

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