Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a'

[ffmpeg] / libavcodec / Makefile

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index ae2efb6e5e404d4b0f36308644beadfdfd89429d..dd881b6c5b4211ba9041a55d59cfaa760328fe1c 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -628,6 +628,7 @@ OBJS-$(CONFIG_OGG_DEMUXER)             += xiph.o flac.o flacdata.o     \
 OBJS-$(CONFIG_OGG_MUXER)               += xiph.o flac.o flacdata.o \
                                           vorbis_data.o
 OBJS-$(CONFIG_RTP_MUXER)               += mpeg4audio.o xiph.o
+OBJS-$(CONFIG_RTPDEC)                  += mjpeg.o
 OBJS-$(CONFIG_SPDIF_DEMUXER)           += aacadtsdec.o mpeg4audio.o
 OBJS-$(CONFIG_SPDIF_MUXER)             += dca.o
 OBJS-$(CONFIG_WEBM_MUXER)              += mpeg4audio.o mpegaudiodata.o  \
@@ -777,12 +778,13 @@ TESTPROGS = cabac                                                       \
             golomb                                                      \
             iirfilter                                                   \
             rangecoder                                                  \
-            raw                                                         \
             snowenc                                                     \
 
 TESTPROGS-$(HAVE_MMX) += motion
 TESTOBJS = dctref.o
 
+TOOLS = fourcc2pixfmt
+
 HOSTPROGS = aac_tablegen                                                \
             aacps_tablegen                                              \
             cbrt_tablegen                                               \