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 /libavcodec/h264.c | |
| 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>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 0 insertions, 1 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 }; |