diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 14:49:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 14:49:00 +0100 |
| commit | c31f07574dbca71cfcc316edcfff3425e60ef245 (patch) | |
| tree | c9ab29bf4e0d2a95aba0ee75a3aa618069e30eb4 /libavcodec/cabac.c | |
| parent | 11d62fc9bea79db02f7b44632992f4a10448ec6a (diff) | |
| parent | 5b3c1aecb253828d09fa9825c5a4aed97badf086 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hqdn3d: Fix out of array read in LOWPASS
cabac: remove unused argument of ff_init_cabac_states()
rawdec: fix a typo -- || instead of |
Conflicts:
libavcodec/cabac.c
libavcodec/h264.c
libavfilter/vf_hqdn3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cabac.c')
| -rw-r--r-- | libavcodec/cabac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index 385721fe1d..187b7dc445 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -137,7 +137,8 @@ void ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size){ c->range= 0x1FE; } -void ff_init_cabac_states(){ +void ff_init_cabac_states(void) +{ int i, j; for(i=0; i<64; i++){ |