[FFmpeg-cvslog] Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'
Michael Niedermayer
git at videolan.org
Fri Feb 28 21:52:11 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 28 21:41:19 2014 +0100| [fb3c33f3cd6b932badbe61a3e0d5cce9f4e36769] | committer: Michael Niedermayer
Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'
* commit '4cb6964244fd6c099383d8b7e99731e72cc844b9':
dcadec: simplify decoding of VQ high frequencies
Conflicts:
configure
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb3c33f3cd6b932badbe61a3e0d5cce9f4e36769
---
More information about the ffmpeg-cvslog
mailing list