ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri May 1
21:34:35 2015 +0200| [9aff7d41f65a22a281def975ce2f1979e32a4199] | committer:
Michael Niedermayer
Merge commit '6503cbf842a026faec517eb980551089168c7d8a'
* commit '6503cbf842a026faec517eb980551089168c7d8a':
ffv1enc: Add const attribute to input frame
Conflicts:
libavcodec/ffv1.h
no change, the changed field does not exist in FFmpeg
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9aff7d41f65a22a281def975ce2f1979e32a4199
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
