diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-24 00:45:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-24 00:45:02 +0100 |
| commit | bba6f5b77f69e0b7fb00b3f346422715fc602f55 (patch) | |
| tree | 3b1a17486c377e86daf4141e7900676fe6461332 /libavcodec/4xm.c | |
| parent | ad9e0ed170234bc6c5660f96752777965081163e (diff) | |
| parent | 8b94df0f2047e9728cb872adc9e64557b7a5152f (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp3dec: Check coefficient index in vp3_dequant()
svq1dec: call avcodec_set_dimensions() after dimensions changed.
Prepare for 0.8_beta1 snapshot release
threads: check defines before using them in automatic thread detection
pthread: include sys/types.h before sys/sysctl.h
4xm: remove unused variables.
h264: Fix a possible overread in decode_nal_units()
allfilters: fix type of avfilter_vsrc_buffer.
w32thread: call ResetEvent() in pthread_cond_broadcast().
Conflicts:
Changelog
RELEASE
doc/RELEASE_NOTES
libavcodec/pthread.c
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 5dcb6d8276..e57ce90df6 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -682,8 +682,6 @@ static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length){ int x, y; const int width= f->avctx->width; const int height= f->avctx->height; - uint16_t *dst= (uint16_t*)f->current_picture.data[0]; - const int stride= f->current_picture.linesize[0]>>1; const unsigned int bitstream_size= AV_RL32(buf); unsigned int prestream_size; const uint8_t *prestream; @@ -726,7 +724,6 @@ static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length){ idct_put(f, x, y); } - dst += 16*stride; } if(get_vlc2(&f->pre_gb, f->pre_vlc.table, ACDC_VLC_BITS, 3) != 256) |