[FFmpeg-cvslog] Merge commit '600b854ad8173995518bd917e7f86120b5505088'
Michael Niedermayer
git at videolan.org
Sat Mar 22 22:23:00 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 22 22:17:54 2014 +0100| [d6d3cfb0aa23c1f6111f71889256874d86c2cf77] | committer: Michael Niedermayer
Merge commit '600b854ad8173995518bd917e7f86120b5505088'
* commit '600b854ad8173995518bd917e7f86120b5505088':
imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil
Conflicts:
libavcodec/imgconvert.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6d3cfb0aa23c1f6111f71889256874d86c2cf77
---
More information about the ffmpeg-cvslog
mailing list