Commit 03b97722 authored by michael's avatar michael

uninitalized variables fix by (Gildas Bazin <gbazin at altern dot org>)

and some related cleanup by me


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2677 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 620ee0f7
...@@ -483,7 +483,7 @@ static void do_video_out(AVFormatContext *s, ...@@ -483,7 +483,7 @@ static void do_video_out(AVFormatContext *s,
int nb_frames, i, ret; int nb_frames, i, ret;
AVPicture *final_picture, *formatted_picture; AVPicture *final_picture, *formatted_picture;
AVPicture picture_format_temp, picture_crop_temp; AVPicture picture_format_temp, picture_crop_temp;
static uint8_t *video_buffer; static uint8_t *video_buffer= NULL;
uint8_t *buf = NULL, *buf1 = NULL; uint8_t *buf = NULL, *buf1 = NULL;
AVCodecContext *enc, *dec; AVCodecContext *enc, *dec;
enum PixelFormat target_pixfmt; enum PixelFormat target_pixfmt;
......
...@@ -1737,6 +1737,7 @@ static int mpeg_decode_init(AVCodecContext *avctx) ...@@ -1737,6 +1737,7 @@ static int mpeg_decode_init(AVCodecContext *avctx)
{ {
Mpeg1Context *s = avctx->priv_data; Mpeg1Context *s = avctx->priv_data;
s->mpeg_enc_ctx.avctx= avctx;
s->mpeg_enc_ctx.flags= avctx->flags; s->mpeg_enc_ctx.flags= avctx->flags;
common_init(&s->mpeg_enc_ctx); common_init(&s->mpeg_enc_ctx);
init_vlcs(); init_vlcs();
...@@ -2372,7 +2373,6 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, ...@@ -2372,7 +2373,6 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
s->width = width; s->width = width;
s->height = height; s->height = height;
avctx->has_b_frames= 1; avctx->has_b_frames= 1;
s->avctx = avctx;
avctx->width = width; avctx->width = width;
avctx->height = height; avctx->height = height;
av_reduce( av_reduce(
...@@ -2474,7 +2474,6 @@ static int vcr2_init_sequence(AVCodecContext *avctx) ...@@ -2474,7 +2474,6 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
s->height = avctx->height; s->height = avctx->height;
avctx->has_b_frames= 0; //true? avctx->has_b_frames= 0; //true?
s->low_delay= 1; s->low_delay= 1;
s->avctx = avctx;
//get_format() or set_video(width,height,aspect,pix_fmt); //get_format() or set_video(width,height,aspect,pix_fmt);
//until then pix_fmt may be changed right after codec init //until then pix_fmt may be changed right after codec init
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment