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)
* 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>
1  2 
libavcodec/h264.c
libavcodec/h264_direct.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/h264_sei.c

@@@ -46,9 -43,7 +46,8 @@@
  #include "rectangle.h"
  #include "svq3.h"
  #include "thread.h"
 +#include "vdpau_internal.h"
  
- // #undef NDEBUG
  #include <assert.h>
  
  const uint16_t ff_h264_mb_sizes[4] = { 256, 384, 512, 768 };
Simple merge
Simple merge
Simple merge
Simple merge