Commit 71412781 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Ignore first entry of intra matrixes if it is invalid.

Fixes pink.mpg / issue1046.

Originally committed as revision 18724 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 45ccc61a
...@@ -1480,6 +1480,10 @@ static int load_matrix(MpegEncContext *s, uint16_t matrix0[64], uint16_t matrix1 ...@@ -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"); av_log(s->avctx, AV_LOG_ERROR, "matrix damaged\n");
return -1; 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; matrix0[j] = v;
if(matrix1) if(matrix1)
matrix1[j] = v; matrix1[j] = v;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment