From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Wed, 21 Mar 2012 19:36:25 +0000 (-0400)
Subject: avcodec: refactor avcodec_encode_audio2() to merge common branches
X-Git-Tag: v9_beta1~1808
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa0319b4fdb569f9f7a5a5ea94fc5245fb252af8;p=platform%2Fupstream%2Flibav.git

avcodec: refactor avcodec_encode_audio2() to merge common branches
---

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index bfd470b..fdbdfd5 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -885,8 +885,9 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
         }
     }
 
-        ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr);
-        if (!ret && *got_packet_ptr) {
+    ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr);
+    if (!ret) {
+        if (*got_packet_ptr) {
             if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) {
                 if (avpkt->pts == AV_NOPTS_VALUE)
                     avpkt->pts = frame->pts;
@@ -899,7 +900,6 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
             avpkt->size = 0;
         }
 
-    if (!ret) {
         if (!user_packet && avpkt->size) {
             uint8_t *new_data = av_realloc(avpkt->data, avpkt->size);
             if (new_data)