Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 13:08:10 +0000 (15:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 13:08:10 +0000 (15:08 +0200)
commit4d41a25d3940f1fdd5f87fa75885f25f4568fee8
treea1f1ee39e0409952c237d19162e4733baf12f4a2
parent8210e3846129c6be11322cefa85651bfcf85c257
parent825c7c62bb66c9ee6117e0dcb71915271faa46c6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: Move 8x8 in a separate function

Conflicts:
libavcodec/mpegvideo_motion.c

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