diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 11:18:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 11:18:43 +0200 |
| commit | 58e12732dbab77fe06b861dcbdc712c5fa065bbd (patch) | |
| tree | 2115478067f320c6bd6e4c2793c3a80905b89b62 | |
| parent | a76390d100ec85f88a7d48ddad476c4a685008f9 (diff) | |
| parent | 2a61592573d725956a4377641344afe263382648 (diff) | |
| download | ffmpeg-58e12732dbab77fe06b861dcbdc712c5fa065bbd.tar.gz | |
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>
| -rw-r--r-- | libavcodec/h264.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264_direct.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264_ps.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264_refs.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264_sei.c | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e3a71d86da..8f3e14dd5b 100644 --- a/libavcodec/h264.c +++ b/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 }; diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 2d93c2ab60..477359c8ff 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -32,7 +32,6 @@ #include "rectangle.h" #include "thread.h" -//#undef NDEBUG #include <assert.h> diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index a4555455ac..03f8408f60 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -33,7 +33,6 @@ #include "golomb.h" -//#undef NDEBUG #include <assert.h> #define MAX_LOG2_MAX_FRAME_NUM (12 + 4) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 8f6262a37b..7dffa9b928 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -31,7 +31,6 @@ #include "h264.h" #include "golomb.h" -//#undef NDEBUG #include <assert.h> #define COPY_PICTURE(dst, src) \ diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index b1c6499e61..d5e8a4f785 100644 --- a/libavcodec/h264_sei.c +++ b/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] = { |