[FFmpeg-cvslog] Merge commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e'
Michael Niedermayer
git at videolan.org
Mon Jul 20 22:33:06 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 20 22:25:53 2015 +0200| [b97e3e11a9c23e45ac3b2c1a7771d55f8fc1caee] | committer: Michael Niedermayer
Merge commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e'
* commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e':
ffv1enc: Keep coded_frame.key_frame a write-only variable
Conflicts:
libavcodec/ffv1.h
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b97e3e11a9c23e45ac3b2c1a7771d55f8fc1caee
---
More information about the ffmpeg-cvslog
mailing list