avcodec/dvdec: only attempt to conceal errors based on STA inconsistencies when error...

[ffmpeg] / libavcodec / dvdec.c

diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index 2a241ab670dff7ad2442fdb4fa04a1908ee37822..4d080b297aa12ff3d4d148836461e9aca8c7472f 100644 (file)
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -311,12 +311,14 @@ retry:
     for (mb_index = 0; mb_index < 5; mb_index++, mb1 += s->sys->bpm, block1 += s->sys->bpm * 64) {
         /* skip header */
         quant    = buf_ptr[3] & 0x0f;
-        if ((buf_ptr[3] >> 4) == 0x0E)
-            vs_bit_buffer_damaged = 1;
-        if (!mb_index) {
-            sta = buf_ptr[3] >> 4;
-        } else if (sta != (buf_ptr[3] >> 4))
-            vs_bit_buffer_damaged = 1;
+        if (avctx->error_concealment) {
+            if ((buf_ptr[3] >> 4) == 0x0E)
+                vs_bit_buffer_damaged = 1;
+            if (!mb_index) {
+                sta = buf_ptr[3] >> 4;
+            } else if (sta != (buf_ptr[3] >> 4))
+                vs_bit_buffer_damaged = 1;
+        }
         buf_ptr += 4;
         init_put_bits(&pb, mb_bit_buffer, 80);
         mb    = mb1;