Update internal FFmpeg copy.

1 files changed, 10 insertions, 7 deletions

diff --git a/contrib/ffmpeg/tests/tiny_psnr.c b/contrib/ffmpeg/tests/tiny_psnr.c
index d8bce2b7b..31a7a1b5e 100644
--- a/contrib/ffmpeg/tests/tiny_psnr.c
+++ b/contrib/ffmpeg/tests/tiny_psnr.c
@@ -1,20 +1,21 @@
 /*
  * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #include <stdio.h>
@@ -48,7 +49,8 @@ uint64_t exp16_table[21]={
  195360063,
  582360139072LL,
 };
-#if 1
+
+#if 0
 // 16.16 fixpoint exp()
 static unsigned int exp16(unsigned int a){
     int i;
@@ -61,6 +63,8 @@ static unsigned int exp16(unsigned int a){
 
     return out;
 }
+#endif
+
 // 16.16 fixpoint log()
 static int64_t log16(uint64_t a){
     int i;
@@ -79,7 +83,6 @@ static int64_t log16(uint64_t a){
     return out;
 }
 
-#endif
 static uint64_t int_sqrt(uint64_t a)
 {
     uint64_t ret=0;