Merge commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 15:45:52 +0000 (16:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 15:51:23 +0000 (16:51 +0100)
commit30056fd0be8ace0754e0568787bb4c18ea49edeb
tree2fc504571e70381b06b8ab26a20eb0ad1375c7b5
parent64591f8f86f2dfeac13ee6b4e971d069675ca814
parenta03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb
Merge commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb'

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

See: 07abf13da4a7c3d23ce6bc6542d72e6252161736
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/h264dsp_init_arm.c
libavcodec/h264dsp.c
libavcodec/h264pred.c
libavcodec/ppc/h264dsp.c
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/h264dsp_init.c