[FFmpeg-cvslog] avcodec/error_resilience: Fix mbskip_table==NULL codepath

Michael Niedermayer git at videolan.org
Sat Mar 21 19:36:06 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 19:24:03 2015 +0100| [dd186b5825c41f0854c749d81b623578509e9f4a] | committer: Michael Niedermayer

avcodec/error_resilience: Fix mbskip_table==NULL codepath

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

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

 libavcodec/error_resilience.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 716fd60..3366db1 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -1024,7 +1024,7 @@ void ff_er_frame_end(ERContext *s)
             const int mb_xy = s->mb_index2xy[i];
             int       error = s->error_status_table[mb_xy];
 
-            if (s->mbskip_table && !s->mbskip_table[mb_xy]) // FIXME partition specific
+            if (!s->mbskip_table || !s->mbskip_table[mb_xy]) // FIXME partition specific
                 distance++;
             if (error & (1 << error_type))
                 distance = 0;



More information about the ffmpeg-cvslog mailing list