* commit 'da785231ea0b82b5c2526babbb2871c935b21a87': bfin: Refactor duplicated assembly-related macros Conflicts: libavcodec/bfin/hpel_pixels_bfin.S Merged-by: Michael Niedermayer <michaelni@gmx.at>