Remove some hunks of unused and disabled code cruft.
authorDiego Biurrun <diego@biurrun.de>
Fri, 7 Aug 2009 14:53:31 +0000 (14:53 +0000)
committerDiego Biurrun <diego@biurrun.de>
Fri, 7 Aug 2009 14:53:31 +0000 (14:53 +0000)
Originally committed as revision 19606 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c
ffplay.c
tests/videogen.c

index e899180..e5512c2 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -130,11 +130,6 @@ static AVRational frame_rate;
 static float video_qscale = 0;
 static uint16_t *intra_matrix = NULL;
 static uint16_t *inter_matrix = NULL;
-#if 0 //experimental, (can be removed)
-static float video_rc_qsquish=1.0;
-static float video_rc_qmod_amp=0;
-static int video_rc_qmod_freq=0;
-#endif
 static const char *video_rc_override_string=NULL;
 static int video_disable = 0;
 static int video_discard = 0;
@@ -1401,12 +1396,6 @@ static int output_packet(AVInputStream *ist, int ist_index,
                 if (ost->source_index == ist_index) {
                     os = output_files[ost->file_index];
 
-#if 0
-                    printf("%d: got pts=%0.3f %0.3f\n", i,
-                           (double)pkt->pts / AV_TIME_BASE,
-                           ((double)ist->pts / AV_TIME_BASE) -
-                           ((double)ost->st->pts.val * ost->st->time_base.num / ost->st->time_base.den));
-#endif
                     /* set the input output pts pairs */
                     //ost->sync_ipts = (double)(ist->pts + input_files_ts_offset[ist->file_index] - start_time)/ AV_TIME_BASE;
 
@@ -2371,28 +2360,6 @@ static int av_encode(AVFormatContext **output_files,
     return ret;
 }
 
-#if 0
-int file_read(const char *filename)
-{
-    URLContext *h;
-    unsigned char buffer[1024];
-    int len, i;
-
-    if (url_open(&h, filename, O_RDONLY) < 0) {
-        printf("could not open '%s'\n", filename);
-        return -1;
-    }
-    for(;;) {
-        len = url_read(h, buffer, sizeof(buffer));
-        if (len <= 0)
-            break;
-        for(i=0;i<len;i++) putchar(buffer[i]);
-    }
-    url_close(h);
-    return 0;
-}
-#endif
-
 static void opt_format(const char *arg)
 {
     /* compatibility stuff for pgmyuv */
index c976ac5..6077e6c 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -1171,23 +1171,6 @@ static void alloc_picture(void *opaque)
     if (vp->bmp)
         SDL_FreeYUVOverlay(vp->bmp);
 
-#if 0
-    /* XXX: use generic function */
-    /* XXX: disable overlay if no hardware acceleration or if RGB format */
-    switch(is->video_st->codec->pix_fmt) {
-    case PIX_FMT_YUV420P:
-    case PIX_FMT_YUV422P:
-    case PIX_FMT_YUV444P:
-    case PIX_FMT_YUYV422:
-    case PIX_FMT_YUV410P:
-    case PIX_FMT_YUV411P:
-        is_yuv = 1;
-        break;
-    default:
-        is_yuv = 0;
-        break;
-    }
-#endif
     vp->bmp = SDL_CreateYUVOverlay(is->video_st->codec->width,
                                    is->video_st->codec->height,
                                    SDL_YV12_OVERLAY,
index 5990dd7..4238e3f 100644 (file)
@@ -273,11 +273,6 @@ int main(int argc, char **argv)
         exit(1);
     }
 
-#if 0
-    for(i=0;i<256;i++)
-        printf("cos(%d)=%d\n", i, int_cos(i));
-#endif
-
     w = DEFAULT_WIDTH;
     h = DEFAULT_HEIGHT;