[FFmpeg-cvslog] r18724 - trunk/libavcodec/mpeg12.c

[michael]

Author: michael
Date: Fri May  1 14:31:19 2009
New Revision: 18724

Log:
Ignore first entry of intra matrixes if its invalid.
Fixes pink.mpg / issue1046.

Modified:
   trunk/libavcodec/mpeg12.c

Modified: trunk/libavcodec/mpeg12.c
==============================================================================
--- trunk/libavcodec/mpeg12.c	Fri May  1 14:17:25 2009	(r18723)
+++ trunk/libavcodec/mpeg12.c	Fri May  1 14:31:19 2009	(r18724)
@@ -1480,6 +1480,10 @@ static int load_matrix(MpegEncContext *s
             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;