diff options
author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-12-06 01:55:32 +0000 |
---|---|---|
committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-12-06 01:55:32 +0000 |
commit | 6109b56de74cfcda6321fcd5e37cac988734119c (patch) | |
tree | 29c91c901481a67a7a9e6d3c3b2f122fc919efa2 /src/libffmpeg/libavcodec/msmpeg4.c | |
parent | 4ae936639132b75872ee84444c59d1914cc2292d (diff) | |
download | xine-lib-6109b56de74cfcda6321fcd5e37cac988734119c.tar.gz xine-lib-6109b56de74cfcda6321fcd5e37cac988734119c.tar.bz2 |
- sync with ffmpeg (that must fix heiko stream, thanks Michael Niedermayer)
- improve ffmpeg support (passing extra data)
- aspect ratio still need to be updated to new syntax
- use our svq1 decoder since ffmpeg one is segfaulting
(buffer overrun - more investigation needed)
- img->copy no more
CVS patchset: 3437
CVS date: 2002/12/06 01:55:32
Diffstat (limited to 'src/libffmpeg/libavcodec/msmpeg4.c')
-rw-r--r-- | src/libffmpeg/libavcodec/msmpeg4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/msmpeg4.c b/src/libffmpeg/libavcodec/msmpeg4.c index f1746b4f6..76fa3c2d4 100644 --- a/src/libffmpeg/libavcodec/msmpeg4.c +++ b/src/libffmpeg/libavcodec/msmpeg4.c @@ -759,10 +759,10 @@ static inline int msmpeg4_pred_dc(MpegEncContext * s, int n, }else{ if(n<4){ wrap= s->linesize; - dest= s->current_picture[0] + (((n>>1) + 2*s->mb_y) * 8* wrap ) + ((n&1) + 2*s->mb_x) * 8; + dest= s->current_picture.data[0] + (((n>>1) + 2*s->mb_y) * 8* wrap ) + ((n&1) + 2*s->mb_x) * 8; }else{ wrap= s->uvlinesize; - dest= s->current_picture[n-3] + (s->mb_y * 8 * wrap) + s->mb_x * 8; + dest= s->current_picture.data[n-3] + (s->mb_y * 8 * wrap) + s->mb_x * 8; } if(s->mb_x==0) a= (1024 + (scale>>1))/scale; else a= get_dc(dest-8, wrap, scale*8); |