From 03ca0a5b3000d705aba86ea2184df47303851f65 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Fri, 24 Feb 2012 13:07:57 +0100
Subject: lavc: merge two if()s with the same condition.

---
 libavcodec/utils.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 47cab4118b..e57f7ef130 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1112,10 +1112,9 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
             avpkt->size = 0;
         else if (!(avctx->codec->capabilities & CODEC_CAP_DELAY))
             avpkt->pts = avpkt->dts = frame->pts;
-    }
 
-    if (!ret)
         avctx->frame_number++;
+    }
 
     emms_c();
     return ret;
-- 
cgit v1.2.3