Ignore first entry of intra matrixes if its invalid.

Fixes pink.mpg / issue1046.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18724 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index d5635b11ac597d2c5097777aa78c35a4c86a2fbb..019dc810850ad46905d6485aa91d5563ddc60a4b 100644 (file)
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1480,6 +1480,10 @@ static int load_matrix(MpegEncContext *s, uint16_t matrix0[64], uint16_t matrix1
             av_log(s->avctx, AV_LOG_ERROR, "matrix damaged\n");
             return -1;
         }
+        if(intra && i==0 && v!=8){
+            av_log(s->avctx, AV_LOG_ERROR, "intra matrix invalid, ignoring\n");
+            v= 8; // needed by pink.mpg / issue1046
+        }
         matrix0[j] = v;
         if(matrix1)
             matrix1[j] = v;