[FFmpeg-cvslog] Merge commit '2a61592573d725956a4377641344afe263382648'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 21 11:18:43 2013 +0200| [58e12732dbab77fe06b861dcbdc712c5fa065bbd] | committer: Michael Niedermayer

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

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