# HG changeset patch # User michaelni # Date 1059090285 0 # Node ID 326852ff8fee4efa8c105ad9d11e01bffd53e47d # Parent 5d2435fb733d81af5d8ca577dc3512850a3be2da vcr2 cleanup diff -r 5d2435fb733d -r 326852ff8fee mpeg12.c --- a/mpeg12.c Thu Jul 24 23:32:12 2003 +0000 +++ b/mpeg12.c Thu Jul 24 23:44:45 2003 +0000 @@ -929,7 +929,7 @@ case I_TYPE: if (get_bits1(&s->gb) == 0) { if (get_bits1(&s->gb) == 0){ - fprintf("invalid mb type in I Frame at %d %d\n", s->mb_x, s->mb_y); + fprintf(stderr, "invalid mb type in I Frame at %d %d\n", s->mb_x, s->mb_y); return -1; } mb_type = MB_TYPE_QUANT | MB_TYPE_INTRA; @@ -2154,8 +2154,7 @@ { Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; - int i, v, j; - float aspect; + int i, v; /* start new mpeg1 context decoding */ s->out_format = FMT_MPEG1; @@ -2182,13 +2181,12 @@ s->chroma_inter_matrix[j] = v; } - /* we set mpeg2 parameters so that it emulates mpeg1 */ s->progressive_sequence = 1; s->progressive_frame = 1; s->picture_structure = PICT_FRAME; s->frame_pred_frame_dct = 1; s->mpeg2 = 1; - avctx->sub_id = 2; /* indicates mpeg1 */ + avctx->sub_id = 2; /* indicates mpeg2 */ return 0; }