Skip to content
Snippets Groups Projects
Commit a5b2b22d authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'c0b10575' 


* commit 'c0b10575':
  txd: Use the TextureDSP module for decoding

Conflicts:
	configure
	libavcodec/s3tc.c
	libavcodec/s3tc.h
	libavcodec/txd.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents d1dc22dd c0b10575
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment