[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec wmv2.c,1.32,1.33
Michael Niedermayer CVS
michael
Sun May 8 15:04:49 CEST 2005
Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv6421
Modified Files:
wmv2.c
Log Message:
fix block corruption caused by clear_blocks() optimization
Index: wmv2.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/wmv2.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- wmv2.c 30 Apr 2005 21:43:57 -0000 1.32
+++ wmv2.c 8 May 2005 13:04:46 -0000 1.33
@@ -587,11 +587,10 @@
static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n){
MpegEncContext * const s= &w->s;
+ if (s->block_last_index[n] >= 0) {
switch(w->abt_type_table[n]){
case 0:
- if (s->block_last_index[n] >= 0) {
- s->dsp.idct_add (dst, stride, block1);
- }
+ s->dsp.idct_add (dst, stride, block1);
break;
case 1:
simple_idct84_add(dst , stride, block1);
@@ -606,6 +605,7 @@
default:
av_log(s->avctx, AV_LOG_ERROR, "internal error in WMV2 abt\n");
}
+ }
}
void ff_wmv2_add_mb(MpegEncContext *s, DCTELEM block1[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr){
More information about the ffmpeg-cvslog
mailing list