From 303aebf97a1537185aa47f262eb9d756b0e315a7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 8 Jan 2004 18:44:36 +0000 Subject: [PATCH] uninitalized variables fix by (Gildas Bazin ) and some related cleanup by me Originally committed as revision 2677 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 2 +- libavcodec/mpeg12.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index c603ba1..f0d49fa 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -483,7 +483,7 @@ static void do_video_out(AVFormatContext *s, int nb_frames, i, ret; AVPicture *final_picture, *formatted_picture; AVPicture picture_format_temp, picture_crop_temp; - static uint8_t *video_buffer; + static uint8_t *video_buffer= NULL; uint8_t *buf = NULL, *buf1 = NULL; AVCodecContext *enc, *dec; enum PixelFormat target_pixfmt; diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 5d88e33..720165b 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1737,6 +1737,7 @@ static int mpeg_decode_init(AVCodecContext *avctx) { Mpeg1Context *s = avctx->priv_data; + s->mpeg_enc_ctx.avctx= avctx; s->mpeg_enc_ctx.flags= avctx->flags; common_init(&s->mpeg_enc_ctx); init_vlcs(); @@ -2372,7 +2373,6 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, s->width = width; s->height = height; avctx->has_b_frames= 1; - s->avctx = avctx; avctx->width = width; avctx->height = height; av_reduce( @@ -2474,7 +2474,6 @@ static int vcr2_init_sequence(AVCodecContext *avctx) s->height = avctx->height; avctx->has_b_frames= 0; //true? s->low_delay= 1; - s->avctx = avctx; //get_format() or set_video(width,height,aspect,pix_fmt); //until then pix_fmt may be changed right after codec init -- 2.7.4