diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-03-16 20:22:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-03-16 20:22:22 +0000 |
| commit | b536d0aad2750d3a5f24520fccf1e48a46cad53b (patch) | |
| tree | ef8d69520065d3c1009481e77b0ff8fd64b58959 /libavcodec/utils.c | |
| parent | 1c6dcb0f420c747b263d5c17641ae9c216c2e9de (diff) | |
| download | ffmpeg-b536d0aad2750d3a5f24520fccf1e48a46cad53b.tar.gz | |
field pic decoding cleanup
Originally committed as revision 1686 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 29efd04c38..a8577be086 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -192,9 +192,9 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){ memset(pic->base[i], 128, pic->linesize[i]*h>>v_shift); if(s->flags&CODEC_FLAG_EMU_EDGE) - pic->data[i] = pic->base[i] + 16; //FIXME 16 + pic->data[i] = pic->base[i]; else - pic->data[i] = pic->base[i] + (pic->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift) + 16; //FIXME 16 + pic->data[i] = pic->base[i] + (pic->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift); opaque->data[i]= pic->data[i]; } @@ -581,7 +581,7 @@ void avcodec_flush_buffers(AVCodecContext *avctx) || s->picture[i].type == FF_BUFFER_TYPE_USER)) avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]); } - s->last_picture.data[0] = s->next_picture.data[0] = NULL; + s->last_picture_ptr = s->next_picture_ptr = NULL; break; default: //FIXME |