Mercurial > libavformat.hg

comparison mtv.c @ 5310:7e2ae4853d3d libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix wrong comparison in r20304
author reynaldo
date Mon, 19 Oct 2009 01:42:05 +0000
parents a011470132ca
children 932ea4344b75
comparison
equal deleted inserted replaced
5309:a011470132ca 5310:7e2ae4853d3d
60 /* Check for nonzero in bpp and (width|height) header fields */ 60 /* Check for nonzero in bpp and (width|height) header fields */
61 if(!(p->buf[51] && AV_RL16(&p->buf[52]) | AV_RL16(&p->buf[54]))) 61 if(!(p->buf[51] && AV_RL16(&p->buf[52]) | AV_RL16(&p->buf[54])))
62 return 0; 62 return 0;
63 63
64 /* If width or height are 0 then imagesize header field should not */ 64 /* If width or height are 0 then imagesize header field should not */
65 if(AV_RL16(&p->buf[52]) && AV_RL16(&p->buf[54])) 65 if(!AV_RL16(&p->buf[52]) || !AV_RL16(&p->buf[54]))
66 { 66 {
67 if(!!AV_RL16(&p->buf[56])) 67 if(!!AV_RL16(&p->buf[56]))
68 return AVPROBE_SCORE_MAX/2; 68 return AVPROBE_SCORE_MAX/2;
69 else 69 else
70 return 0; 70 return 0;