diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-02 20:17:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-02 20:32:05 +0100 |
| commit | aab902e64668dcc889cf3c76d3d62bd58668af59 (patch) | |
| tree | f7edd17edb039c9d545e89e4dc2712c06588c262 /libavcodec/Makefile | |
| parent | d525b45fde177fc3ee143c5ae557dc66546000b2 (diff) | |
| parent | 28df0151b6618226b05ee52e031af0b11ca531b0 (diff) | |
Merge commit '28df0151b6618226b05ee52e031af0b11ca531b0'
* commit '28df0151b6618226b05ee52e031af0b11ca531b0':
configure: Add a dependency on vc1_decoder from vc1_parser
See: 6ac3c8c6a0c6c69b84e408a9b494fcb26294b9ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index db8d45a33f..ffb3cef6b7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -812,9 +812,7 @@ OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o -OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o vc1dsp.o \ - msmpeg4.o msmpeg4data.o mpeg4video.o \ - h263.o +OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o OBJS-$(CONFIG_VP8_PARSER) += vp8_parser.o OBJS-$(CONFIG_VP9_PARSER) += vp9_parser.o |