From: Kostya Shishkov Date: Fri, 24 Apr 2009 14:09:24 +0000 (+0000) Subject: Remove useless assignment during initialization for some decoders X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1c86db80a94a00e02716831268461ee7f490f157;p=ffmpeg Remove useless assignment during initialization for some decoders Originally committed as revision 18680 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index daabb2cd306..46f64f7e9e2 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -52,7 +52,6 @@ static av_cold int aasc_decode_init(AVCodecContext *avctx) s->avctx = avctx; avctx->pix_fmt = PIX_FMT_BGR24; - s->frame.data[0] = NULL; return 0; } diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 81fa5d5c884..da1bf0dd723 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -63,7 +63,6 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt= PIX_FMT_NONE; /* set in decode_frame */ s->avctx = avctx; - s->frame.data[0] = NULL; s->tmpbuf = NULL; dsputil_init(&s->dsp, avctx); diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index a3389da1add..6ac388f9a24 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -346,8 +346,6 @@ static av_cold int decode_init(AVCodecContext * avctx) c->avctx = avctx; - c->pic.data[0] = NULL; - if (avctx->width > 320 || avctx->height > 200) { av_log(avctx, AV_LOG_ERROR, "KMVC supports frames <= 320x200\n"); return -1; diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index 64ab74b2b2c..20f166329d9 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -291,7 +291,6 @@ static av_cold int decode_init(AVCodecContext *avctx){ a->avctx = avctx; avctx->pix_fmt= PIX_FMT_PAL8; - a->pic.data[0] = NULL; a->refdata = av_malloc(avctx->width * avctx->height); return 0; diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index fca693add47..3b3d03e7e40 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -514,8 +514,6 @@ static av_cold int decode_init(AVCodecContext *avctx) c->avctx = avctx; - c->pic.data[0] = NULL; - if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { return 1; } diff --git a/libavcodec/targa.c b/libavcodec/targa.c index 10b1aa47f25..633a6961c18 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -229,7 +229,6 @@ static av_cold int targa_init(AVCodecContext *avctx){ avcodec_get_frame_defaults((AVFrame*)&s->picture); avctx->coded_frame= (AVFrame*)&s->picture; - s->picture.data[0] = NULL; return 0; } diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 78051933c9c..2768590423f 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -512,7 +512,6 @@ static av_cold int tiff_init(AVCodecContext *avctx){ s->avctx = avctx; avcodec_get_frame_defaults((AVFrame*)&s->picture); avctx->coded_frame= (AVFrame*)&s->picture; - s->picture.data[0] = NULL; ff_lzw_decode_open(&s->lzw); ff_ccitt_unpack_init(); diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 8e5edbd6083..d1a924da400 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -139,7 +139,6 @@ static av_cold int decode_init(AVCodecContext *avctx) c->avctx = avctx; - c->pic.data[0] = NULL; c->height = avctx->height; if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index 2c24355a5fe..13567b6bf81 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -359,8 +359,6 @@ static av_cold int vmdvideo_decode_init(AVCodecContext *avctx) palette32[i] = (r << 16) | (g << 8) | (b); } - s->frame.data[0] = s->prev_frame.data[0] = NULL; - return 0; } diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index fb78449d285..4874caf7dcd 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -465,7 +465,6 @@ static av_cold int decode_init(AVCodecContext *avctx) c->avctx = avctx; - c->pic.data[0] = NULL; c->width = avctx->width; c->height = avctx->height; diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 7b3c7dd3f6d..f150a866399 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -599,7 +599,6 @@ static av_cold int decode_init(AVCodecContext *avctx) c->avctx = avctx; - c->pic.data[0] = NULL; c->width = avctx->width; c->height = avctx->height; diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index 1bad57d958d..d45bbe26686 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -251,7 +251,6 @@ static av_cold int encode_init(AVCodecContext *avctx) c->avctx = avctx; - c->pic.data[0] = NULL; c->curfrm = 0; c->keyint = avctx->keyint_min; c->range = 8;