Commit 268d3b11 authored by michael's avatar michael

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
parent 7b292a5d
...@@ -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