X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmsmpeg4.c;h=8997f6d0544dc470528ad8c47da569f97fa4635e;hb=971701d4fc01ff756c41f3fd451fe776e7ec94f4;hp=5ed03c4ddf2306a1580659c3f4304c7bfe22ff98;hpb=60b54e4b9fac8519bb68501b73ac0efbcce5cff0;p=ffmpeg diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 5ed03c4ddf2..8997f6d0544 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -1,5 +1,5 @@ /* - * MSMPEG4 backend for ffmpeg encoder and decoder + * MSMPEG4 backend for encoder and decoder * Copyright (c) 2001 Fabrice Bellard * Copyright (c) 2002-2004 Michael Niedermayer * @@ -24,7 +24,7 @@ /** * @file - * MSMPEG4 backend for ffmpeg encoder and decoder. + * MSMPEG4 backend for encoder and decoder */ #include "avcodec.h" @@ -62,10 +62,6 @@ static uint32_t v2_dc_chroma_table[512][2]; /* vc1 externs */ extern const uint8_t wmv3_dc_scale_table[32]; -#ifdef DEBUG -int frame_count = 0; -#endif - #include "msmpeg4data.h" #if CONFIG_ENCODERS //strangely gcc includes this even if it is not referenced @@ -355,7 +351,7 @@ void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number) { find_best_tables(s); - align_put_bits(&s->pb); + avpriv_align_put_bits(&s->pb); put_bits(&s->pb, 2, s->pict_type - 1); put_bits(&s->pb, 5, s->qscale);