[FFmpeg-cvslog] Merge commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d'
Michael Niedermayer
git at videolan.org
Fri Nov 29 01:09:29 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 00:32:14 2013 +0100| [a7f8817720ea04ab9abf16a5b9d493d6a762cd8a] | committer: Michael Niedermayer
Merge commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d'
* commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d':
dca: convert dca_default_coeffs to float.
Conflicts:
libavcodec/dcadata.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7f8817720ea04ab9abf16a5b9d493d6a762cd8a
---
More information about the ffmpeg-cvslog
mailing list