[FFmpeg-cvslog] Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 22 23:26:23 2014 +0100| [9d6a27d5336550c131d2a45fc4b0e90c93e46aca] | committer: Michael Niedermayer

Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'

* commit '57f09608e1600d1cf1679885a46f5004d522d68f':
  dsputil: Move thirdpel-related bits into their own context

Conflicts:
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d6a27d5336550c131d2a45fc4b0e90c93e46aca
---