diff -X ignore -urN vlc-0.6.0/Makefile.am /home/jpsaman/iPaq/src/vlc-0.6.0/Makefile.am --- vlc-0.6.0/Makefile.am Sun Jun 22 12:24:39 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/Makefile.am Sun Jul 13 14:03:42 2003 @@ -175,7 +175,7 @@ include/configuration.h \ include/darwin_specific.h \ include/codecs.h \ - include/error.h \ + include/vlc_error.h \ include/encoder.h \ include/input_ext-dec.h \ include/input_ext-intf.h \ diff -X ignore -urN vlc-0.6.0/configure.ac /home/jpsaman/iPaq/src/vlc-0.6.0/configure.ac --- vlc-0.6.0/configure.ac Sun Jun 22 20:13:02 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/configure.ac Sun Jul 13 17:14:01 2003 @@ -1478,12 +1478,12 @@ AC_MSG_ERROR([${with_mad_tree} directory doesn't exist]) fi dnl Use a custom libmad - AC_MSG_CHECKING(for mad.h in ${real_mad_tree}/libmad) - if test -f ${real_mad_tree}/libmad/mad.h + AC_MSG_CHECKING(for mad.h in ${real_mad_tree}) + if test -f ${real_mad_tree}/mad.h then AC_MSG_RESULT(yes) - CPPFLAGS_mpgatofixed32="${CPPFLAGS_mpgatofixed32} -I${real_mad_tree}/libmad" - LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -L${real_mad_tree}/libmad/.libs" + CPPFLAGS_mpgatofixed32="${CPPFLAGS_mpgatofixed32} -I${real_mad_tree}" + LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -L${real_mad_tree}/.libs" LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}" AC_CHECK_LIB(mad, mad_bit_init, [ BUILTINS="${BUILTINS} mpgatofixed32" diff -X ignore -urN vlc-0.6.0/include/error.h /home/jpsaman/iPaq/src/vlc-0.6.0/include/error.h --- vlc-0.6.0/include/error.h Tue Jan 28 03:03:32 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/include/error.h Thu Jan 1 01:00:00 1970 @@ -1,28 +0,0 @@ -/***************************************************************************** - * error.h: error handling routine - ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: error.h,v 1.2 2003/01/28 02:03:32 sam Exp $ - * - * Authors: Samuel Hocevar - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - *****************************************************************************/ - -/***************************************************************************** - * Prototypes - *****************************************************************************/ -VLC_EXPORT( char const *, vlc_error, ( int ) ); - diff -X ignore -urN vlc-0.6.0/include/vlc_error.h /home/jpsaman/iPaq/src/vlc-0.6.0/include/vlc_error.h --- vlc-0.6.0/include/vlc_error.h Thu Jan 1 01:00:00 1970 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/include/vlc_error.h Sun Jul 13 10:40:20 2003 @@ -0,0 +1,28 @@ +/***************************************************************************** + * vlc_error.h: error handling routine + ***************************************************************************** + * Copyright (C) 2002 VideoLAN + * $Id: error.h,v 1.2 2003/01/28 02:03:32 sam Exp $ + * + * Authors: Samuel Hocevar + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + *****************************************************************************/ + +/***************************************************************************** + * Prototypes + *****************************************************************************/ +VLC_EXPORT( char const *, vlc_error, ( int ) ); + diff -X ignore -urN vlc-0.6.0/ipkg/control /home/jpsaman/iPaq/src/vlc-0.6.0/ipkg/control --- vlc-0.6.0/ipkg/control Tue Jun 10 19:05:05 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/ipkg/control Thu Jul 17 23:20:08 2003 @@ -2,11 +2,12 @@ Section: graphics Priority: optional Version: 0.6.0 -Release: 2 +Release: 3 Architecture: arm -Conflicts: gpe-vlc, opie-vlc, opie-libsdl, opie-base, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-launcher-settings, opie-netsetup -Maintainer: Jean-Paul Saman , Christophe Massiot -Depends: libc6, procps, xserver-tiny-h3600, xbase-clients, xfonts-base, xfonts-75dpi, xfonts-ttf, matchbox, xcalibrate, libsdl, libgtk1.2, esddsp +Source: http://www.videolan.org/vlc/download-sources.html +Conflicts: gpe-vlc, opie-vlc, opie-libsdl, opie-base +Maintainer: Jean-Paul Saman +Depends: libc6, libsdl, libgtk1.2, esddsp Copyright: GPL Description: VideoLAN Client is a free network-aware MPEG and DVD player. VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original diff -X ignore -urN vlc-0.6.0/ipkg/control.gpe /home/jpsaman/iPaq/src/vlc-0.6.0/ipkg/control.gpe --- vlc-0.6.0/ipkg/control.gpe Tue Jun 10 19:05:05 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/ipkg/control.gpe Sun Jul 13 13:27:18 2003 @@ -2,11 +2,12 @@ Section: graphics Priority: optional Version: 0.6.0 -Release: 2 -Conflicts: opie-vlc, opie-libsdl, opie-base, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-launcher-settings, opie-netsetup, vlc +Release: 3 +Conflicts: opie-vlc, opie-libsdl, opie-base, vlc Architecture: arm +Source: http://www.videolan.org/vlc/download-sources.html Maintainer: Jean-Paul Saman -Depends: libc6, gpe-apps, libsdl, esddsp +Depends: libc6, gpe-apps, gtk1.2, libsdl, esddsp Copyright: GPL Description: VideoLAN Client is a free network-aware MPEG and DVD player. VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original diff -X ignore -urN vlc-0.6.0/ipkg/control.opie /home/jpsaman/iPaq/src/vlc-0.6.0/ipkg/control.opie --- vlc-0.6.0/ipkg/control.opie Tue Jun 10 19:05:05 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/ipkg/control.opie Sun Jul 13 13:27:26 2003 @@ -2,11 +2,12 @@ Section: graphics Priority: optional Version: 0.6.0 -Release: 2 +Release: 3 Conflicts: gpe-apps, vlc, gpe-vlc, libsdl Architecture: arm +Source: http://www.videolan.org/vlc/download-sources.html Maintainer: Jean-Paul Saman -Depends: libc6, opie-base, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-handwriting, opie-launcher-settings, opie-netsetup, opie-libsdl +Depends: libc6, opie-base, opie-libsdl Copyright: GPL Description: VideoLAN Client is a free network-aware MPEG and DVD player. VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original diff -X ignore -urN vlc-0.6.0/ipkg/rules /home/jpsaman/iPaq/src/vlc-0.6.0/ipkg/rules --- vlc-0.6.0/ipkg/rules Wed May 21 01:26:59 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/ipkg/rules Fri Jul 18 11:35:43 2003 @@ -13,42 +13,58 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \ --disable-plugins \ --disable-gtk \ + --disable-gtk2 \ --disable-gnome \ + --disable-gnome2 \ --disable-qt \ --disable-kde \ --disable-qte \ --disable-xosd \ + --disable-ogg \ + --disable-tarkin \ + --disable-tremor \ + --disable-theorea \ + --enable-v4l \ --enable-dummy \ --enable-fb \ --enable-sdl \ --enable-oss \ --disable-alsa \ --enable-x11 \ - --disable-xvideo \ + --enable-xvideo \ --disable-dvd \ --disable-dvdread \ --disable-vcd \ --disable-maxosx \ --disable-xosd \ --disable-freetype \ + --enable-a52 \ + --enable-faad2 \ --enable-flac \ --enable-libmpeg2 \ + --enable-libdvbpsi \ + --disable-mkv \ --enable-mad \ --enable-ffmpeg \ --enable-familiar \ --with-tuning=strongarm1100 \ --x-includes=/skiff/local/arm-linux/include \ --x-libraries=/usr/local/arm/2.95.3/arm-linux/usr/X11R6/lib \ - --with-mad-tree=/home/jpsaman/iPaq/src/mad-0.14.2b \ + --with-libiconv-prefix=/usr/local/arm/2.95.3/arm-linux/usr \ + --with-mad-tree=/home/jpsaman/iPaq/src/libmad-0.15.0b \ + --with-a52-tree=/home/jpsaman/iPaq/src/a52dec-0.7.4 \ + --with-faad2-tree=/home/jpsaman/iPaq/src/faad2-20030612 \ + --with-flac-tree=/home/jpsaman/iPaq/src/flac-1.1.0 \ + --with-libmpeg2-tree=/home/jpsaman/iPaq/src/mpeg2dec-20030612 \ + --with-libdvbpsi-tree=/home/jpsaman/iPaq/src/libdvbpsi-0.1.2 \ --with-gtk-config-path=/usr/local/arm/2.95.3/arm-linux/usr/bin \ --with-gtk-prefix=/usr/local/arm/2.95.3/arm-linux/usr \ --with-sdl-config-path=/usr/local/arm/2.95.3/arm-linux/usr/bin \ --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/usr \ - --with-ffmpeg-tree=/home/jpsaman/svn/tmp/ffmpeg-20030517" + --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg-20030622" export VIDDIR="usr/share/vlc" export PIXDIR="usr/share/pixmaps" -#export DESTDIR=/tmp/vlc export DESTDIR=/usr/local/arm/2.95.3/arm-linux export PKGDIR=/home/jpsaman/iPaq/packages/vlc-0.6.0 @@ -59,7 +75,7 @@ --target=arm-linux \ $(shell echo $(CONFIG_FLAGS)) \ LDFLAGS="-L/usr/local/arm/2.95.3/arm-linux/lib -L/usr/local/arm/2.95.3/arm-linux/usr/lib" \ - CPPFLAGS="-I/usr/local/arm/2.95.3/arm-linux/usr/include" + CPPFLAGS="-I/usr/local/arm/2.95.3/arm-linux/include -I/usr/local/arm/2.95.3/arm-linux/usr/include" #patch: # This is ugly -- I know diff -X ignore -urN vlc-0.6.0/ipkg/rules.gpe /home/jpsaman/iPaq/src/vlc-0.6.0/ipkg/rules.gpe --- vlc-0.6.0/ipkg/rules.gpe Wed May 21 01:26:59 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/ipkg/rules.gpe Fri Jul 18 11:30:05 2003 @@ -14,12 +14,19 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \ --disable-plugins \ --disable-gtk \ + --disable-gtk2 \ --disable-gnome \ + --disable-gnome2 \ --disable-qt \ --disable-kde \ --disable-qte \ --disable-xosd \ + --disable-ogg \ + --disable-tarkin \ + --disable-tremor \ + --disable-theorea \ --enable-dummy \ + --enable-v4l \ --enable-fb \ --enable-sdl \ --enable-oss \ @@ -30,23 +37,32 @@ --disable-dvdread \ --disable-vcd \ --disable-maxosx \ - --disable-xosd \ --disable-freetype \ + --enable-a52 \ --enable-flac \ + --enable-faad2 \ --enable-libmpeg2 \ + --enable-libdvbpsi \ + --disable-mkv \ --enable-mad \ --enable-ffmpeg \ --enable-familiar \ --with-tuning=strongarm1100 \ --x-includes=/skiff/local/arm-linux/include \ --x-libraries=/usr/local/arm/2.95.3/arm-linux/usr/X11R6/lib \ - --with-mad-tree=/home/jpsaman/iPaq/src/mad-0.14.2b \ + --with-libiconv-prefix=/usr/local/arm/2.95.3/arm-linux/usr \ + --with-mad-tree=/home/jpsaman/iPaq/src/libmad-0.15.0b \ + --with-a52-tree=/home/jpsaman/iPaq/src/a52dec-0.7.4 \ + --with-faad2-tree=/home/jpsaman/iPaq/src/faad2-20030612 \ + --with-flac-tree=/home/jpsaman/iPaq/src/flac-1.1.0 \ + --with-libmpeg2-tree=/home/jpsaman/iPaq/src/mpeg2dec-20030612 \ + --with-libdvbpsi-tree=/home/jpsaman/iPaq/src/libdvbpsi-0.1.2 \ --with-gtk-config-path=/usr/local/arm/2.95.3/arm-linux/usr/bin \ --with-gtk-prefix=/usr/local/arm/2.95.3/arm-linux/usr \ --with-gpe-prefix=/usr/local/arm/2.95.3/arm-linux/usr \ --with-sdl-config-path=/usr/local/arm/2.95.3/arm-linux/usr/bin \ --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/usr \ - --with-ffmpeg-tree=/home/jpsaman/svn/tmp/ffmpeg-20030517" + --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg-20030622" export VIDDIR="usr/share/vlc" export PIXDIR="usr/share/pixmaps" @@ -61,7 +77,7 @@ --target=arm-linux \ $(shell echo $(CONFIG_FLAGS)) \ LDFLAGS="-L/usr/local/arm/2.95.3/arm-linux/lib -L/usr/local/arm/2.95.3/arm-linux/usr/lib" \ -CPPFLAGS="-I/usr/local/arm/2.95.3/arm-linux/usr/include" + CPPFLAGS="-I/usr/local/arm/2.95.3/arm-linux/usr/include" build: # This is ugly -- I know diff -X ignore -urN vlc-0.6.0/ipkg/rules.opie /home/jpsaman/iPaq/src/vlc-0.6.0/ipkg/rules.opie --- vlc-0.6.0/ipkg/rules.opie Thu May 22 18:40:13 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/ipkg/rules.opie Fri Jul 18 20:00:52 2003 @@ -13,34 +13,52 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \ --disable-plugins \ --disable-gtk \ + --disable-gtk2 \ --disable-gnome \ + --disable-gnome2 \ --disable-qt \ --disable-kde \ --disable-xosd \ + --disable-ogg \ + --disable-tarkin \ + --disable-tremor \ + --disable-theorea \ --enable-qte \ --disable-x11 \ + --disable-xvideo \ --enable-dummy \ + --enable-v4l \ --enable-fb \ --enable-sdl \ + --enable-oss \ --disable-alsa \ --disable-xvideo \ --disable-dvd \ --disable-dvdread \ --disable-vcd \ --disable-maxosx \ - --disable-xosd \ --disable-freetype \ + --enable-a52 \ + --enable-faad2 \ --enable-flac \ --enable-libmpeg2 \ + --enable-libdvbpsi \ + --disable-mkv \ --enable-mad \ --enable-ffmpeg \ --disable-familiar \ --with-tuning=strongarm1100 \ - --with-mad-tree=/home/jpsaman/iPaq/src/mad-0.14.2b \ + --with-libiconv-prefix=/usr/local/arm/2.95.3/arm-linux/usr \ + --with-mad-tree=/home/jpsaman/iPaq/src/libmad-0.15.0b \ + --with-a52-tree=/home/jpsaman/iPaq/src/a52dec-0.7.4 \ + --with-faad2-tree=/home/jpsaman/iPaq/src/faad2-20030612 \ + --with-flac-tree=/home/jpsaman/iPaq/src/flac-1.1.0 \ + --with-libmpeg2-tree=/home/jpsaman/iPaq/src/mpeg2dec-20030612 \ + --with-libdvbpsi-tree=/home/jpsaman/iPaq/src/libdvbpsi-0.1.2 \ --with-sdl-config-path=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/bin \ --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop \ --with-qte=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop \ - --with-ffmpeg-tree=/home/jpsaman/svn/tmp/ffmpeg-20030517" + --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg-20030622" export VIDDIR="usr/share/vlc" export PIXDIR="usr/share/pixmaps" @@ -56,8 +74,8 @@ --host=arm-linux \ --target=arm-linux \ $(shell echo $(CONFIG_FLAGS)) \ - LDFLAGS="-L/usr/local/arm/2.95.3/arm-linux/lib -L/usr/local/arm/2.95.3/arm-linux/lib -L/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/lib" \ - CPPFLAGS="-I/usr/local/arm/2.95.3/arm-linux/usr/include -I/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/include" + LDFLAGS="-L/usr/local/arm/2.95.3/arm-linux/lib -L/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/lib -L/home/jpsaman/iPaq/src/libid3tag-0.15.0b" \ + CPPFLAGS="-I/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/include -I/home/jpsaman/iPaq/src/libid3tag-0.15.0b" build-stamp: # This is ugly -- I know diff -X ignore -urN vlc-0.6.0/modules/codec/ffmpeg/ffmpeg.c /home/jpsaman/iPaq/src/vlc-0.6.0/modules/codec/ffmpeg/ffmpeg.c --- vlc-0.6.0/modules/codec/ffmpeg/ffmpeg.c Mon Jun 16 22:23:41 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/modules/codec/ffmpeg/ffmpeg.c Sun Jul 13 22:26:08 2003 @@ -560,6 +560,11 @@ i_codec = CODEC_ID_DVVIDEO; psz_name = "DV video"; break; + case FOURCC_huffyuv: + i_cat = VIDEO_ES; + i_codec = CODEC_ID_HUFFYUV; + psz_name = "Huff YUV"; + break; case FOURCC_MAC3: i_cat = AUDIO_ES; diff -X ignore -urN vlc-0.6.0/modules/codec/ffmpeg/ffmpeg.h /home/jpsaman/iPaq/src/vlc-0.6.0/modules/codec/ffmpeg/ffmpeg.h --- vlc-0.6.0/modules/codec/ffmpeg/ffmpeg.h Thu May 22 18:40:13 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/modules/codec/ffmpeg/ffmpeg.h Sun Jul 13 22:22:40 2003 @@ -179,6 +179,9 @@ #define FOURCC_asv1 VLC_FOURCC('a','s','v','1') #define FOURCC_ASV1 VLC_FOURCC('A','S','V','1') +/* Huff */ +#define FOURCC_huffyuv VLC_FOURCC('h','u','f','f') + /***************************************************************************** * Audio codec fourcc *****************************************************************************/ diff -X ignore -urN vlc-0.6.0/modules/control/rc/rc.c /home/jpsaman/iPaq/src/vlc-0.6.0/modules/control/rc/rc.c --- vlc-0.6.0/modules/control/rc/rc.c Fri May 16 00:27:37 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/modules/control/rc/rc.c Sun Jul 13 10:36:01 2003 @@ -46,7 +46,7 @@ #endif #include -#include "error.h" +#include "vlc_error.h" #define MAX_LINE_LENGTH 256 diff -X ignore -urN vlc-0.6.0/modules/encoder/ffmpeg/video.c /home/jpsaman/iPaq/src/vlc-0.6.0/modules/encoder/ffmpeg/video.c --- vlc-0.6.0/modules/encoder/ffmpeg/video.c Mon Apr 28 01:16:35 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/modules/encoder/ffmpeg/video.c Sun Jul 13 22:25:29 2003 @@ -81,6 +81,7 @@ case VLC_FOURCC( 'm', 'p', '1', 'v' ): case VLC_FOURCC( 'm', 'p', 'g', 'v' ): case VLC_FOURCC( 'm', 'p', '4', 'v' ): + case VLC_FOURCC( 'h', 'u', 'f', 'f' ): break; default: return VLC_EGENERIC; @@ -167,6 +168,10 @@ p_encoder->p_sys->psz_codec = "MPEG-4"; i_codec = CODEC_ID_MPEG4; break; + case VLC_FOURCC( 'h', 'u', 'f', 'f' ): + p_encoder->p_sys->psz_codec = "Huff YUV"; + i_codec = CODEC_ID_HUFFYUV; + break; default: return VLC_EGENERIC; } diff -X ignore -urN vlc-0.6.0/modules/stream_out/transcode.c /home/jpsaman/iPaq/src/vlc-0.6.0/modules/stream_out/transcode.c --- vlc-0.6.0/modules/stream_out/transcode.c Thu May 22 23:49:38 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/modules/stream_out/transcode.c Tue Jul 15 22:59:20 2003 @@ -462,15 +462,17 @@ { VLC_FOURCC( 'a', 'c', '3', ' ' ), CODEC_ID_AC3 }, { VLC_FOURCC( 'w', 'm', 'a', '1' ), CODEC_ID_WMAV1 }, { VLC_FOURCC( 'w', 'm', 'a', '2' ), CODEC_ID_WMAV2 }, + { VLC_FOURCC( 'a', 'l', 'a', 'w' ), CODEC_ID_PCM_ALAW }, /* video */ - { VLC_FOURCC( 'm', 'p', '4', 'v'), CODEC_ID_MPEG4 }, + { VLC_FOURCC( 'm', 'p', '4', 'v' ), CODEC_ID_MPEG4 }, { VLC_FOURCC( 'm', 'p', 'g', 'v' ), CODEC_ID_MPEG1VIDEO }, { VLC_FOURCC( 'D', 'I', 'V', '1' ), CODEC_ID_MSMPEG4V1 }, { VLC_FOURCC( 'D', 'I', 'V', '2' ), CODEC_ID_MSMPEG4V2 }, { VLC_FOURCC( 'D', 'I', 'V', '3' ), CODEC_ID_MSMPEG4V3 }, { VLC_FOURCC( 'H', '2', '6', '3' ), CODEC_ID_H263 }, { VLC_FOURCC( 'I', '2', '6', '3' ), CODEC_ID_H263I }, + { VLC_FOURCC( 'h', 'u', 'f', 'f' ), CODEC_ID_HUFFYUV }, { VLC_FOURCC( 'W', 'M', 'V', '1' ), CODEC_ID_WMV1 }, { VLC_FOURCC( 'W', 'M', 'V', '2' ), CODEC_ID_WMV2 }, { VLC_FOURCC( 'M', 'J', 'P', 'G' ), CODEC_ID_MJPEG }, diff -X ignore -urN vlc-0.6.0/share/familiar-playlistb16x16.xpm /home/jpsaman/iPaq/src/vlc-0.6.0/share/familiar-playlistb16x16.xpm --- vlc-0.6.0/share/familiar-playlistb16x16.xpm Thu Jan 1 01:00:00 1970 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/share/familiar-playlistb16x16.xpm Fri Jul 18 19:05:51 2003 @@ -0,0 +1,21 @@ +/* XPM */ +static char * familiar_playlistb16x16_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ............ ", +" ............ ", +" .. .. ", +" .. .. ", +" ............ ", +" ............ ", +" .. .. ", +" .. .. ", +" ............ ", +" ............ ", +" .. .. ", +" .. .. ", +" ............ ", +" ............ ", +" "}; diff -X ignore -urN vlc-0.6.0/src/libvlc.c /home/jpsaman/iPaq/src/vlc-0.6.0/src/libvlc.c --- vlc-0.6.0/src/libvlc.c Sun Jun 22 12:24:41 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/src/libvlc.c Sun Jul 13 10:36:15 2003 @@ -63,7 +63,7 @@ #include "vlc_cpu.h" /* CPU detection */ #include "os_specific.h" -#include "error.h" +#include "vlc_error.h" #include "stream_control.h" #include "input_ext-intf.h" diff -X ignore -urN vlc-0.6.0/src/misc/modules.c /home/jpsaman/iPaq/src/vlc-0.6.0/src/misc/modules.c --- vlc-0.6.0/src/misc/modules.c Tue May 20 18:55:15 2003 +++ /home/jpsaman/iPaq/src/vlc-0.6.0/src/misc/modules.c Sun Jul 13 10:35:25 2003 @@ -67,7 +67,7 @@ # undef HAVE_DYNAMIC_PLUGINS #endif -#include "error.h" +#include "vlc_error.h" #include "interface.h" #include "vlc_playlist.h" Binary files vlc-0.6.0/vlc and /home/jpsaman/iPaq/src/vlc-0.6.0/vlc differ