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)
commit3141b04c7fd46ca09acbc4a7b4d89788df273dd7
treeabcef65d35b4384b8a96bfed45c0c5552c802069
parent91a61c4c156dcc4d5a8ac579b6b5dd310deeaefe
parentda785231ea0b82b5c2526babbb2871c935b21a87
Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'

* commit 'da785231ea0b82b5c2526babbb2871c935b21a87':
  bfin: Refactor duplicated assembly-related macros

Conflicts:
libavcodec/bfin/hpel_pixels_bfin.S

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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