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

@@ -48,7 +48,6 @@
 #include "thread.h"
 #include "vdpau_internal.h"
 
-// #undef NDEBUG
 #include <assert.h>
 
 const uint16_t ff_h264_mb_sizes[4] = { 256, 384, 512, 768 };

libavcodec/h264_direct.c

@@ -32,7 +32,6 @@
 #include "rectangle.h"
 #include "thread.h"
 
-//#undef NDEBUG
 #include <assert.h>
 
 

libavcodec/h264_ps.c

@@ -33,7 +33,6 @@
 #include "golomb.h"
 
 
-//#undef NDEBUG
 #include <assert.h>
 
 #define MAX_LOG2_MAX_FRAME_NUM    (12 + 4)

libavcodec/h264_refs.c

@@ -31,7 +31,6 @@
 #include "h264.h"
 #include "golomb.h"
 
-//#undef NDEBUG
 #include <assert.h>
 
 #define COPY_PICTURE(dst, src) \

libavcodec/h264_sei.c

@@ -30,7 +30,6 @@
 #include "h264.h"
 #include "golomb.h"
 
-//#undef NDEBUG
 #include <assert.h>
 
 static const uint8_t sei_num_clock_ts_table[9] = {