Merge commit '20429ba96e55db17ac57f6c0e330914287f1f614'

* commit '20429ba96e55db17ac57f6c0e330914287f1f614':
  h261: Move encoder/decoder shared table init to common code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-04-11 14:48:21 +02:00
4 changed files with 14 additions and 7 deletions

View File

@@ -62,7 +62,6 @@ static av_cold void h261_decode_init_vlc(H261Context *h)
INIT_VLC_STATIC(&h261_cbp_vlc, H261_CBP_VLC_BITS, 63,
&ff_h261_cbp_tab[0][1], 2, 1,
&ff_h261_cbp_tab[0][0], 2, 1, 512);
ff_init_rl(&ff_h261_rl_tcoeff, ff_h261_rl_table_store);
INIT_VLC_RL(ff_h261_rl_tcoeff, 552);
}
}
@@ -83,6 +82,7 @@ static av_cold int h261_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
s->codec_id = avctx->codec->id;
ff_h261_common_init();
h261_decode_init_vlc(h);
h->gob_start_code_skipped = 0;