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@niedermayer.cc>

1 files changed, 1 insertions, 0 deletions

diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h
index bfc4d71e65..ed347e2375 100644
--- a/libavcodec/ffv1.h
+++ b/libavcodec/ffv1.h
@@ -87,6 +87,7 @@ typedef struct FFV1Context {
     int transparency;
     int flags;
     int picture_number;
+    int key_frame;
     ThreadFrame picture, last_picture;
     struct FFV1Context *fsrc;