[FFmpeg-cvslog] Fix compile error on bfin.

Bernd Kuhls git at videolan.org
Tue Aug 5 02:04:17 CEST 2014


ffmpeg | branch: master | Bernd Kuhls <bernd.kuhls at t-online.de> | Mon Aug  4 21:12:29 2014 +0200| [bf6c84d7eb27b65252f57a5f859f342f1c42d5fc] | committer: Michael Niedermayer

Fix compile error on bfin.

After the removal of all Blackfin architecture optimizations in
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b55d3bbeed375f7b74442c4dd274d116a3e3d2e1
some includes were left behind leading to a compile error:

CC      libavformat/adtsenc.o
In file included from ./libavcodec/get_bits.h:35,
                 from ./libavcodec/ac3_parser.h:27,
                 from libavformat/ac3dec.c:23:
./libavcodec/mathops.h:43:29: error: bfin/mathops.h: No such file or directory

This compile error was found by buildroot autobuild system:
http://autobuild.buildroot.net/results/ae0/ae056f267e907091d09d2a1546d6f1ae02fa23b9/

Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/mathops.h |    2 --
 libavutil/bswap.h    |    2 --
 libavutil/timer.h    |    2 --
 3 files changed, 6 deletions(-)

diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index b0e48d8..87fca0c 100644
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -39,8 +39,6 @@ extern const uint8_t ff_zigzag_direct[64];
 #   include "arm/mathops.h"
 #elif ARCH_AVR32
 #   include "avr32/mathops.h"
-#elif ARCH_BFIN
-#   include "bfin/mathops.h"
 #elif ARCH_MIPS
 #   include "mips/mathops.h"
 #elif ARCH_PPC
diff --git a/libavutil/bswap.h b/libavutil/bswap.h
index f38e1de..91cb795 100644
--- a/libavutil/bswap.h
+++ b/libavutil/bswap.h
@@ -40,8 +40,6 @@
 #   include "arm/bswap.h"
 #elif ARCH_AVR32
 #   include "avr32/bswap.h"
-#elif ARCH_BFIN
-#   include "bfin/bswap.h"
 #elif ARCH_SH4
 #   include "sh4/bswap.h"
 #elif ARCH_X86
diff --git a/libavutil/timer.h b/libavutil/timer.h
index 3fff77f..13a3c8c 100644
--- a/libavutil/timer.h
+++ b/libavutil/timer.h
@@ -40,8 +40,6 @@
 
 #if   ARCH_ARM
 #   include "arm/timer.h"
-#elif ARCH_BFIN
-#   include "bfin/timer.h"
 #elif ARCH_PPC
 #   include "ppc/timer.h"
 #elif ARCH_X86



More information about the ffmpeg-cvslog mailing list