Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 23:18:22 +0000 (00:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 23:18:22 +0000 (00:18 +0100)
commitfa3a7b55ec1be2a5274d7349d3aa1faed14d2bcb
tree4d361e7dfeb04cb0684a355d13bfe06d60ad529b
parentff9b607489e6b295d57b9b97f1c23b0a66b273a6
parent5da51284937649a8ebb84fa951c235438fcbf8ae
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@gmx.at>
libavcodec/h264.c