diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 00:04:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 00:04:22 +0200 |
| commit | 28c03195174719c6683ecd3c411eb35e5bb29a38 (patch) | |
| tree | bd080c4cded2d940113098761eb362b3cb71ca37 /libavcodec/Makefile | |
| parent | 96761e9306a9f96abaaa6bf53fe48c4d6872f48e (diff) | |
| parent | d6902070c52151ec1e8154ce9b22283a1d0bc192 (diff) | |
Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'
* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192':
dsicin: Split audio and video decoder
Conflicts:
libavcodec/Makefile
libavcodec/dsicinvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7a1640a60d..40b56e3f9c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -192,8 +192,8 @@ OBJS-$(CONFIG_DSD_LSBF_DECODER) += dsddec.o OBJS-$(CONFIG_DSD_MSBF_DECODER) += dsddec.o OBJS-$(CONFIG_DSD_LSBF_PLANAR_DECODER) += dsddec.o OBJS-$(CONFIG_DSD_MSBF_PLANAR_DECODER) += dsddec.o -OBJS-$(CONFIG_DSICINAUDIO_DECODER) += dsicinav.o -OBJS-$(CONFIG_DSICINVIDEO_DECODER) += dsicinav.o +OBJS-$(CONFIG_DSICINAUDIO_DECODER) += dsicinaudio.o +OBJS-$(CONFIG_DSICINVIDEO_DECODER) += dsicinvideo.o OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.o OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.o OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.o |