Commit f7b44627 authored by sigmunau's avatar sigmunau
Browse files

modules/codec/dv/dv.h: workaround for a namespace collision (#undef vlc_error)

debian/rules: update the location of libgnome_main_plugin.so and
libgtk_main_plugin.so. Added the ui.rc file to the kvlc package. All debian
packages seem to build now (even though there were some warnings)
parent 5be7af3d
......@@ -93,7 +93,7 @@ install: build
# Package: gnome-vlc
mv debian/vlc/usr/bin/gnome-vlc debian/gnome-vlc/usr/bin/
ln -s vlc debian/gnome-vlc/usr/share/doc/gnome-vlc
mv debian/vlc/usr/lib/vlc/gui/libgnome_main_plugin.so \
mv debian/vlc/usr/lib/vlc/misc/libgnome_main_plugin.so \
debian/gnome-vlc/usr/lib/vlc/gui/
mv debian/vlc/usr/lib/vlc/gui/libgnome_plugin.so \
debian/gnome-vlc/usr/lib/vlc/gui/
......@@ -104,7 +104,7 @@ install: build
# Package: gvlc
mv debian/vlc/usr/bin/gvlc debian/gvlc/usr/bin/
ln -s vlc debian/gvlc/usr/share/doc/gvlc
mv debian/vlc/usr/lib/vlc/gui/libgtk_main_plugin.so \
mv debian/vlc/usr/lib/vlc/misc/libgtk_main_plugin.so \
debian/gvlc/usr/lib/vlc/gui/
mv debian/vlc/usr/lib/vlc/gui/libgtk_plugin.so \
debian/gvlc/usr/lib/vlc/gui/
......@@ -186,6 +186,8 @@ endif
ln -s vlc debian/kvlc/usr/share/doc/kvlc
mv debian/vlc/usr/lib/vlc/gui/libkde_plugin.so \
debian/kvlc/usr/lib/vlc/gui/
mv debian/vlc/usr/share/vlc/ui.rc \
debian/kvlc/usr/share/vlc
ln -s vlc.1.gz debian/kvlc/usr/share/man/man1/kvlc.1.gz
mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/kvlc/$(VIDDIR)/kvlc.xpm
mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png
......
......@@ -2,7 +2,7 @@
* dv.c: a decoder for DV video
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: dv.c,v 1.3 2002/10/27 16:58:13 gbazin Exp $
* $Id: dv.c,v 1.4 2002/11/02 17:31:37 sigmunau Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -28,6 +28,8 @@
#include <vlc/vout.h>
#include <vlc/decoder.h>
#undef vlc_error /*vlc_error is defined in the libdv headers, but not
* used in thes file */
#include <libdv/dv_types.h>
#include <libdv/dv.h>
......@@ -267,7 +269,7 @@ static int RunDecoder ( decoder_fifo_t *p_fifo )
}
free( p_buffer );
CloseBitstream( bit_stream );
CloseBitstream( &bit_stream );
if( p_fifo->b_error )
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment