avcodec/h264: clean up and expand x86 function definitions

diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c
index c6c643a..7cc0655 100644 (file)
--- a/libavcodec/x86/h264dsp_init.c
+++ b/libavcodec/x86/h264dsp_init.c
@@ -110,6 +110,8 @@ void ff_deblock_ ## DIR ## _ ## TYPE ## _ ## DEPTH ## _ ## OPT(uint8_t *pix,  \
 #define LF_FUNCS(type, depth)                   \
 LF_FUNC(h,  chroma,       depth, mmxext)        \
 LF_IFUNC(h, chroma_intra, depth, mmxext)        \
+LF_FUNC(h,  chroma422,       depth, mmxext)     \
+LF_IFUNC(h, chroma422_intra, depth, mmxext)     \
 LF_FUNC(v,  chroma,       depth, mmxext)        \
 LF_IFUNC(v, chroma_intra, depth, mmxext)        \
 LF_FUNC(h,  luma,         depth, mmxext)        \
@@ -120,6 +122,8 @@ LF_FUNC(v,  luma,         depth, sse2)          \
 LF_IFUNC(v, luma_intra,   depth, sse2)          \
 LF_FUNC(h,  chroma,       depth, sse2)          \
 LF_IFUNC(h, chroma_intra, depth, sse2)          \
+LF_FUNC(h,  chroma422,       depth, sse2)       \
+LF_IFUNC(h, chroma422_intra, depth, sse2)       \
 LF_FUNC(v,  chroma,       depth, sse2)          \
 LF_IFUNC(v, chroma_intra, depth, sse2)          \
 LF_FUNC(h,  luma,         depth, avx)           \
@@ -128,15 +132,14 @@ LF_FUNC(v,  luma,         depth, avx)           \
 LF_IFUNC(v, luma_intra,   depth, avx)           \
 LF_FUNC(h,  chroma,       depth, avx)           \
 LF_IFUNC(h, chroma_intra, depth, avx)           \
+LF_FUNC(h,  chroma422,       depth, avx)        \
+LF_IFUNC(h, chroma422_intra, depth, avx)        \
 LF_FUNC(v,  chroma,       depth, avx)           \
 LF_IFUNC(v, chroma_intra, depth, avx)
 
 LF_FUNCS(uint8_t,   8)
 LF_FUNCS(uint16_t, 10)
 
-void ff_deblock_h_chroma422_8_mmxext(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0);
-LF_IFUNC(h, chroma422_intra, 8, mmxext)
-
 #if ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL
 LF_FUNC(v8, luma, 8, mmxext)
 static void deblock_v_luma_8_mmxext(uint8_t *pix, int stride, int alpha,