latmenc: Fix private options

[ffmpeg] / libavutil / timer.h

diff --git a/libavutil/timer.h b/libavutil/timer.h
index 78342d7d58131ff49e783db68b7729c1056cf75f..341d508c44dfa67eb6115b4f914c698ff1630265 100644 (file)
--- a/libavutil/timer.h
+++ b/libavutil/timer.h
@@ -1,26 +1,28 @@
-/**
- * @file libavutil/timer.h
- * high precision timer, useful to profile code
- *
+/*
  * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * high precision timer, useful to profile code
+ */
+
 #ifndef AVUTIL_TIMER_H
 #define AVUTIL_TIMER_H
 
@@ -28,7 +30,9 @@
 #include <stdint.h>
 #include "config.h"
 
-#if   ARCH_BFIN
+#if   ARCH_ARM
+#   include "arm/timer.h"
+#elif ARCH_BFIN
 #   include "bfin/timer.h"
 #elif ARCH_PPC
 #   include "ppc/timer.h"