[FFmpeg-cvslog] Merge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'
Michael Niedermayer
git at videolan.org
Wed Mar 26 15:36:17 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 26 15:24:50 2014 +0100| [b4f64c58fc80585b9dc46f6ac6e385b2d55260a7] | committer: Michael Niedermayer
Merge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'
* commit 'da5be235250a61d6994408b054e3e3acf2e0f90f':
dsputil: Move RV40-specific bits into rv40dsp
Conflicts:
libavcodec/dsputil.c
libavcodec/rv40dsp.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4f64c58fc80585b9dc46f6ac6e385b2d55260a7
---
More information about the ffmpeg-cvslog
mailing list