[FFmpeg-cvslog] ffv1enc: Keep coded_frame.key_frame a write-only variable

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Jul 15 18:41:17 2015 +0100| [10a9149de242c7bbc4e130d3d7c593b89e20f80e] | committer: Vittorio Giovara

ffv1enc: Keep coded_frame.key_frame a write-only variable

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10a9149de242c7bbc4e130d3d7c593b89e20f80e
---

 libavcodec/ffv1.h    |    1 +
 libavcodec/ffv1enc.c |   11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h
index bc433bc..6e8c798 100644
--- a/libavcodec/ffv1.h
+++ b/libavcodec/ffv1.h
@@ -78,6 +78,7 @@ typedef struct FFV1Context {
     int transparency;
     int flags;
     int picture_number;
+    int key_frame;
     const AVFrame *frame;
     AVFrame *last_picture;
 
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index f689bd9..ad52f15 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -884,7 +884,7 @@ static int encode_slice(AVCodecContext *c, void *arg)
                        ? (f->bits_per_raw_sample > 8) + 1
                        : 4;
 
-    if (c->coded_frame->key_frame)
+    if (f->key_frame)
         ffv1_clear_slice_state(f, fs);
     if (f->version > 2) {
         encode_slice_header(f, fs);
@@ -931,7 +931,6 @@ static int ffv1_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 {
     FFV1Context *f      = avctx->priv_data;
     RangeCoder *const c = &f->slice_context[0]->c;
-    AVFrame *const p    = avctx->coded_frame;
     int used_count      = 0;
     uint8_t keystate    = 128;
     uint8_t *buf_p;
@@ -951,12 +950,12 @@ static int ffv1_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 
     if (avctx->gop_size == 0 || f->picture_number % avctx->gop_size == 0) {
         put_rac(c, &keystate, 1);
-        p->key_frame = 1;
+        f->key_frame = 1;
         f->gob_count++;
         write_header(f);
     } else {
         put_rac(c, &keystate, 0);
-        p->key_frame = 0;
+        f->key_frame = 0;
     }
 
     if (f->ac > 1) {
@@ -1050,9 +1049,11 @@ static int ffv1_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     } else if (avctx->flags & CODEC_FLAG_PASS1)
         avctx->stats_out[0] = '\0';
 
+    avctx->coded_frame->key_frame = f->key_frame;
+
     f->picture_number++;
     pkt->size   = buf_p - pkt->data;
-    pkt->flags |= AV_PKT_FLAG_KEY * p->key_frame;
+    pkt->flags |= AV_PKT_FLAG_KEY * f->key_frame;
     *got_packet = 1;
 
     return 0;