Browse Source

cabac: remove unused argument of ff_init_cabac_states()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
tags/n2.0
Michael Niedermayer Anton Khirnov 13 years ago
parent
commit
0fe4b48540
3 changed files with 4 additions and 3 deletions
  1. +2
    -1
      libavcodec/cabac.c
  2. +1
    -1
      libavcodec/cabac.h
  3. +1
    -1
      libavcodec/h264.c

+ 2
- 1
libavcodec/cabac.c View File

@@ -136,7 +136,8 @@ void ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size){
c->range= 0x1FE; c->range= 0x1FE;
} }


void ff_init_cabac_states(CABACContext *c){
void ff_init_cabac_states(void)
{
int i, j; int i, j;


for(i=0; i<64; i++){ for(i=0; i<64; i++){


+ 1
- 1
libavcodec/cabac.h View File

@@ -51,6 +51,6 @@ typedef struct CABACContext{


void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size); void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size);
void ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size); void ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size);
void ff_init_cabac_states(CABACContext *c);
void ff_init_cabac_states(void);


#endif /* AVCODEC_CABAC_H */ #endif /* AVCODEC_CABAC_H */

+ 1
- 1
libavcodec/h264.c View File

@@ -4111,7 +4111,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg)
align_get_bits(&h->gb); align_get_bits(&h->gb);


/* init cabac */ /* init cabac */
ff_init_cabac_states(&h->cabac);
ff_init_cabac_states();
ff_init_cabac_decoder(&h->cabac, ff_init_cabac_decoder(&h->cabac,
h->gb.buffer + get_bits_count(&h->gb) / 8, h->gb.buffer + get_bits_count(&h->gb) / 8,
(get_bits_left(&h->gb) + 7) / 8); (get_bits_left(&h->gb) + 7) / 8);


Loading…
Cancel
Save