diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 02:04:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 02:04:56 +0100 |
| commit | 26f4a509820d616127b359ea4cdd61ae4bcd70b5 (patch) | |
| tree | 6259aad63c0219671c80f1ba0cb47eaccca0dd89 /libavcodec/bfin | |
| parent | 866e11b33b29ab69f0c418b4d23ec8ec9edf8b6a (diff) | |
| parent | a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730 (diff) | |
Merge commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730'
* commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730':
bfin: dsputil: Unconditionally compile hpel pixels code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bfin')
| -rw-r--r-- | libavcodec/bfin/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/bfin/Makefile b/libavcodec/bfin/Makefile index fc5f506653..62881c4652 100644 --- a/libavcodec/bfin/Makefile +++ b/libavcodec/bfin/Makefile @@ -1,9 +1,9 @@ OBJS += bfin/dsputil_bfin.o \ bfin/fdct_bfin.o \ + bfin/hpel_pixels_bfin.o \ bfin/idct_bfin.o \ bfin/pixels_bfin.o \ -OBJS-$(CONFIG_HPELDSP) += bfin/hpeldsp_bfin.o \ - bfin/hpel_pixels_bfin.o +OBJS-$(CONFIG_HPELDSP) += bfin/hpeldsp_bfin.o OBJS-$(CONFIG_VP3DSP) += bfin/vp3_bfin.o \ bfin/vp3_idct_bfin.o |