comparison vc1.c @ 12520:5915f4f0e172 libavcodec

RES_SM in WMV3 is really two flags, so split it in decoder
author kostya
date Sun, 26 Sep 2010 13:54:35 +0000
parents 9ba7d2a5b20a
children db36486a6f89
comparison
equal deleted inserted replaced
12519:0b6bd91bbe57 12520:5915f4f0e172
304 } 304 }
305 else 305 else
306 { 306 {
307 v->zz_8x4 = wmv2_scantableA; 307 v->zz_8x4 = wmv2_scantableA;
308 v->zz_4x8 = wmv2_scantableB; 308 v->zz_4x8 = wmv2_scantableB;
309 v->res_sm = get_bits(gb, 2); //reserved 309 v->res_y411 = get_bits1(gb);
310 if (v->res_sm) 310 v->res_sprite = get_bits1(gb);
311 if (v->res_y411)
311 { 312 {
312 av_log(avctx, AV_LOG_ERROR, 313 av_log(avctx, AV_LOG_ERROR,
313 "Reserved RES_SM=%i is forbidden\n", v->res_sm); 314 "Old interlaced mode is not supported\n");
315 return -1;
316 }
317 if (v->res_sprite) {
318 av_log(avctx, AV_LOG_ERROR, "WMVP is not supported\n");
314 return -1; 319 return -1;
315 } 320 }
316 } 321 }
317 322
318 // (fps-2)/4 (->30) 323 // (fps-2)/4 (->30)