---
ffplay.c | 5 -----
libavcodec/asv1.c | 11 -----------
libavcodec/dct-test.c | 32 --------------------------------
libavcodec/dsputil.c | 7 -------
libavcodec/h263dec.c | 8 --------
libavcodec/h264.c | 10 ----------
libavcodec/huffyuv.c | 5 -----
libavcodec/motion_est.c | 4 ----
libavcodec/motion_est_template.c | 35 -----------------------------------
libavcodec/mpeg12enc.c | 4 ----
libavcodec/mpegaudioenc.c | 30 ------------------------------
libavcodec/mpegvideo_parser.c | 4 ----
libavcodec/msmpeg4.c | 20 --------------------
libavcodec/parser.c | 14 --------------
libavcodec/ratecontrol.c | 8 --------
libavcodec/resample2.c | 7 -------
libavcodec/rv10.c | 17 -----------------
libavcodec/svq1dec.c | 13 -------------
libavcodec/wma.c | 10 ----------
libavcodec/wmadec.c | 9 ---------
libavcodec/wmv2dec.c | 14 --------------
libavcodec/x86/dsputil_mmx.c | 15 ---------------
libavdevice/v4l.c | 10 +---------
libavformat/ffmdec.c | 3 ---
libavformat/mpeg.c | 4 ----
libavformat/mpegenc.c | 9 ---------
libavformat/mpegts.c | 7 -------
libavformat/oggdec.c | 20 --------------------
libavformat/rmdec.c | 9 ---------
libavformat/utils.c | 17 -----------------
30 files changed, 1 insertions(+), 360 deletions(-)
diff --git a/ffplay.c b/ffplay.c
index 18010ef..70ed2f7 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2028,11 +2028,6 @@ static int synchronize_audio(VideoState *is, short
*samples,
samples_size = wanted_size;
}
}
-#if 0
- printf("diff=%f adiff=%f sample_diff=%d apts=%0.3f vpts=%0.3f
%f\n",
- diff, avg_diff, samples_size - samples_size1,
- is->audio_clock, is->video_clock,
is->audio_diff_threshold);
-#endif
}
} else {
/* too big difference : may be initial PTS errors, so
diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index cb07771..8171945 100644
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -450,17 +450,6 @@ static int decode_frame(AVCodecContext *avctx,
idct_put(a, mb_x, mb_y);
}
}
-#if 0
-int i;
-printf("%d %d\n", 8*buf_size, get_bits_count(&a->gb));
-for(i=get_bits_count(&a->gb); i<8*buf_size; i++){
- printf("%d", get_bits1(&a->gb));
-}
-
-for(i=0; i<s->avctx->extradata_size; i++){
- printf("%c\n", ((uint8_t*)s->avctx->extradata)[i]);
-}
-#endif
*picture= *(AVFrame*)&a->picture;
*data_size = sizeof(AVPicture);
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index c3c376e..a6cc181 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -296,19 +296,6 @@ static void dct_error(const char *name, int is_idct,
if( abs(block[i])>maxout) maxout=abs(block[i]);
}
if(blockSumErrMax < blockSumErr) blockSumErrMax= blockSumErr;
-#if 0 // print different matrix pairs
- if(blockSumErr){
- printf("\n");
- for(i=0; i<64; i++){
- if((i&7)==0) printf("\n");
- printf("%4d ", block_org[i]);
- }
- for(i=0; i<64; i++){
- if((i&7)==0) printf("\n");
- printf("%4d ", block[i] - block1[i]);
- }
- }
-#endif
}
for(i=0; i<64; i++) sysErrMax= FFMAX(sysErrMax, FFABS(sysErr[i]));
@@ -493,25 +480,6 @@ static void idct248_error(const char *name,
if (v > err_max)
err_max = v;
}
-#if 0
- printf("ref=\n");
- for(i=0;i<8;i++) {
- int j;
- for(j=0;j<8;j++) {
- printf(" %3d", img_dest1[i*8+j]);
- }
- printf("\n");
- }
-
- printf("out=\n");
- for(i=0;i<8;i++) {
- int j;
- for(j=0;j<8;j++) {
- printf(" %3d", img_dest[i*8+j]);
- }
- printf("\n");
- }
-#endif
}
printf("%s %s: err_inf=%d\n",
1 ? "IDCT248" : "DCT248",
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index dbfc8ce..32472b1 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -3327,13 +3327,6 @@ static int hadamard8_diff8x8_c(/*MpegEncContext*/ void
*s, uint8_t *dst, uint8_t
+BUTTERFLYA(temp[8*2+i], temp[8*6+i])
+BUTTERFLYA(temp[8*3+i], temp[8*7+i]);
}
-#if 0
-static int maxi=0;
-if(sum>maxi){
- maxi=sum;
- printf("MAX:%d\n", maxi);
-}
-#endif
return sum;
}
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index afc7c90..934c952 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -552,14 +552,6 @@ retry:
s->workaround_bugs, s->lavc_build, s->xvid_build,
s->divx_version, s->divx_build,
s->divx_packed ? "p" : "");
-#if 0 // dump bits per frame / qp / complexity
-{
- static FILE *f=NULL;
- if(!f) f=fopen("rate_qp_cplx.txt", "w");
- fprintf(f, "%d %d %f\n", buf_size, s->qscale, buf_size*(double)s->qscale);
-}
-#endif
-
#if HAVE_MMX
if (s->codec_id == CODEC_ID_MPEG4 && s->xvid_build>=0 && avctx->idct_algo
== FF_IDCT_AUTO && (av_get_cpu_flags() & AV_CPU_FLAG_MMX)) {
avctx->idct_algo= FF_IDCT_XVIDMMX;
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 264afe5..a59f121 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -152,10 +152,6 @@ const uint8_t *ff_h264_decode_nal(H264Context *h, const
uint8_t *src, int *dst_l
h->nal_unit_type= src[0]&0x1F;
src++; length--;
-#if 0
- for(i=0; i<length; i++)
- printf("%2X ", src[i]);
-#endif
#if HAVE_FAST_UNALIGNED
# if HAVE_FAST_64BIT
@@ -2748,12 +2744,6 @@ static int decode_nal_units(H264Context *h, const
uint8_t *buf, int buf_size){
int next_avc= h->is_avc ? 0 : buf_size;
h->max_contexts = avctx->thread_count;
-#if 0
- int i;
- for(i=0; i<50; i++){
- av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]);
- }
-#endif
if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){
h->current_slice = 0;
if (!s->first_field)
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index 183ce0e..bdfbf88 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -352,11 +352,6 @@ static int read_huffman_tables(HYuvContext *s, const
uint8_t *src, int length){
if(generate_bits_table(s->bits[i], s->len[i])<0){
return -1;
}
-#if 0
-for(j=0; j<256; j++){
-printf("%6X, %2d, %3d\n", s->bits[i][j], s->len[i][j], j);
-}
-#endif
free_vlc(&s->vlc[i]);
init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4,
0);
}
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 8e85219..c8f40b4 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -1119,10 +1119,6 @@ void ff_estimate_p_frame_motion(MpegEncContext * s,
// pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin;
c->mc_mb_var_sum_temp += (vard+128)>>8;
-#if 0
- printf("varc=%4d avg_var=%4d (sum=%4d) vard=%4d mx=%2d my=%2d\n",
- varc, s->avg_mb_var, sum, vard, mx - xx, my - yy);
-#endif
if(mb_type){
int p_score= FFMIN(vard, varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*100);
int i_score= varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*20;
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c
index 09ec9f7..45e87a0 100644
--- a/libavcodec/motion_est_template.c
+++ b/libavcodec/motion_est_template.c
@@ -632,25 +632,6 @@ static int funny_diamond_search(MpegEncContext * s, int
*best, int dmin,
if(x!=best[0] || y!=best[1])
dia_size=0;
-#if 0
-{
-int dx, dy, i;
-static int stats[8*8];
-dx= FFABS(x-best[0]);
-dy= FFABS(y-best[1]);
-if(dy>dx){
- dx^=dy; dy^=dx; dx^=dy;
-}
-stats[dy*8 + dx] ++;
-if(256*256*256*64 % (stats[0]+1)==0){
- for(i=0; i<64; i++){
- if((i&7)==0) printf("\n");
- printf("%8d ", stats[i]);
- }
- printf("\n");
-}
-}
-#endif
}
return dmin;
}
@@ -983,22 +964,6 @@ static int var_diamond_search(MpegEncContext * s, int
*best, int dmin,
if(x!=best[0] || y!=best[1])
dia_size=0;
-#if 0
-{
-int dx, dy, i;
-static int stats[8*8];
-dx= FFABS(x-best[0]);
-dy= FFABS(y-best[1]);
-stats[dy*8 + dx] ++;
-if(256*256*256*64 % (stats[0]+1)==0){
- for(i=0; i<64; i++){
- if((i&7)==0) printf("\n");
- printf("%6d ", stats[i]);
- }
- printf("\n");
-}
-}
-#endif
}
return dmin;
}
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 5e9b2ba..c7f2f76 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -888,10 +888,6 @@ static void mpeg1_encode_block(MpegEncContext *s,
j = s->intra_scantable.permutated[i];
level = block[j];
next_coef:
-#if 0
- if (level != 0)
- av_dlog(s->avctx, "level[%d]=%d\n", i, level);
-#endif
/* encode using VLC */
if (level != 0) {
run = i - last_non_zero - 1;
diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c
index bd581cf..361a1ae 100644
--- a/libavcodec/mpegaudioenc.c
+++ b/libavcodec/mpegaudioenc.c
@@ -398,11 +398,6 @@ static void compute_scale_factors(unsigned char
scale_code[SBLIMIT],
} else {
index = 62; /* value 63 is not allowed */
}
-
-#if 0
- printf("%2d:%d in=%x %x %d\n",
- j, i, vmax, scale_factor_table[index], index);
-#endif
/* store the scale factor */
assert(index >=0 && index <= 63);
sf[i] = index;
@@ -469,11 +464,6 @@ static void compute_scale_factors(unsigned char
scale_code[SBLIMIT],
assert(0); //cannot happen
code = 0; /* kill warning */
}
-
-#if 0
- printf("%d: %2d %2d %2d %d %d -> %d\n", j,
- sf[0], sf[1], sf[2], d1, d2, code);
-#endif
scale_code[j] = code;
sf += 3;
}
@@ -547,11 +537,6 @@ static void compute_bit_allocation(MpegAudioContext *s,
}
}
}
-#if 0
- printf("current=%d max=%d max_sb=%d alloc=%d\n",
- current_frame_size, max_frame_size, max_sb,
- bit_alloc[max_sb]);
-#endif
if (max_sb < 0)
break;
@@ -591,13 +576,6 @@ static void compute_bit_allocation(MpegAudioContext *s,
}
*padding = max_frame_size - current_frame_size;
assert(*padding >= 0);
-
-#if 0
- for(i=0;i<s->sblimit;i++) {
- printf("%d ", bit_alloc[i]);
- }
- printf("\n");
-#endif
}
/*
@@ -719,15 +697,7 @@ static void encode_frame(MpegAudioContext *s,
/* group the 3 values to save bits */
put_bits(p, -bits,
q[0] + steps * (q[1] + steps * q[2]));
-#if 0
- printf("%d: gr1 %d\n",
- i, q[0] + steps * (q[1] + steps * q[2]));
-#endif
} else {
-#if 0
- printf("%d: gr3 %d %d %d\n",
- i, q[0], q[1], q[2]);
-#endif
put_bits(p, bits, q[0]);
put_bits(p, bits, q[1]);
put_bits(p, bits, q[2]);
diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c
index 8115df5..eb23c01 100644
--- a/libavcodec/mpegvideo_parser.c
+++ b/libavcodec/mpegvideo_parser.c
@@ -152,10 +152,6 @@ static int mpegvideo_parse(AVCodecParserContext *s,
to have the full timing information. The time take by this
function should be negligible for uncorrupted streams */
mpegvideo_extract_headers(s, avctx, buf, buf_size);
-#if 0
- printf("pict_type=%d frame_rate=%0.3f repeat_pict=%d\n",
- s->pict_type, (double)avctx->time_base.den / avctx->time_base.num,
s->repeat_pict);
-#endif
*poutbuf = buf;
*poutbuf_size = buf_size;
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 85713b5..90dd4bb 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -473,11 +473,6 @@ void ff_msmpeg4_encode_motion(MpegEncContext * s,
mx += 32;
my += 32;
-#if 0
- if ((unsigned)mx >= 64 ||
- (unsigned)my >= 64)
- av_log(s->avctx, AV_LOG_ERROR, "error mx=%d my=%d\n", mx, my);
-#endif
mv = &mv_tables[s->mv_table_index];
code = mv->table_mv_index[(mx << 6) | my];
@@ -617,10 +612,6 @@ void msmpeg4_encode_mb(MpegEncContext * s,
}
coded_cbp |= val << (5 - i);
}
-#if 0
- if (coded_cbp)
- printf("cbp=%x %x\n", cbp, coded_cbp);
-#endif
if(s->msmpeg4_version<=2){
if (s->pict_type == FF_I_TYPE) {
@@ -1383,17 +1374,6 @@ int msmpeg4_decode_picture_header(MpegEncContext * s)
{
int code;
-#if 0
-{
-int i;
-for(i=0; i<s->gb.size_in_bits; i++)
- av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->gb));
-// get_bits1(&s->gb);
-av_log(s->avctx, AV_LOG_DEBUG, "END\n");
-return -1;
-}
-#endif
-
if(s->msmpeg4_version==1){
int start_code = get_bits_long(&s->gb, 32);
if(start_code!=0x00000100){
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index d5b85c3..3584bb6 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -219,13 +219,6 @@ void av_parser_close(AVCodecParserContext *s)
*/
int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int
*buf_size)
{
-#if 0
- if(pc->overread){
- printf("overread %d, state:%X next:%d index:%d o_index:%d\n",
pc->overread, pc->state, next, pc->index, pc->overread_index);
- printf("%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
- }
-#endif
-
/* Copy overread bytes from last frame into buffer. */
for(; pc->overread>0; pc->overread--){
pc->buffer[pc->index++]= pc->buffer[pc->overread_index++];
@@ -272,13 +265,6 @@ int ff_combine_frame(ParseContext *pc, int next, const
uint8_t **buf, int *buf_s
pc->overread++;
}
-#if 0
- if(pc->overread){
- printf("overread %d, state:%X next:%d index:%d o_index:%d\n",
pc->overread, pc->state, next, pc->index, pc->overread_index);
- printf("%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
- }
-#endif
-
return 0;
}
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 380e354..e22d62e 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -806,14 +806,6 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int
dry_run)
rcc->last_mc_mb_var_sum= pic->mc_mb_var_sum;
rcc->last_mb_var_sum= pic->mb_var_sum;
}
-#if 0
-{
- static int mvsum=0, texsum=0;
- mvsum += s->mv_bits;
- texsum += s->i_tex_bits + s->p_tex_bits;
- printf("%d %d//\n\n", mvsum, texsum);
-}
-#endif
return q;
}
diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c
index 7560d84..2d12e8f 100644
--- a/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@@ -308,13 +308,6 @@ int av_resample(AVResampleContext *c, short *dst, short
*src, int *consumed, int
c->dst_incr= dst_incr_frac + c->src_incr*dst_incr;
c->compensation_distance= compensation_distance;
}
-#if 0
- if(update_ctx && !c->compensation_distance){
-#undef rand
- av_resample_compensate(c, rand() % (8000*2) - 8000, 8000*2);
-av_log(NULL, AV_LOG_DEBUG, "%d %d %d\n", c->dst_incr, c->ideal_dst_incr,
c->compensation_distance);
- }
-#endif
return dst_index;
}
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 5df162b..4af1fd0 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -293,23 +293,6 @@ static int rv20_decode_picture_header(MpegEncContext *s)
{
int seq, mb_pos, i;
-#if 0
- GetBitContext gb= s->gb;
- for(i=0; i<64; i++){
- av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&gb));
- if(i%4==3) av_log(s->avctx, AV_LOG_DEBUG, " ");
- }
- av_log(s->avctx, AV_LOG_DEBUG, "\n");
-#endif
-#if 0
- av_log(s->avctx, AV_LOG_DEBUG, "%3dx%03d/%02Xx%02X ", s->width, s->height,
s->width/4, s->height/4);
- for(i=0; i<s->avctx->extradata_size; i++){
- av_log(s->avctx, AV_LOG_DEBUG, "%02X ",
((uint8_t*)s->avctx->extradata)[i]);
- if(i%4==3) av_log(s->avctx, AV_LOG_DEBUG, " ");
- }
- av_log(s->avctx, AV_LOG_DEBUG, "\n");
-#endif
-
if(s->avctx->sub_id == 0x30202002 || s->avctx->sub_id == 0x30203002){
if (get_bits(&s->gb, 3)){
av_log(s->avctx, AV_LOG_ERROR, "unknown triplet set\n");
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index 444785a..256a298 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -378,13 +378,6 @@ static int svq1_motion_inter_block (MpegEncContext *s,
GetBitContext *bitbuf,
if(x + (mv.x >> 1)<0)
mv.x= 0;
-#if 0
- int w= (s->width+15)&~15;
- int h= (s->height+15)&~15;
- if(x + (mv.x >> 1)<0 || y + (mv.y >> 1)<0 || x + (mv.x >> 1) + 16 > w || y +
(mv.y >> 1) + 16> h)
- av_log(s->avctx, AV_LOG_INFO, "%d %d %d %d\n", x, y, x + (mv.x >> 1), y
+ (mv.y >> 1));
-#endif
-
src = &previous[(x + (mv.x >> 1)) + (y + (mv.y >> 1))*pitch];
dst = current;
@@ -461,12 +454,6 @@ static int svq1_motion_inter_4v_block (MpegEncContext *s,
GetBitContext *bitbuf,
if(x + (mvx >> 1)<0)
mvx= 0;
-#if 0
- int w= (s->width+15)&~15;
- int h= (s->height+15)&~15;
- if(x + (mvx >> 1)<0 || y + (mvy >> 1)<0 || x + (mvx >> 1) + 8 > w || y +
(mvy >> 1) + 8> h)
- av_log(s->avctx, AV_LOG_INFO, "%d %d %d %d\n", x, y, x + (mvx >> 1), y +
(mvy >> 1));
-#endif
src = &previous[(x + (mvx >> 1)) + (y + (mvy >> 1))*pitch];
dst = current;
diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index bed47ec..fbf5483 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -316,16 +316,6 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
s->exponent_high_bands[k][j++] = end - start;
}
s->exponent_high_sizes[k] = j;
-#if 0
- tprintf(s->avctx, "%5d: coefs_end=%d high_band_start=%d
nb_high_bands=%d: ",
- s->frame_len >> k,
- s->coefs_end[k],
- s->high_band_start[k],
- s->exponent_high_sizes[k]);
- for (j = 0; j < s->exponent_high_sizes[k]; j++)
- tprintf(s->avctx, " %d", s->exponent_high_bands[k][j]);
- tprintf(s->avctx, "\n");
-#endif
}
}
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index f6ed26c..479b34c 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -178,15 +178,6 @@ static void wma_lsp_to_curve_init(WMACodecContext *s, int
frame_len)
s->lsp_pow_m_table2[i] = b - a;
b = a;
}
-#if 0
- for(i=1;i<20;i++) {
- float v, r1, r2;
- v = 5.0 / i;
- r1 = pow_m1_4(s, v);
- r2 = pow(v,-0.25);
- printf("%f^-0.25=%f e=%f\n", v, r1, r2 - r1);
- }
-#endif
}
/**
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index 578cce9..10fdde7 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -116,16 +116,6 @@ int ff_wmv2_decode_picture_header(MpegEncContext * s)
Wmv2Context * const w= (Wmv2Context*)s;
int code;
-#if 0
-{
-int i;
-for(i=0; i<s->gb.size*8; i++)
- printf("%d", get_bits1(&s->gb));
-// get_bits1(&s->gb);
-printf("END\n");
-return -1;
-}
-#endif
if(s->picture_number==0)
decode_ext_header(w);
@@ -316,10 +306,6 @@ static inline int wmv2_decode_inter_block(Wmv2Context *w,
DCTELEM *block, int n,
if(w->per_block_abt)
w->abt_type= decode012(&s->gb);
-#if 0
- if(w->per_block_abt)
- printf("B%d", w->abt_type);
-#endif
w->abt_type_table[n]= w->abt_type;
if(w->abt_type){
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index f98e6ae..4d490b9 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -2426,21 +2426,6 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext
*avctx)
mm_flags &= ~(avctx->dsp_mask & 0xffff);
}
-#if 0
- av_log(avctx, AV_LOG_INFO, "libavcodec: CPU flags:");
- if (mm_flags & AV_CPU_FLAG_MMX)
- av_log(avctx, AV_LOG_INFO, " mmx");
- if (mm_flags & AV_CPU_FLAG_MMX2)
- av_log(avctx, AV_LOG_INFO, " mmx2");
- if (mm_flags & AV_CPU_FLAG_3DNOW)
- av_log(avctx, AV_LOG_INFO, " 3dnow");
- if (mm_flags & AV_CPU_FLAG_SSE)
- av_log(avctx, AV_LOG_INFO, " sse");
- if (mm_flags & AV_CPU_FLAG_SSE2)
- av_log(avctx, AV_LOG_INFO, " sse2");
- av_log(avctx, AV_LOG_INFO, "\n");
-#endif
-
if (mm_flags & AV_CPU_FLAG_MMX) {
const int idct_algo= avctx->idct_algo;
diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c
index b3725eb..4106888 100644
--- a/libavdevice/v4l.c
+++ b/libavdevice/v4l.c
@@ -147,16 +147,8 @@ static int grab_read_header(AVFormatContext *s1,
AVFormatParameters *ap)
memcpy(&s->audio_saved, &audio, sizeof(audio));
audio.flags &= ~VIDEO_AUDIO_MUTE;
ioctl(video_fd, VIDIOCSAUDIO, &audio);
-
ioctl(video_fd, VIDIOCGPICT, &pict);
-#if 0
- printf("v4l: colour=%d hue=%d brightness=%d constrast=%d whiteness=%d\n",
- pict.colour,
- pict.hue,
- pict.brightness,
- pict.contrast,
- pict.whiteness);
-#endif
+
/* try to choose a suitable video format */
pict.palette = desired_palette;
pict.depth= desired_depth;
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 6cd2b51..8a6226a 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -417,9 +417,6 @@ static int ffm_read_packet(AVFormatContext *s, AVPacket
*pkt)
if (ffm->header[1] & FLAG_DTS)
if (ffm_read_data(s, ffm->header+16, 4, 1) != 4)
return -1;
-#if 0
- av_hexdump_log(s, AV_LOG_DEBUG, ffm->header, FRAME_HEADER_SIZE);
-#endif
ffm->read_state = READ_DATA;
/* fall thru */
case READ_DATA:
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 68b685c..af85014 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -569,10 +569,6 @@ static int mpegps_read_packet(AVFormatContext *s,
pkt->dts = dts;
pkt->pos = dummy_pos;
pkt->stream_index = st->index;
-#if 0
- av_log(s, AV_LOG_DEBUG, "%d: pts=%0.3f dts=%0.3f size=%d\n",
- pkt->stream_index, pkt->pts / 90000.0, pkt->dts / 90000.0,
pkt->size);
-#endif
return 0;
}
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 0e01645..3d71d9d 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -662,11 +662,6 @@ static int flush_packet(AVFormatContext *ctx, int
stream_index,
id = stream->id;
-#if 0
- printf("packet ID=%2x PTS=%0.3f\n",
- id, pts / 90000.0);
-#endif
-
buf_ptr = buffer;
if ((s->packet_number % s->pack_header_freq) == 0 || s->last_scr != scr) {
@@ -1078,10 +1073,6 @@ retry:
best_dts= pkt_desc->dts;
}
-#if 0
- av_log(ctx, AV_LOG_DEBUG, "bumping scr, scr:%f, dts:%f\n",
- scr/90000.0, best_dts/90000.0);
-#endif
if(best_dts == INT64_MAX)
return 0;
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index d7f2c0c..bd39f8d 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -662,9 +662,6 @@ static int mpegts_push_data(MpegTSFilter *filter,
if (pes->data_index == PES_START_SIZE) {
/* we got all the PES or section header. We can now
decide */
-#if 0
- av_hex_dump_log(pes->stream, AV_LOG_DEBUG, pes->header,
pes->data_index);
-#endif
if (pes->header[0] == 0x00 && pes->header[1] == 0x00 &&
pes->header[2] == 0x01) {
/* it must be an mpeg2 PES stream */
@@ -1538,10 +1535,6 @@ static int mpegts_read_header(AVFormatContext *s,
s->bit_rate = (TS_PACKET_SIZE * 8) * 27e6 / ts->pcr_incr;
st->codec->bit_rate = s->bit_rate;
st->start_time = ts->cur_pcr;
-#if 0
- av_log(ts->stream, AV_LOG_DEBUG, "start=%0.3f pcr=%0.3f incr=%d\n",
- st->start_time / 1000000.0, pcrs[0] / 27e6, ts->pcr_incr);
-#endif
}
avio_seek(pb, pos, SEEK_SET);
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 8d96320..6f8483c 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -316,10 +316,6 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart,
int *dsize, int64_t *fpo
int complete = 0;
int segp = 0, psize = 0;
-#if 0
- av_log (s, AV_LOG_DEBUG, "ogg_packet: curidx=%i\n", ogg->curidx);
-#endif
-
do{
idx = ogg->curidx;
@@ -330,12 +326,6 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart,
int *dsize, int64_t *fpo
os = ogg->streams + idx;
-#if 0
- av_log (s, AV_LOG_DEBUG,
- "ogg_packet: idx=%d pstart=%d psize=%d segp=%d nsegs=%d\n",
- idx, os->pstart, os->psize, os->segp, os->nsegs);
-#endif
-
if (!os->codec){
if (os->header < 0){
os->codec = ogg_find_codec (os->buf, os->bufpos);
@@ -366,12 +356,6 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart,
int *dsize, int64_t *fpo
}
}while (!complete);
-#if 0
- av_log (s, AV_LOG_DEBUG,
- "ogg_packet: idx %i, frame size %i, start %i\n",
- idx, os->psize, os->pstart);
-#endif
-
if (os->granule == -1)
av_log(s, AV_LOG_WARNING, "Page at %"PRId64" is missing granule\n",
os->page_pos);
@@ -451,10 +435,6 @@ ogg_get_headers (AVFormatContext * s)
return -1;
}while (!ogg->headers);
-#if 0
- av_log (s, AV_LOG_DEBUG, "found headers\n");
-#endif
-
return 0;
}
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index bcf55fd..c1f7e2b 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -414,15 +414,6 @@ static int rm_read_header(AVFormatContext *s,
AVFormatParameters *ap)
tag = avio_rl32(pb);
tag_size = avio_rb32(pb);
avio_rb16(pb);
-#if 0
- printf("tag=%c%c%c%c (%08x) size=%d\n",
- (tag) & 0xff,
- (tag >> 8) & 0xff,
- (tag >> 16) & 0xff,
- (tag >> 24) & 0xff,
- tag,
- tag_size);
-#endif
if (tag_size < 10 && tag != MKTAG('D', 'A', 'T', 'A'))
return -1;
switch(tag) {
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 88e9a49..c788030 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1973,23 +1973,6 @@ static void av_estimate_timings(AVFormatContext *ic,
int64_t old_offset)
av_estimate_timings_from_bit_rate(ic);
}
av_update_stream_timings(ic);
-
-#if 0
- {
- int i;
- AVStream *st;
- for(i = 0;i < ic->nb_streams; i++) {
- st = ic->streams[i];
- printf("%d: start_time: %0.3f duration: %0.3f\n",
- i, (double)st->start_time / AV_TIME_BASE,
- (double)st->duration / AV_TIME_BASE);
- }
- printf("stream: start_time: %0.3f duration: %0.3f bitrate=%d kb/s\n",
- (double)ic->start_time / AV_TIME_BASE,
- (double)ic->duration / AV_TIME_BASE,
- ic->bit_rate / 1000);
- }
-#endif
}
static int has_codec_parameters(AVCodecContext *enc)
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
