[SCM] libav/experimental: 10l

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:39:30 UTC 2013


The following commit has been merged in the experimental branch:
commit 1da57984e64f212abf415f3e4e3a589c935e5745
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Mar 11 13:22:39 2004 +0000

    10l
    
    Originally committed as revision 2871 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index f524377..7d6c2d3 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -2429,7 +2429,7 @@ if(s->quarter_sample)
                              src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos);
             ptr_y = s->edge_emu_buffer;
             if(!(s->flags&CODEC_FLAG_GRAY)){
-                uint8_t *uvbuf= s->edge_emu_buffer+17*s->linesize;
+                uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize;
                 ff_emulated_edge_mc(uvbuf  , ptr_cb, s->uvlinesize, 9, 9+field_based, 
                                  uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
                 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based, 
@@ -2592,7 +2592,7 @@ static inline void qpel_motion(MpegEncContext *s,
                          src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos);
         ptr_y= s->edge_emu_buffer;
         if(!(s->flags&CODEC_FLAG_GRAY)){
-            uint8_t *uvbuf= s->edge_emu_buffer + 17*s->linesize;
+            uint8_t *uvbuf= s->edge_emu_buffer + 18*s->linesize;
             ff_emulated_edge_mc(uvbuf, ptr_cb, s->uvlinesize, 9, 9 + field_based, 
                              uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
             ff_emulated_edge_mc(uvbuf + 16, ptr_cr, s->uvlinesize, 9, 9 + field_based, 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list