[FFmpeg-cvslog] Remove some silly disabled code.

Diego Biurrun git at videolan.org
Mon Oct 1 16:28:47 CEST 2012


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Aug 21 01:03:08 2012 +0200| [14d3e7ad11addf0f8415cafad73f6e040a028e93] | committer: Diego Biurrun

Remove some silly disabled code.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14d3e7ad11addf0f8415cafad73f6e040a028e93
---

 libavcodec/huffyuv.c     |    5 -----
 libavdevice/timefilter.c |    7 -------
 2 files changed, 12 deletions(-)

diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index e5200e0..e3787e7 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -320,7 +320,6 @@ static int read_huffman_tables(HYuvContext *s, const uint8_t *src, int length)
 
 static int read_old_huffman_tables(HYuvContext *s)
 {
-#if 1
     GetBitContext gb;
     int i;
 
@@ -353,10 +352,6 @@ static int read_old_huffman_tables(HYuvContext *s)
     generate_joint_tables(s);
 
     return 0;
-#else
-    av_log(s->avctx, AV_LOG_DEBUG, "v1 huffyuv is not supported \n");
-    return -1;
-#endif
 }
 
 static av_cold void alloc_temp(HYuvContext *s)
diff --git a/libavdevice/timefilter.c b/libavdevice/timefilter.c
index 649d3c2..2e26b27 100644
--- a/libavdevice/timefilter.c
+++ b/libavdevice/timefilter.c
@@ -90,15 +90,8 @@ int main(void)
 #define SAMPLES 1000
     double ideal[SAMPLES];
     double samples[SAMPLES];
-#if 1
     for (n0 = 0; n0 < 40; n0 = 2 * n0 + 1) {
         for (n1 = 0; n1 < 10; n1 = 2 * n1 + 1) {
-#else
-    {
-        {
-            n0 = 7;
-            n1 = 1;
-#endif
             double best_error = 1000000000;
             double bestpar0   = 1;
             double bestpar1   = 0.001;



More information about the ffmpeg-cvslog mailing list