OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Jul 2011 08:40:34 +0000 (10:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Jul 2011 08:40:34 +0000 (10:40 +0200)
commitf52ad8ceddf3078dbfef7ab437ca8600a1f96ef2
treeb2269696636ba3f82fcc6b0e9c2b92a15fb3b793
parentc617d7b86a69aefafb0a5d6a9f916f9c97974c8f
parent001e600c3b8668191f96d7a1e46da0d7fff546de
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: spelling cosmetics
  dctref: make sure function declarations match between .c and .h file
  x86: fix build with gcc 4.7

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/dctref.h