ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Jun 22
21:15:50 2015 +0200| [a5b2b22d9a45c9634e6947d43945ebafe121abec] | committer:
Michael Niedermayer
Merge commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b'
* commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b':
txd: Use the TextureDSP module for decoding
Conflicts:
configure
libavcodec/s3tc.c
libavcodec/s3tc.h
libavcodec/txd.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5b2b22d9a45c9634e6947d43945ebafe121abec
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
