* enable mjpeg module and add to LIST

diff --git a/configure.ac b/configure.ac
index 8ddbb3a902981e05ef92148e6acd719f71d76b28..b0418407bd36c199cec06c2776e0e6f811cff7d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -884,7 +884,7 @@ dnl
 dnl  default modules
 dnl
 AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys])
-AX_ADD_PLUGINS([mpgv mpga m4v h264 mpeg_system ps ps2 pva ts avi asf aac mp4 rawdv demux2 nsv real aiff])
+AX_ADD_PLUGINS([mpgv mpga m4v h264 mpeg_system ps ps2 pva ts avi asf aac mp4 rawdv demux2 nsv real aiff mjpeg])
 AX_ADD_PLUGINS([cvdsub svcdsub spudec dvbsub mpeg_audio lpcm a52 dts cinepak])
 AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
 AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])

diff --git a/modules/LIST b/modules/LIST
index 62629cbc4c4bead43396e3d2627cb121286055ef..36fe018368170e348dd3ac321272c72d8ad2bffa 100644 (file)
--- a/modules/LIST
+++ b/modules/LIST
@@ -262,6 +262,8 @@ $Id$
 
  * mga: video output module for Matrox cards using the Linux mga kernel driver.
 
+ * mjpeg: a demuxer for multipart and concatenated JPEG data.
+
  * mkv: Matroska demuxer
 
  * mod: MOD demuxer
@@ -340,8 +342,6 @@ $Id$
 
  * qt: interface module using the Qt widget set.
 
- * qt_video: video output module for Qt.
-
  * qte: video output module for Qt Embedded.
  
  * quicktime: Quicktime decoder that uses the QT library