lavc: revert the Makefile part of 330177b

[ffmpeg] / libavcodec / amr.h

diff --git a/libavcodec/amr.h b/libavcodec/amr.h
index 58a0dde14a507234de9baff69fbce57d2e68b2f0..676c9630dfa3c1b205c403590e9e5d60f3903a37 100644 (file)
--- a/libavcodec/amr.h
+++ b/libavcodec/amr.h
@@ -3,26 +3,30 @@
  *
  * Copyright (c) 2010 Marcelo Galvao Povoa
  *
- * 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
  */
 
 #ifndef AVCODEC_AMR_H
 #define AVCODEC_AMR_H
 
+#include <string.h>
+
+#include "avcodec.h"
+
 #ifdef AMR_USE_16BIT_TABLES
 #define R_TABLE_TYPE uint16_t
 #else
@@ -59,7 +63,7 @@ static inline void ff_amr_bit_reorder(uint16_t *out, int size,
            field <<= 1;
            field |= data[bit >> 3] >> (bit & 7) & 1;
         }
-        out[field_offset] = field;
+        out[field_offset >> 1] = field;
     }
 }