[FFmpeg-cvslog] Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'
Michael Niedermayer
git at videolan.org
Mon Dec 9 04:47:21 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 9 04:12:40 2013 +0100| [8e70fdab3614a5ef709d60b67c6729c3eca93c21] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e70fdab3614a5ef709d60b67c6729c3eca93c21
---
More information about the ffmpeg-cvslog
mailing list