[FFmpeg-cvslog] Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  7 00:18:22 2013 +0100| [fa3a7b55ec1be2a5274d7349d3aa1faed14d2bcb] | committer: Michael Niedermayer

Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'

* commit '5da51284937649a8ebb84fa951c235438fcbf8ae':
  cavs: Add a dependency on h264chroma
  lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs

Conflicts:
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpeg12.c

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

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