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 | |
| parent | 11d62fc9bea79db02f7b44632992f4a10448ec6a (diff) | |
| parent | 5b3c1aecb253828d09fa9825c5a4aed97badf086 (diff) | |
| download | ffmpeg-c31f07574dbca71cfcc316edcfff3425e60ef245.tar.gz | |
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>
| -rw-r--r-- | libavcodec/cabac.c | 3 | ||||
| -rw-r--r-- | libavfilter/vf_hqdn3d.c | 7 |
2 files changed, 6 insertions, 4 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++){ diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index 5b6800c893..8169cc747e 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -37,9 +37,10 @@ #include "vf_hqdn3d.h" #define LUT_BITS (depth==16 ? 8 : 4) -#define LOAD(x) (((depth==8 ? src[x] : AV_RN16A(src+(x)*2)) << (16-depth)) + (((1<<(16-depth))-1)>>1)) -#define STORE(x,val) (depth==8 ? dst[x] = (val) >> (16-depth)\ - : AV_WN16A(dst+(x)*2, (val) >> (16-depth))) +#define LOAD(x) (((depth == 8 ? src[x] : AV_RN16A(src + (x) * 2)) << (16 - depth))\ + + (((1 << (16 - depth)) - 1) >> 1)) +#define STORE(x,val) (depth == 8 ? dst[x] = (val) >> (16 - depth) : \ + AV_WN16A(dst + (x) * 2, (val) >> (16 - depth))) av_always_inline static uint32_t lowpass(int prev, int cur, int16_t *coef, int depth) |