[FFmpeg-cvslog] Merge commit '93fed46a92bab8be176d3e67be4354189a8dbe7f'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 16:08:27 2017 +0100| [b2c5f5054b5cbb8bcb118632d0b62ee6006e0b85] | committer: Clément Bœsch

Merge commit '93fed46a92bab8be176d3e67be4354189a8dbe7f'

* commit '93fed46a92bab8be176d3e67be4354189a8dbe7f':
  timefilter: test: Drop some disabled debug cruft

Merged-by: Clément Bœsch <u at pkh.me>

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

 libavdevice/tests/timefilter.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/libavdevice/tests/timefilter.c b/libavdevice/tests/timefilter.c
index 7c1ed0a..9aee91c 100644
--- a/libavdevice/tests/timefilter.c
+++ b/libavdevice/tests/timefilter.c
@@ -77,20 +77,7 @@ int main(void)
                     }
                 }
             } while (better);
-#if 0
-            double lastfil = 9;
-            TimeFilter *tf = ff_timefilter_new(1, bestpar0, bestpar1);
-            for (i = 0; i < SAMPLES; i++) {
-                double filtered;
-                filtered = ff_timefilter_update(tf, samples[i], 1);
-                printf("%f %f %f %f\n", i - samples[i] + 10, filtered - samples[i],
-                       samples[FFMAX(i, 1)] - samples[FFMAX(i - 1, 0)], filtered - lastfil);
-                lastfil = filtered;
-            }
-            ff_timefilter_destroy(tf);
-#else
             printf(" [%12f %11f %9f]", bestpar0, bestpar1, best_error);
-#endif
         }
         printf("\n");
     }


======================================================================

diff --cc libavdevice/tests/timefilter.c
index 7c1ed0a,9e8ec09..9aee91c
--- a/libavdevice/tests/timefilter.c
+++ b/libavdevice/tests/timefilter.c
@@@ -77,20 -71,7 +77,7 @@@ int main(void
                      }
                  }
              } while (better);
- #if 0
-             double lastfil = 9;
-             TimeFilter *tf = ff_timefilter_new(1, bestpar0, bestpar1);
-             for (i = 0; i < SAMPLES; i++) {
-                 double filtered;
-                 filtered = ff_timefilter_update(tf, samples[i], 1);
-                 printf("%f %f %f %f\n", i - samples[i] + 10, filtered - samples[i],
-                        samples[FFMAX(i, 1)] - samples[FFMAX(i - 1, 0)], filtered - lastfil);
-                 lastfil = filtered;
-             }
-             ff_timefilter_destroy(tf);
- #else
 -            printf(" [%f %f %9f]", bestpar0, bestpar1, best_error);
 +            printf(" [%12f %11f %9f]", bestpar0, bestpar1, best_error);
- #endif
          }
          printf("\n");
      }