diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:15:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:31:55 +0200 |
| commit | bb3ed3bae6a9e6e2dbe8deeb45088453f214b770 (patch) | |
| tree | 2cb536f24abb5d9cfc275848da43d93d4302d0d2 /libavcodec/Makefile | |
| parent | aee51039ee204197fdb4c924f8ee433b803ab1e1 (diff) | |
| parent | b96509c93ce6ebb0e997e0b2a55cf10c786a2812 (diff) | |
| download | ffmpeg-bb3ed3bae6a9e6e2dbe8deeb45088453f214b770.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Add FATE tests for the Ut Video encoder
lavc: add Ut Video encoder
mpegvideo_enc: remove stray duplicate line from 7f9aaa4
swscale: x86: fix #endif comments in rgb2rgb template file
avconv: mark more options as expert.
avconv: split printing "main options" into global and per-file.
avconv: refactor help printing.
Conflicts:
Changelog
ffmpeg_opt.c
ffserver.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e4113da808..566b709e7e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -432,7 +432,8 @@ OBJS-$(CONFIG_TTA_DECODER) += tta.o OBJS-$(CONFIG_TWINVQ_DECODER) += twinvq.o celp_math.o OBJS-$(CONFIG_TXD_DECODER) += txd.o s3tc.o OBJS-$(CONFIG_ULTI_DECODER) += ulti.o -OBJS-$(CONFIG_UTVIDEO_DECODER) += utvideodec.o +OBJS-$(CONFIG_UTVIDEO_DECODER) += utvideodec.o utvideo.o +OBJS-$(CONFIG_UTVIDEO_ENCODER) += utvideoenc.o utvideo.o OBJS-$(CONFIG_V210_DECODER) += v210dec.o OBJS-$(CONFIG_V210_ENCODER) += v210enc.o OBJS-$(CONFIG_V308_DECODER) += v308dec.o |