eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-04-25 05:45:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
481fdeeecfc2beafd7b87d6875839d428bd4e6b8
ffmpeg/libavcodec/aacdec.c
Michael Niedermayer 84833b028b 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>
2012-10-31 14:27:11 +01:00

104 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink