[FFmpeg-cvslog] avcodec/asvdec: return correct value in case of error

Paul B Mahol git at videolan.org
Fri Dec 23 12:19:28 EET 2016


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Dec 23 11:10:47 2016 +0100| [0ed4993ad0e20955ac82a7a90aa7f8a6b002c2f2] | committer: Paul B Mahol

avcodec/asvdec: return correct value in case of error

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavcodec/asvdec.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c
index 036d56e..603a092 100644
--- a/libavcodec/asvdec.c
+++ b/libavcodec/asvdec.c
@@ -163,19 +163,19 @@ static inline int asv2_decode_block(ASV1Context *a, int16_t block[64])
 
 static inline int decode_mb(ASV1Context *a, int16_t block[6][64])
 {
-    int i;
+    int i, ret;
 
     a->bdsp.clear_blocks(block[0]);
 
     if (a->avctx->codec_id == AV_CODEC_ID_ASV1) {
         for (i = 0; i < 6; i++) {
-            if (asv1_decode_block(a, block[i]) < 0)
-                return -1;
+            if ((ret = asv1_decode_block(a, block[i])) < 0)
+                return ret;
         }
     } else {
         for (i = 0; i < 6; i++) {
-            if (asv2_decode_block(a, block[i]) < 0)
-                return -1;
+            if ((ret = asv2_decode_block(a, block[i])) < 0)
+                return ret;
         }
     }
     return 0;



More information about the ffmpeg-cvslog mailing list