Merge commit '8a9de5c52401aa1e87bdb147524831c640d1ec53'

[ffmpeg] / libavcodec / roqvideodec.c

diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index c1ff3f109f561ae391c225a077bd5a55e9045157..5f0b2047c6857dadb4f3249eb3efe9f915d11324 100644 (file)
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -204,14 +204,15 @@ static int roq_decode_frame(AVCodecContext *avctx,
     const uint8_t *buf = avpkt->data;
     int buf_size = avpkt->size;
     RoqContext *s = avctx->priv_data;
-    int copy= !s->current_frame->data[0] && s->last_frame->data[0];
+    int copy = !s->current_frame->data[0] && s->last_frame->data[0];
     int ret;
 
     if ((ret = ff_reget_buffer(avctx, s->current_frame)) < 0)
         return ret;
 
-    if(copy) {
-        if ((ret = av_frame_copy(s->current_frame, s->last_frame)) < 0)
+    if (copy) {
+        ret = av_frame_copy(s->current_frame, s->last_frame);
+        if (ret < 0)
             return ret;
     }