generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '2a61592573d725956a4377641344afe263382648'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-08-21 11:18:43 +02:00
commit 58e12732db
5 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/h264.c
View File

@ -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 };

1
libavcodec/h264_direct.c
View File

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

1
libavcodec/h264_ps.c
View File

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

1
libavcodec/h264_refs.c
View File

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

1
libavcodec/h264_sei.c
View File

@ -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] = {