[FFmpeg-cvslog] avcodec: refactor avcodec_encode_audio2() to merge common branches

[Justin Ruggles]

ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Wed Mar 21 15:36:25 2012 -0400| [fa0319b4fdb569f9f7a5a5ea94fc5245fb252af8] | committer: Justin Ruggles

avcodec: refactor avcodec_encode_audio2() to merge common branches

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

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

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)