[SCM] libav/upstream.snapshot: indeo: check for reference when inheriting mvs

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Jul 13 06:29:06 UTC 2013


The following commit has been merged in the upstream.snapshot branch:
commit 5f7944a308df69619315a18e0a6c2661c7346990
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Sun Jun 30 10:40:37 2013 +0200

    indeo: check for reference when inheriting mvs
    
    The same is done already for qdelta.
    
    Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    CC: libav-stable at libav.org
    (cherry picked from commit b36e1893ef3430f039c1eaddeedcbb378f9c4444)
    
    Signed-off-by: Reinhard Tartler <siretart at tauware.de>

diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index 9628728..956bbb1 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -599,7 +599,7 @@ static int ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band,
             if (band->inherit_qdelta && ref_mb)
                 mb->q_delta = ref_mb->q_delta;
 
-            if (band->inherit_mv) {
+            if (band->inherit_mv && ref_mb) {
                 /* motion vector inheritance */
                 if (mv_scale) {
                     mb->mv_x = ivi_scale_mv(ref_mb->mv_x, mv_scale);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list