Non Altivec optimizations already present at the top

[ffmpeg] / libavcodec / g726.c

diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 87e09cfcd5f8421258654fa068ee1d0c77c30a4f..b8a7410e200d81afa30b166fa2ee27302342e4a7 100644 (file)
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -5,19 +5,21 @@
  * This is a very straightforward rendition of the G.726
  * Section 4 "Computational Details".
  *
- * 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
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <limits.h>
 #include "avcodec.h"
@@ -299,6 +301,7 @@ static int16_t g726_decode(G726Context* c, int16_t i)
     return g726_iterate(c, i);
 }
 
+#ifdef CONFIG_ENCODERS
 static int16_t g726_encode(G726Context* c, int16_t sig)
 {
    uint8_t i;
@@ -307,6 +310,7 @@ static int16_t g726_encode(G726Context* c, int16_t sig)
    g726_iterate(c, i);
    return i;
 }
+#endif
 
 /* Interfacing to the libavcodec */
 
@@ -350,6 +354,7 @@ static int g726_close(AVCodecContext *avctx)
     return 0;
 }
 
+#ifdef CONFIG_ENCODERS
 static int g726_encode_frame(AVCodecContext *avctx,
                             uint8_t *dst, int buf_size, void *data)
 {
@@ -366,6 +371,7 @@ static int g726_encode_frame(AVCodecContext *avctx,
 
     return put_bits_count(&pb)>>3;
 }
+#endif
 
 static int g726_decode_frame(AVCodecContext *avctx,
                              void *data, int *data_size,