diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 21:58:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:00:09 +0200 |
| commit | d5a3caef93026abebaa73f4b9c747004a1457fd7 (patch) | |
| tree | dc24d134264dcc61fd87a0a8779abf3224c0eef0 /libavcodec/Makefile | |
| parent | 9da679e77fa25487ae37db11f010fde68034e362 (diff) | |
| parent | 04d14c9b68b03e8dbc6e3003c1ee06892dd32576 (diff) | |
| download | ffmpeg-d5a3caef93026abebaa73f4b9c747004a1457fd7.tar.gz | |
Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'
* commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576':
vc1: Split the decoder in components
Conflicts:
libavcodec/Makefile
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f27ba306a6..3d70313325 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -473,7 +473,9 @@ OBJS-$(CONFIG_V410_ENCODER) += v410enc.o OBJS-$(CONFIG_V210X_DECODER) += v210x.o OBJS-$(CONFIG_VB_DECODER) += vb.o OBJS-$(CONFIG_VBLE_DECODER) += vble.o -OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1.o vc1data.o vc1dsp.o \ +OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o \ + vc1_mc.o vc1_pred.o vc1.o vc1data.o \ + vc1dsp.o \ msmpeg4dec.o msmpeg4.o msmpeg4data.o \ wmv2dsp.o OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o |