Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 00:56:25 +0000 (01:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 00:56:25 +0000 (01:56 +0100)
* commit 'da785231ea0b82b5c2526babbb2871c935b21a87':
  bfin: Refactor duplicated assembly-related macros

Conflicts:
libavcodec/bfin/hpel_pixels_bfin.S

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/bfin/fdct_bfin.S
libavcodec/bfin/hpel_pixels_bfin.S
libavcodec/bfin/idct_bfin.S
libavcodec/bfin/pixels_bfin.S
libavcodec/bfin/vp3_idct_bfin.S
libavutil/bfin/asm.h
libswscale/bfin/internal_bfin.S

@@@ -123,18 -123,12 +123,14 @@@ ffmpeg DCT/IDCT tes
    -17   -63   -15    73    50   -91   159   -14
  DCT BFINfdct: err_inf=2 err2=0.16425938 syserr=0.00795000 maxout=2098 blockSumErr=27
  DCT BFINfdct: 92.1 kdct/s
 +root:/u/ffmpeg/bhead/libavcodec>
 +
  */
  
- #include "config.h"
- #include "config_bfin.h"
- #if defined(__FDPIC__) && CONFIG_SRAM
- .section .l1.data.B,"aw",@progbits
- #else
- .data
- #endif
+ #include "libavutil/bfin/asm.h"
+ SECTION_L1_DATA_B
  .align 4;
  dct_coeff:
  .short 0x5a82, 0x2d41, 0x187e, 0x3b21, 0x0c7c, 0x3ec5, 0x238e, 0x3537;
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
- #include "config_bfin.h"
+ #include "libavutil/bfin/asm.h"
  
  /*
    motion compensation
Simple merge
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
- #include "config_bfin.h"
+ #include "libavutil/bfin/asm.h"
  
  DEFUN(put_pixels_clamped,mL1,
          (int16_t *block, uint8_t *dest, int line_size)):
Simple merge
Simple merge
Simple merge