Merge commit 'e9a77f4b'

* commit 'e9a77f4b':
  h264: move macroblock decoding into its own file

Conflicts:
	libavcodec/Makefile
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/Makefile

@@ -233,8 +233,8 @@ OBJS-$(CONFIG_H263_ENCODER)            += mpeg4videoenc.o mpeg4video.o  \
                                           h263.o ituh263enc.o flvenc.o
 OBJS-$(CONFIG_H264_DECODER)            += h264.o h264_cabac.o h264_cavlc.o \
                                           h264_direct.o h264_loopfilter.o  \
-                                          h264_ps.o h264_refs.o h264_sei.o \
-                                          cabac.o
+                                          h264_mb.o h264_ps.o h264_refs.o  \
+                                          h264_sei.o cabac.o
 OBJS-$(CONFIG_H264_VDA_DECODER)        += vda_h264_dec.o
 OBJS-$(CONFIG_HEVC_DECODER)            += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
                                           hevc_cabac.o hevc_refs.o hevcpred.o    \