[FFmpeg-cvslog] Merge commit 'dfc50ac85e9d68a771b556297b7c411650206f3b'
Michael Niedermayer
git at videolan.org
Fri Dec 20 23:50:57 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 20 23:44:31 2013 +0100| [ce612fc1863830f1b5255beb42e244138f78e145] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce612fc1863830f1b5255beb42e244138f78e145
---
More information about the ffmpeg-cvslog
mailing list