Michael Niedermayer 9d6a27d533 Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'
* commit '57f09608e1600d1cf1679885a46f5004d522d68f':
  dsputil: Move thirdpel-related bits into their own context

Conflicts:
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22 23:26:23 +01:00
..
2012-01-28 11:04:19 +01:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2014-03-01 03:34:59 +01:00
2013-08-29 22:52:04 +02:00
2013-02-14 23:45:48 +01:00
2014-03-13 03:54:48 +01:00