[FFmpeg-cvslog] Merge commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b'
Michael Niedermayer
git at videolan.org
Tue Jan 6 22:12:06 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 6 22:03:57 2015 +0100| [3b3782d74e5a5827e4a52f0be990decd6a303654] | committer: Michael Niedermayer
Merge commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b'
* commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b':
ffv1: const correctness for encode_rgb_frame()
Conflicts:
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b3782d74e5a5827e4a52f0be990decd6a303654
---
More information about the ffmpeg-cvslog
mailing list