[FFmpeg-cvslog] lavc: merge two if()s with the same condition.

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Feb 24 13:07:57 2012 +0100| [03ca0a5b3000d705aba86ea2184df47303851f65] | committer: Anton Khirnov

lavc: merge two if()s with the same condition.

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

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 47cab41..e57f7ef 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;