Merge commit '2a61592573d725956a4377641344afe263382648'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 09:18:43 +0000 (11:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 09:18:43 +0000 (11:18 +0200)
commit58e12732dbab77fe06b861dcbdc712c5fa065bbd
tree2115478067f320c6bd6e4c2793c3a80905b89b62
parenta76390d100ec85f88a7d48ddad476c4a685008f9
parent2a61592573d725956a4377641344afe263382648
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>
libavcodec/h264.c
libavcodec/h264_direct.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/h264_sei.c