[FFmpeg-cvslog] Merge commit '619e0da19119bcd683f135fe9a164f37c0ca70d1'
Michael Niedermayer
git at videolan.org
Sat Apr 20 16:04:00 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 15:55:29 2013 +0200| [f6dcd844ee65b187b7b352e3740c43724175b3e1] | committer: Michael Niedermayer
Merge commit '619e0da19119bcd683f135fe9a164f37c0ca70d1'
* commit '619e0da19119bcd683f135fe9a164f37c0ca70d1':
dsputil: Remove unused 32-bit functions
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6dcd844ee65b187b7b352e3740c43724175b3e1
---
More information about the ffmpeg-cvslog
mailing list