diff options
| author | Mike Melanson <mike@multimedia.cx> | 2005-05-28 01:40:40 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2005-05-28 01:40:40 +0000 |
| commit | 875da7c6e187d3aacaac0107deb45200286dfa7d (patch) | |
| tree | e2d712d2421af99313febe40d6e269a6e2c76dc7 /src/libffmpeg/libavcodec/wmv2.c | |
| parent | 59167cc289f66b54b862c2001c1a6a6c4e8f86d0 (diff) | |
| download | xine-lib-875da7c6e187d3aacaac0107deb45200286dfa7d.tar.gz xine-lib-875da7c6e187d3aacaac0107deb45200286dfa7d.tar.bz2 | |
sync to libavcodec build 4755
CVS patchset: 7567
CVS date: 2005/05/28 01:40:40
Diffstat (limited to 'src/libffmpeg/libavcodec/wmv2.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/wmv2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libffmpeg/libavcodec/wmv2.c b/src/libffmpeg/libavcodec/wmv2.c index 949d7c640..cbe5de215 100644 --- a/src/libffmpeg/libavcodec/wmv2.c +++ b/src/libffmpeg/libavcodec/wmv2.c @@ -587,11 +587,10 @@ static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n, 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 @@ static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int st 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){ |