diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-09-11 14:11:56 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-09-11 14:11:56 +0000 |
| commit | 915d486e573d0920e919046a5cf3e0f8e1e20fff (patch) | |
| tree | a1b3b88c4ab71ab293d5c522914930b950c804b6 | |
| parent | 8580a7e3f20c34fb62ff93d41f6c9ea3a814aa2d (diff) | |
| download | xine-lib-915d486e573d0920e919046a5cf3e0f8e1e20fff.tar.gz xine-lib-915d486e573d0920e919046a5cf3e0f8e1e20fff.tar.bz2 | |
linking demux_qt to zlib for compressed headers, make ffmpeg handle JPEG qt streams
CVS patchset: 616
CVS date: 2001/09/11 14:11:56
| -rw-r--r-- | src/demuxers/Makefile.am | 1 | ||||
| -rw-r--r-- | src/demuxers/demux_qt.c | 4 | ||||
| -rw-r--r-- | src/libffmpeg/xine_decoder.c | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index 78bdb99e6..ac47e4058 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -38,6 +38,7 @@ xineplug_dmx_mpeg_ts_la_LDFLAGS = -avoid-version -module xineplug_dmx_qt_la_SOURCES = demux_qt.c xineplug_dmx_qt_la_LDFLAGS = -avoid-version -module +xineplug_dmx_qt_la_LIBADD = -lz include_HEADERS = demux.h diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 3241e9eaf..875db5f6c 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_qt.c,v 1.1 2001/09/10 03:04:48 guenter Exp $ + * $Id: demux_qt.c,v 1.2 2001/09/11 14:11:56 guenter Exp $ * * demultiplexer for quicktime streams, based on: * @@ -29,7 +29,7 @@ * */ - + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c index dfa678dde..b4c176337 100644 --- a/src/libffmpeg/xine_decoder.c +++ b/src/libffmpeg/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.9 2001/09/01 15:12:12 guenter Exp $ + * $Id: xine_decoder.c,v 1.10 2001/09/11 14:11:56 guenter Exp $ * * xine decoder plugin using ffmpeg * @@ -104,7 +104,8 @@ static int ff_can_handle (video_decoder_t *this_gen, int buf_type) { buf_type == BUF_VIDEO_MJPEG || buf_type == BUF_VIDEO_MPEG4 || buf_type == BUF_VIDEO_I263 || - buf_type == BUF_VIDEO_RV10 ); + buf_type == BUF_VIDEO_RV10 || + buf_type == BUF_VIDEO_JPEG); } static void ff_init (video_decoder_t *this_gen, vo_instance_t *video_out) { @@ -157,6 +158,7 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { case BUF_VIDEO_MPEG4 : codec = avcodec_find_decoder (CODEC_ID_MPEG4); break; + case BUF_VIDEO_JPEG: case BUF_VIDEO_MJPEG: codec = avcodec_find_decoder (CODEC_ID_MJPEG); break; |