Michael Niedermayer 58e12732db Merge commit '2a61592573d725956a4377641344afe263382648' ...

* commit '2a61592573d725956a4377641344afe263382648':
  avcodec: Remove some commented-out debug cruft

Conflicts:
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mvpred.h
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-08-21 11:18:43 +02:00

26 KiB

Raw Blame History

View Raw