Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Oct 2012 13:26:11 +0000 (14:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Oct 2012 13:27:11 +0000 (14:27 +0100)
commit84833b028bf3fa08d09939330989df8d8820cd59
tree532812ffae1097453064a82f86b10931fb55cc25
parent28c0678eb764b8d10faf1a988d2f0e2dc79c96a5
parent5707af8d0b9c5a7e8a742a11798e406f99d78cea
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacdec: Drop some unused function arguments
  x86: Fix assembly with NASM
  x86: fmtconvert: Refactor cvtps2pi emulation through cpuflags

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c
libavcodec/x86/fmtconvert.asm