[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Wed Mar 13 14:53:09 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 14:49:00 2013 +0100| [c31f07574dbca71cfcc316edcfff3425e60ef245] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c31f07574dbca71cfcc316edcfff3425e60ef245
---





More information about the ffmpeg-cvslog mailing list