Merge commit 'dfc50ac85e9d68a771b556297b7c411650206f3b'
* commit 'dfc50ac85e9d68a771b556297b7c411650206f3b':
x86: mpegvideo: move denoise_dct asm to mpegvideoenc
Conflicts:
libavcodec/x86/mpegvideo.c
libavcodec/x86/mpegvideoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>