diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-06 23:43:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-06 23:43:37 +0200 |
| commit | 96761e9306a9f96abaaa6bf53fe48c4d6872f48e (patch) | |
| tree | 77d77d8f3559331acbc73448960abf860d509575 /libavcodec/Makefile | |
| parent | 8be23d424feea50d4ee892cdbdd6abd9a807709f (diff) | |
| parent | 2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58 (diff) | |
Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'
* commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58':
bmv: Split audio and video decoder
Conflicts:
libavcodec/bmvvideo.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 8e4c27e842..7a1640a60d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -159,8 +159,8 @@ OBJS-$(CONFIG_BINKAUDIO_RDFT_DECODER) += binkaudio.o wma.o wma_common.o OBJS-$(CONFIG_BINTEXT_DECODER) += bintext.o cga_data.o OBJS-$(CONFIG_BMP_DECODER) += bmp.o msrledec.o OBJS-$(CONFIG_BMP_ENCODER) += bmpenc.o -OBJS-$(CONFIG_BMV_VIDEO_DECODER) += bmv.o -OBJS-$(CONFIG_BMV_AUDIO_DECODER) += bmv.o +OBJS-$(CONFIG_BMV_AUDIO_DECODER) += bmvaudio.o +OBJS-$(CONFIG_BMV_VIDEO_DECODER) += bmvvideo.o OBJS-$(CONFIG_BRENDER_PIX_DECODER) += brenderpix.o OBJS-$(CONFIG_C93_DECODER) += c93.o OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdec.o cavsdsp.o \ |