virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

h264: ff_init_cabac_states doesnt use its argument thus remove it

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-26 05:44:46 +02:00
parent c684cb29bc
commit bfb39023b0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/cabac.c
View File

@ -137,7 +137,7 @@ 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(){
int i, j; int i, j;
for(i=0; i<64; i++){ for(i=0; i<64; i++){
@ -271,7 +271,7 @@ int main(void){
av_lfg_init(&prng, 1); av_lfg_init(&prng, 1);
ff_init_cabac_encoder(&c, b, SIZE); ff_init_cabac_encoder(&c, b, SIZE);
ff_init_cabac_states(&c); ff_init_cabac_states();
for(i=0; i<SIZE; i++){ for(i=0; i<SIZE; i++){
if(2*i<SIZE) r[i] = av_lfg_get(&prng) % 7; if(2*i<SIZE) r[i] = av_lfg_get(&prng) % 7;

2
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 */

2
libavcodec/h264.c
View File

@ -3536,7 +3536,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg)
align_get_bits(&s->gb); align_get_bits(&s->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,
s->gb.buffer + get_bits_count(&s->gb) / 8, s->gb.buffer + get_bits_count(&s->gb) / 8,
(get_bits_left(&s->gb) + 7) / 8); (get_bits_left(&s->gb) + 7) / 8);