Michael Niedermayer 4d41a25d39 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>

2013-10-16 15:08:10 +02:00

38 KiB

Raw Blame History

View Raw