Merge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 23:46:20 +0000 (00:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 23:46:20 +0000 (00:46 +0100)
commit0626211b561f299971a96b7bd1ee6f8a6d6735c8
treea68cc87fa123e1f5e488fbbb6dbc68518088ed73
parent3bf5c05925b53a02e59fd8f74df8947731411216
parente9a77f4bc084e5174baba3a8bc869ce4d102c4f0
Merge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'

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

Conflicts:
libavcodec/Makefile
libavcodec/h264.c

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