ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4cc19cdd082aa07db2f6fd1c5fbc2b674a74a63
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
