diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-02-17 18:57:50 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-02-17 18:57:50 +0000 |
| commit | da16b2043fa8272b34a785a4030a7ff5970d08fc (patch) | |
| tree | 4512cc19d20377d374b5fa8bcfa0fbac4b4bde84 /libavcodec/mpegvideo.c | |
| parent | e6dc9c6f99a886bee0399dfe47c2b0f5afff80e5 (diff) | |
| download | ffmpeg-da16b2043fa8272b34a785a4030a7ff5970d08fc.tar.gz | |
noise reduction with threads bugfix
Originally committed as revision 2789 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f0cd28c73d..db46596862 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -463,6 +463,8 @@ static void backup_duplicate_context(MpegEncContext *bak, MpegEncContext *src){ COPY(me.map_generation); COPY(pb); COPY(dct_error_sum); + COPY(dct_count[0]); + COPY(dct_count[1]); #undef COPY } @@ -743,7 +745,6 @@ void MPV_common_end(MpegEncContext *s) av_freep(&s->q_inter_matrix16); av_freep(&s->input_picture); av_freep(&s->reordered_input_picture); - av_freep(&s->dct_error_sum); av_freep(&s->dct_offset); if(s->picture){ @@ -3739,7 +3740,7 @@ void ff_mpeg_flush(AVCodecContext *avctx){ #ifdef CONFIG_ENCODERS void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length) { - const uint16_t *srcw= src; + const uint16_t *srcw= (uint16_t*)src; int words= length>>4; int bits= length&15; int i; |