* commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0': h264: move macroblock decoding into its own file Conflicts: libavcodec/Makefile libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>