[FFmpeg-cvslog] Merge commit 'd6acefe05862af244fd5a30ae946ed507c063994'
Michael Niedermayer
git at videolan.org
Fri Feb 28 17:31:20 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 28 17:26:37 2014 +0100| [18d870da83b172c89495b6543001b2ecdf4ae1e2] | committer: Michael Niedermayer
Merge commit 'd6acefe05862af244fd5a30ae946ed507c063994'
* commit 'd6acefe05862af244fd5a30ae946ed507c063994':
proresenc: Drop unnecessary DCT permutation bits
Conflicts:
libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18d870da83b172c89495b6543001b2ecdf4ae1e2
---
More information about the ffmpeg-cvslog
mailing list