From 85185578ce309f5a605ec90d97f9acf38598ccaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <clement@stupeflix.com>
Date: Wed, 22 Jun 2016 11:09:19 +0200
Subject: [PATCH] lavc/qtrleenc: simplify FF_API_CODED_FRAME deprecation guard

---
 libavcodec/qtrleenc.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c
index adbd9f3b44..cdd864bf82 100644
--- a/libavcodec/qtrleenc.c
+++ b/libavcodec/qtrleenc.c
@@ -363,9 +363,6 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                               const AVFrame *pict, int *got_packet)
 {
     QtrleEncContext * const s = avctx->priv_data;
-#if FF_API_CODED_FRAME
-    enum AVPictureType pict_type;
-#endif
     int ret;
 
     if ((ret = ff_alloc_packet2(avctx, pkt, s->max_buf_size, 0)) < 0)
@@ -373,15 +370,9 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 
     if (avctx->gop_size == 0 || (s->avctx->frame_number % avctx->gop_size) == 0) {
         /* I-Frame */
-#if FF_API_CODED_FRAME
-        pict_type = AV_PICTURE_TYPE_I;
-#endif
         s->key_frame = 1;
     } else {
         /* P-Frame */
-#if FF_API_CODED_FRAME
-        pict_type = AV_PICTURE_TYPE_P;
-#endif
         s->key_frame = 0;
     }
 
@@ -398,7 +389,7 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 #if FF_API_CODED_FRAME
 FF_DISABLE_DEPRECATION_WARNINGS
     avctx->coded_frame->key_frame = s->key_frame;
-    avctx->coded_frame->pict_type = pict_type;
+    avctx->coded_frame->pict_type = s->key_frame ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif