Merge commit 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 00:57:41 +0000 (01:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 00:57:41 +0000 (01:57 +0100)
* commit 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5':
  bfin: Move all assembly declarations only used within one .c file there

Conflicts:
libavcodec/bfin/dsputil_bfin.h
libavcodec/bfin/vp3_bfin.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/bfin/dsputil_bfin.c
libavcodec/bfin/hpeldsp_bfin.c
libavcodec/bfin/hpeldsp_bfin.h
libavcodec/bfin/vp3_bfin.c

Simple merge
Simple merge
Simple merge
Simple merge