diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 00:44:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 00:44:28 +0200 |
| commit | 8985e7c56130b42f6184b064b7141e365f59356b (patch) | |
| tree | a957787aa28a0bb5d1a9012daf2ece37edcfb3f7 /libavformat/Makefile | |
| parent | 7856afef524da4eb93e1c823f9cdcd6a2badb3fe (diff) | |
| parent | 9b56ac74b170d12027fbc81f581a451a709f1105 (diff) | |
Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'
* commit '9b56ac74b170d12027fbc81f581a451a709f1105':
mpjpeg: Initial implementation
Conflicts:
Changelog
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index aab3b3b32e..83196cf891 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -271,6 +271,7 @@ OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.o OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o isom.o OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += mpegvideodec.o rawdec.o +OBJS-$(CONFIG_MPJPEG_DEMUXER) += mpjpegdec.o OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o OBJS-$(CONFIG_MPL2_DEMUXER) += mpl2dec.o subtitles.o OBJS-$(CONFIG_MPSUB_DEMUXER) += mpsubdec.o subtitles.o |