1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-13 21:26:33 +02:00
FFmpeg/libavcodec
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
..
2013-11-25 23:17:17 +01:00
2013-11-22 01:29:02 +01:00
2013-11-16 17:43:05 +01:00
2013-11-16 17:43:36 +01:00
2013-11-16 13:27:17 +01:00
2013-11-26 13:22:01 +01:00
2013-11-22 01:29:02 +01:00
2013-11-22 01:29:02 +01:00
2013-11-21 20:53:06 +01:00
2013-11-21 20:53:06 +01:00
2013-11-21 20:57:20 +01:00
2013-11-16 12:49:18 +01:00