[FFmpeg-cvslog] h264: fix init of topleft ref/mv.

Michael Niedermayer git at videolan.org
Wed Dec 28 02:21:02 CET 2011


ffmpeg | branch: release/0.6 | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 17 04:42:04 2011 +0100| [e1a2bcbec84eb687d0636a149e8f7f97069a4240] | committer: Carl Eugen Hoyos

h264: fix init of topleft ref/mv.
Fixes Ticket778

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 680880c98db2817437e19c3fc7f6349261bbbbb0)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1a2bcbec84eb687d0636a149e8f7f97069a4240
---

 libavcodec/h264.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index c6563af..72bc390 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);



More information about the ffmpeg-cvslog mailing list