diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 14:48:21 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 14:48:27 +0200 |
commit | 5ec016ad0b29beecc663fbc746b10a970cf341d2 (patch) | |
tree | da4c2a4963ecc41af9afa18a82a4e014e161f8db /libavcodec/h261dec.c | |
parent | ab4afcb85b3ac23da3bce7fd9bc70d11b8bb28a4 (diff) | |
parent | 20429ba96e55db17ac57f6c0e330914287f1f614 (diff) | |
download | ffmpeg-5ec016ad0b29beecc663fbc746b10a970cf341d2.tar.gz |
Merge commit '20429ba96e55db17ac57f6c0e330914287f1f614'
* commit '20429ba96e55db17ac57f6c0e330914287f1f614':
h261: Move encoder/decoder shared table init to common code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261dec.c')
-rw-r--r-- | libavcodec/h261dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 3341522bc1..8ed16bd4b1 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -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; |