aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-17 04:42:04 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-12-28 02:20:09 +0100
commite1a2bcbec84eb687d0636a149e8f7f97069a4240 (patch)
tree3341a6311799e57621146a87304a4195c641e637 /libavcodec
parentd32ea79ea2afdca9f7a3979dc4294b5275d410be (diff)
downloadffmpeg-e1a2bcbec84eb687d0636a149e8f7f97069a4240.tar.gz
h264: fix init of topleft ref/mv.
Fixes Ticket778 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 680880c98db2817437e19c3fc7f6349261bbbbb0)
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index c6563af35e..72bc390ce5 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -1048,7 +1048,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){
AV_ZERO32(h->mv_cache [list][scan8[0] + 4 - 1*8]);
h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE;
}
- if(h->ref_cache[list][scan8[0] + 4 - 1*8] < 0){
+ if(h->ref_cache[list][scan8[0] + 2 - 1*8] < 0 || h->ref_cache[list][scan8[0] + 4 - 1*8] < 0){
if(USES_LIST(topleft_type, list)){
const int b_xy = h->mb2b_xy [topleft_xy] + 3 + h->b_stride + (h->topleft_partition & 2*h->b_stride);
const int b8_xy= 4*topleft_xy + 1 + (h->topleft_partition & 2);