mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext

[ffmpeg] / libavcodec / bfin / config_bfin.h

diff --git a/libavcodec/bfin/config_bfin.h b/libavcodec/bfin/config_bfin.h
index 1f5080900d5cf8a11e989f1a129d9fbe80407c1e..e7140704a2d4fed352c4e1ac43c6a28e6b14b8d2 100644 (file)
--- a/libavcodec/bfin/config_bfin.h
+++ b/libavcodec/bfin/config_bfin.h
@@ -1,46 +1,65 @@
 /*
- * config_bfin.h
- *
  * Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com>
  *
- * 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
  */
 /*
    low level assembler interface wrapper
 
 DEFUN(put_pixels_clamped,mL1,
-        (DCTELEM *block, uint8_t *dest, int line_size)):
+        (int16_t *block, uint8_t *dest, int line_size)):
 
       body
 
       rts;
 */
+
+#ifndef AVCODEC_BFIN_CONFIG_BFIN_H
+#define AVCODEC_BFIN_CONFIG_BFIN_H
+
+#include "config.h"
+
 #ifndef DEFUN
 
+#define mL3 .text
 #ifndef mL1
+#if defined(__FDPIC__) && CONFIG_SRAM
 #define mL1 .l1.text
+#else
+#define mL1 mL3
+#endif
 #endif
-#define mL3 .text
 
 #define DEFUN(fname,where,interface) \
         .section where;              \
         .global _ff_bfin_ ## fname ; \
+        .type _ff_bfin_ ## fname, STT_FUNC; \
         .align 8;                    \
         _ff_bfin_ ## fname
 
+#define DEFUN_END(fname) \
+        .size _ff_bfin_ ## fname, . - _ff_bfin_ ## fname
+
+#ifdef __FDPIC__
+#define RELOC(reg,got,obj) reg = [got + obj@GOT17M4]
+#else
+#define RELOC(reg,got,obj) reg.L = obj; reg.H = obj
+#endif
+
 #endif
 
+#endif /* AVCODEC_BFIN_CONFIG_BFIN_H */