From e18b48c6fdfdc91fe56b1d1a1312b6d486d9fe43 Mon Sep 17 00:00:00 2001 From: Yao Wang Date: Thu, 19 Jan 2012 20:39:47 +0800 Subject: avcodec/cavs: fix B_SUB_DIRECT col-MB is Intra MB case. in this case current MB size is forced to 16x16 (AVS standard section 9.9.1) Signed-off-by: Yao Wang Fixes Ticket 1901 Signed-off-by: Michael Niedermayer --- libavcodec/cavs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/cavs.c') diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 7e162a8071..96acef2381 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -573,7 +573,7 @@ void ff_cavs_mv(AVSContext *h, enum cavs_mv_loc nP, enum cavs_mv_loc nC, mvP->ref = ref; mvP->dist = h->dist[mvP->ref]; - if (mvC->ref == NOT_AVAIL) + if (mvC->ref == NOT_AVAIL || (nP == MV_FWD_X3) || (nP == MV_BWD_X3 )) mvC = &h->mv[nP - 5]; // set to top-left (mvD) if (mode == MV_PRED_PSKIP && (mvA->ref == NOT_AVAIL || -- cgit v1.2.3