diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-02-02 19:18:09 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-02-02 19:18:09 +0000 |
| commit | 0250738f13ff26aa84e4da3f55ea1b509a0359e7 (patch) | |
| tree | 16c06f7c05393e909f61101be502834a096c4097 /libavformat/Makefile | |
| parent | 12b64a225296e1c356a2bd69909abc541deb714c (diff) | |
| download | ffmpeg-streaming-0250738f13ff26aa84e4da3f55ea1b509a0359e7.zip ffmpeg-streaming-0250738f13ff26aa84e4da3f55ea1b509a0359e7.tar.gz | |
added jpeg image encoder and decoder (new YUV handling routines and mjpeg codec fixes are necessary to go further)
Originally committed as revision 1534 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 4f2715a..4e4462a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -12,7 +12,7 @@ OBJS= utils.o cutils.o allformats.o # mux and demuxes OBJS+=mpeg.o mpegts.o ffm.o crc.o img.o raw.o rm.o \ - avienc.o avidec.o wav.o swf.o au.o gif.o mov.o jpeg.o dv.o \ + avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \ yuv4mpeg.o ifeq ($(CONFIG_RISKY),yes) @@ -20,7 +20,7 @@ OBJS+= asf.o endif # image formats -OBJS+= pnm.o yuv.o png.o libpng/png.o libpng/pngread.o libpng/pngrutil.o libpng/pngwrite.o libpng/pngwutil.o +OBJS+= pnm.o yuv.o png.o libpng/png.o libpng/pngread.o libpng/pngrutil.o libpng/pngwrite.o libpng/pngwutil.o jpeg.o gifdec.o # file I/O OBJS+= avio.o aviobuf.o file.o OBJS+= framehook.o |
