aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/bethsoftvideo.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-13 14:49:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-13 14:49:00 +0100
commitc31f07574dbca71cfcc316edcfff3425e60ef245 (patch)
treec9ab29bf4e0d2a95aba0ee75a3aa618069e30eb4 /libavcodec/bethsoftvideo.c
parent11d62fc9bea79db02f7b44632992f4a10448ec6a (diff)
parent5b3c1aecb253828d09fa9825c5a4aed97badf086 (diff)
downloadffmpeg-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>
Diffstat (limited to 'libavcodec/bethsoftvideo.c')
0 files changed, 0 insertions, 0 deletions