eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 18:40:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
4fa91b88c6180957781036614fa94a6fc3b7046f
ffmpeg/libavcodec/dsputil.h
Michael Niedermayer 8e70fdab36 Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3' 
* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
  dsputil: Move apply_window_int16 to ac3dsp

Conflicts:
	libavcodec/arm/ac3dsp_init_arm.c
	libavcodec/arm/ac3dsp_neon.S
	libavcodec/x86/ac3dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09 04:12:40 +01:00

13 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink