Michael Niedermayer c31f07574d 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>

2013-03-13 14:49:00 +01:00

9.0 KiB

Raw Blame History

View Raw