[FFmpeg-cvslog] avcodec/wmalosslessdec: Pass on error code from decode_tilehdr()

Michael Niedermayer git at videolan.org
Mon Jan 13 17:28:57 CET 2014


ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 11 01:58:36 2014 +0100| [aaaafc300df691a3b6f6f1a1837f772e81b04086] | committer: Michael Niedermayer

avcodec/wmalosslessdec: Pass on error code from decode_tilehdr()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 03fff09b32171e0c76d104c02ebf578c7f4fe21d)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/wmalosslessdec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 7a80248..6386930 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -1038,9 +1038,9 @@ static int decode_frame(WmallDecodeCtx *s)
         len = get_bits(gb, s->log2_frame_size);
 
     /* decode tile information */
-    if (decode_tilehdr(s)) {
+    if ((ret = decode_tilehdr(s))) {
         s->packet_loss = 1;
-        return 0;
+        return ret;
     }
 
     /* read drc info */



More information about the ffmpeg-cvslog mailing list