[FFmpeg-cvslog] Merge commit 'ca09effb01e126b0ac74ff3de70a475423ddee82'
Michael Niedermayer
git at videolan.org
Tue Jan 6 22:01:24 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 6 21:54:26 2015 +0100| [f4cc19cdd082aa07db2f6fd1c5fbc2b674a74a63] | committer: Michael Niedermayer
Merge commit 'ca09effb01e126b0ac74ff3de70a475423ddee82'
* commit 'ca09effb01e126b0ac74ff3de70a475423ddee82':
ffv1: Drop unnecessary casts and const qualifiers to match function signatures
Conflicts:
libavcodec/ffv1dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4cc19cdd082aa07db2f6fd1c5fbc2b674a74a63
---
More information about the ffmpeg-cvslog
mailing list