[FFmpeg-cvslog] Merge commit '87ec849fe9acba075c843e67bcd01f256f481a18'
Michael Niedermayer
git at videolan.org
Fri Feb 28 18:18:26 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 28 18:14:12 2014 +0100| [90f674d55bd76e23a70ed68b8cb104b5d8b9505f] | committer: Michael Niedermayer
Merge commit '87ec849fe9acba075c843e67bcd01f256f481a18'
* commit '87ec849fe9acba075c843e67bcd01f256f481a18':
dcadec: remove scaling in lfe_interpolation_fir
Conflicts:
libavcodec/dcadec.c
libavcodec/dcadsp.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90f674d55bd76e23a70ed68b8cb104b5d8b9505f
---
More information about the ffmpeg-cvslog
mailing list