Better patch I hope (the configure.ac has seen so many changes that I have to stick to just updating dc1394 api/version stuff)

1 files changed, 158 insertions, 159 deletions

diff --git a/vlc/build/vlc-1.0.3_ieee1394.diff b/vlc/build/vlc-1.0.3_ieee1394.diff
index 4e9c8b5e..3e7b6b84 100644
--- a/vlc/build/vlc-1.0.3_ieee1394.diff
+++ b/vlc/build/vlc-1.0.3_ieee1394.diff
@@ -1,50 +1,6 @@
-From: Jean-Paul Saman <jean-paul.saman@m2x.nl>
-Date: Mon, 27 Apr 2009 10:40:50 +0000 (+0200)
-Subject: Use pkg-config to detect libraw1394 and libavc1394
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=9f0d65737e7d810205b25cbb40f0eac4c758b951
-
-Use pkg-config to detect libraw1394 and libavc1394
----
-
-From: Jean-Paul Saman <jean-paul.saman@m2x.nl>
-Date: Tue, 12 May 2009 11:20:37 +0000 (+0200)
-Subject: dc1394 and dv1394: cleanup detection in configure.ac
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=d6cc0b79ef3c7f15df5ef524b76bbbafe01e84eb
-
-dc1394 and dv1394: cleanup detection in configure.ac
----
-
-From: Jean-Baptiste Kempf <jb@videolan.org>
-Date: Wed, 5 Aug 2009 19:28:49 +0000 (+0200)
-Subject: Simplify dc1394 and dv detection.
-X-Git-Url: http://git.videolan.org/gitweb.cgi?p=vlc.git;a=commitdiff_plain;h=314bd6d6494fe9b9b948532595bf081be49a46ac;hp=d9f8dcc6bedcc6526642715fc64884c58116587c
-
-Simplify dc1394 and dv detection.
-
-Be careful, while dv was updated to the new APIs, dc1394 wasn't
----
-
-From: Rmi Denis-Courmont <remi@remlab.net>
-Date: Sat, 17 Oct 2009 20:28:29 +0000 (+0300)
-Subject: dc1394: path coming from MRL, need utf8_open()
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=1188e4a5d039711c0afa64b532578e4c65c34ab4
-
-dc1394: path coming from MRL, need utf8_open()
----
-
-From: Jean-Baptiste Kempf <jb@videolan.org>
-Date: Tue, 10 Nov 2009 10:00:01 +0000 (+0100)
-Subject: dc1394: update to v2 API
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=577ce5a67c51c812f7ad97bf3e7f7f38913b72d3
-
-dc1394: update to v2 API
-
-This patch needs more testing, I think.
----
-
 diff -uar vlc-1.0.3.orig/NEWS vlc-1.0.3/NEWS
 --- vlc-1.0.3.orig/NEWS	2009-10-29 20:12:42.000000000 +0100
-+++ vlc-1.0.3/NEWS	2009-12-10 01:03:50.000000000 +0100
++++ vlc-1.0.3/NEWS	2009-12-10 15:41:17.000000000 +0100
 @@ -5,6 +5,7 @@
   * Fix video quality when resizing the video on Windows Vista and 7, due to
     regressions in most popular drivers
@@ -55,19 +11,11 @@ diff -uar vlc-1.0.3.orig/NEWS vlc-1.0.3/NEWS
   * Windows version supports now natively the WMA Professional codec, as it
 diff -uar vlc-1.0.3.orig/configure.ac vlc-1.0.3/configure.ac
 --- vlc-1.0.3.orig/configure.ac	2009-10-29 20:04:31.000000000 +0100
-+++ vlc-1.0.3/configure.ac	2009-12-10 01:05:07.000000000 +0100
-@@ -2025,158 +2025,11 @@
- fi
- 
- dnl
--dnl  special access module for dc1394 input
-+dnl - special access module for dc1394 input
-+dnl - dv module: digital video module check for libraw1394
- dnl
--AC_ARG_ENABLE(dc1394,
--  [  --enable-dc1394         dc1394 access module (default disabled)])
--if test "${enable_dc1394}" = "yes"
--then
++++ vlc-1.0.3/configure.ac	2009-12-10 15:43:11.000000000 +0100
+@@ -2031,28 +2031,28 @@
+   [  --enable-dc1394         dc1394 access module (default disabled)])
+ if test "${enable_dc1394}" = "yes"
+ then
 -  AC_CHECK_HEADERS(libraw1394/raw1394.h, [
 -    AC_CHECK_LIB( raw1394, raw1394_get_nodecount, [
 -        AC_CHECK_HEADERS(libdc1394/dc1394_control.h , [
@@ -82,23 +30,41 @@ diff -uar vlc-1.0.3.orig/configure.ac vlc-1.0.3/configure.ac
 -      [
 -        AC_MSG_ERROR([libdc1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library])
 -      ])
--    ],
--    [
++  dnl
++  dnl Check for libraw1394
++  dnl
++  PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 2.0.1,
++    [
++      VLC_ADD_LIBS([dc1394],[`${PKG_CONFIG} --libs libraw1394`])
++      VLC_ADD_CPPFLAGS([dc1394],[`${PKG_CONFIG} --cflags libraw1394`])
+     ],
++    [AC_MSG_ERROR([Couldn't find libraw1394 >= 2.0.1, install libraw1394 development package])]
++  )
++
++  dnl
++  dnl Check for libdc1394
++  dnl
++  PKG_CHECK_MODULES(LIBDC1394, libdc1394-2 >= 2.1.0,
+     [
 -      AC_MSG_ERROR([libraw1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library])
 -    ])
 -  ],
 -  [
 -    AC_MSG_ERROR([libraw1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library])
 -  ])
--fi
--
--dnl
--dnl dv module: digital video module check for libraw1394
--dnl
--AC_ARG_ENABLE(dv,
--[  --enable-dv             dv input module (default disabled)])
--if test "${enable_dv}" = "yes"
--then
++      VLC_ADD_PLUGIN([dc1394])
++      VLC_ADD_LIBS([dc1394],[`${PKG_CONFIG} --libs libdc1394-2`])
++      VLC_ADD_CPPFLAGS([access_dv],[`${PKG_CONFIG} --cflags libdc1394-2`])
++    ],
++    [AC_MSG_ERROR([Couldn't find libdc1394 >= 2.1.0, install libdc1394 development package])]
++  )
+ fi
+ 
+ dnl
+@@ -2062,120 +2062,28 @@
+ [  --enable-dv             dv input module (default disabled)])
+ if test "${enable_dv}" = "yes"
+ then
 -  AC_ARG_WITH(dv-raw1394,
 -  [    --with-dv-raw1394=PATH   libraw1394 headers and libraries])
 -  AC_ARG_WITH(dv-raw1394-tree,
@@ -155,10 +121,20 @@ diff -uar vlc-1.0.3.orig/configure.ac vlc-1.0.3/configure.ac
 -      AC_MSG_ERROR([cannot find ${real_dv_raw1394_tree}/src/.libs/libraw1394.a, make sure you compiled libraw1394 in ${with_dv_raw1394_tree}])
 -    fi
 -  fi
--
--  dnl
--  dnl Check for libavc1394
--  dnl
++  dnl
++  dnl Check for libraw1394
++  dnl
++  PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 2.0.1,
++    [
++      VLC_ADD_LIBS([access_dv],[`${PKG_CONFIG} --libs libraw1394`])
++      VLC_ADD_CPPFLAGS([access_dv],[`${PKG_CONFIG} --cflags libraw1394`])
++    ],
++    [AC_MSG_ERROR([Couldn't find libraw1394 >= 2.0.1, install libraw1394 development package])]
++  )
+ 
+   dnl
+   dnl Check for libavc1394
+   dnl
 -
 -  AC_ARG_WITH(dv-avc1394,
 -  [    --with-dv-avc1394=PATH   libavc1394 headers and libraries])
@@ -213,15 +189,20 @@ diff -uar vlc-1.0.3.orig/configure.ac vlc-1.0.3/configure.ac
 -      AC_MSG_ERROR([cannot find ${real_dv_avc1394_tree}/src/.libs/libavc1394.a, make sure you compiled libavc1394 in ${with_dv_avc1394_tree}])
 -    fi
 -  fi
--fi
-+PKG_ENABLE_MODULES_VLC([DC1394], [], [libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0], [dc1394 access module], [auto])
-+PKG_ENABLE_MODULES_VLC([access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto])
++  PKG_CHECK_MODULES(LIBAVC1394, libavc1394 >= 0.5.3,
++    [
++      VLC_ADD_PLUGIN([access_dv])
++      VLC_ADD_LIBS([access_dv],[`${PKG_CONFIG} --libs libavc1394`])
++      VLC_ADD_CPPFLAGS([access_dv],[`${PKG_CONFIG} --cflags libavc1394`])
++    ],
++    [AC_MSG_ERROR([Couldn't find libavc1394 >= 0.5.1, install libavc1394 development package])]
++  )
+ fi
  
  dnl
- dnl dvdread module: check for libdvdread
 diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394.c
 --- vlc-1.0.3.orig/modules/access/dc1394.c	2009-05-11 01:03:54.000000000 +0200
-+++ vlc-1.0.3/modules/access/dc1394.c	2009-12-10 01:07:52.000000000 +0100
++++ vlc-1.0.3/modules/access/dc1394.c	2009-12-10 15:47:55.000000000 +0100
 @@ -1,9 +1,11 @@
  /*****************************************************************************
   * dc1394.c: firewire input module
@@ -434,10 +415,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
 +            p_demux->p_sys = NULL;
 +            return VLC_EGENERIC;
 +        }
-     }
--    sys->num_ports = num_ports;
--    sys->num_cameras = num_cameras;
--    sys->camera_nodes = node_list;
++    }
 +    else if( sys->selected_camera >= (int)list->num )
 +    {
 +        msg_Err( p_demux, "There are not this many cameras. (%d/%d)",
@@ -457,22 +435,43 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
 +    {
 +        sys->camera = dc1394_camera_new(sys->p_dccontext,
 +                                          list->ids[0].guid);
-+    }
+     }
+-    sys->num_ports = num_ports;
+-    sys->num_cameras = num_cameras;
+-    sys->camera_nodes = node_list;
 +
 +    dc1394_camera_free_list (list);
 +    return VLC_SUCCESS;
  }
  
  /*****************************************************************************
-@@ -212,6 +209,7 @@
-     demux_t     *p_demux = (demux_t*)p_this;
-     demux_sys_t *p_sys;
-     es_format_t fmt;
+@@ -209,14 +206,17 @@
+  *****************************************************************************/
+ static int Open( vlc_object_t *p_this )
+ {
+-    demux_t     *p_demux = (demux_t*)p_this;
+-    demux_sys_t *p_sys;
+-    es_format_t fmt;
+-    int i;
+-    int i_width;
+-    int i_height;
+-    int i_aspect;
+-    int result = 0;
++
++
++    demux_t       *p_demux = (demux_t*)p_this;
++    demux_sys_t   *p_sys;
++    es_format_t   fmt;
 +    dc1394error_t res;
-     int i;
-     int i_width;
-     int i_height;
-@@ -231,22 +229,22 @@
++    int           i;
++    int           i_width;
++    int           i_height;
++    int           i_aspect;
++    int           result = 0;
+ 
+     if( strncmp(p_demux->psz_access, "dc1394", 6) != 0 )
+         return VLC_EGENERIC;
+@@ -231,22 +231,22 @@
      p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
      if( !p_sys )
          return VLC_ENOMEM;
@@ -508,7 +507,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
  
      /* PROCESS INPUT OPTIONS */
      if( process_options(p_demux) != VLC_SUCCESS )
-@@ -259,223 +257,145 @@
+@@ -259,223 +259,145 @@
          return VLC_EGENERIC;
      }
  
@@ -542,8 +541,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
      {
 -        int found = 0;
 -        for( i=0; i < p_sys->num_cameras; i++ )
-+        if( dc1394_reset_bus( p_sys->camera ) != DC1394_SUCCESS )
-         {
+-        {
 -            if( p_sys->camera_nodes[i].uid == p_sys->selected_uid )
 -            {
 -                p_sys->selected_camera = i;
@@ -552,7 +550,8 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
 -            }
 -        }
 -        if( !found )
--        {
++        if( dc1394_reset_bus( p_sys->camera ) != DC1394_SUCCESS )
+         {
 -            msg_Err( p_demux, "Can't find camera with uid : 0x%llx.",
 -                     p_sys->selected_uid );
 +            msg_Err( p_demux, "Unable to reset IEEE 1394 bus");
@@ -651,83 +650,83 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
 -                        p_sys->camera_nodes[p_sys->selected_camera].node,
 -                        p_sys->brightness );
 -    if( result != DC1394_SUCCESS )
-+    if( dc1394_feature_set_value( p_sys->camera,
-+                  DC1394_FEATURE_FOCUS,
-+                  p_sys->brightness ) != DC1394_SUCCESS )
-     {
+-    {
 -        msg_Err( p_demux, "unable to set init brightness to %d",
 -                 p_sys->brightness);
 -        Close( p_this );
 -        return VLC_EGENERIC;
-+        msg_Err( p_demux, "Unable to set initial brightness to %u",
-+                 p_sys->brightness );
-     }
-+    msg_Dbg( p_demux, "Initial brightness set to %u", p_sys->brightness );
- 
+-    }
+-
 -    result = dc1394_set_video_framerate( p_sys->camera_info.handle,
 -                        p_sys->camera_nodes[p_sys->selected_camera].node,
 -                        p_sys->frame_rate );
 -    if( result != DC1394_SUCCESS )
-+    if( dc1394_video_set_framerate( p_sys->camera,
-+                    p_sys->frame_rate ) != DC1394_SUCCESS )
-     {
+-    {
 -        msg_Err( p_demux, "unable to set framerate to %d",
 -                 p_sys->frame_rate );
-+        msg_Err( p_demux, "Unable to set framerate");
-         Close( p_this );
-         return VLC_EGENERIC;
-     }
+-        Close( p_this );
+-        return VLC_EGENERIC;
+-    }
 -    p_sys->misc_info.framerate = p_sys->frame_rate;
- 
+-
 -    result = dc1394_set_video_format( p_sys->camera_info.handle,
 -                        p_sys->camera_nodes[p_sys->selected_camera].node,
 -                        FORMAT_VGA_NONCOMPRESSED );
 -    if( result != DC1394_SUCCESS )
-+    if( dc1394_video_set_mode( p_sys->camera,
-+                   p_sys->video_mode ) != DC1394_SUCCESS )
++    if( dc1394_feature_set_value( p_sys->camera,
++                  DC1394_FEATURE_FOCUS,
++                  p_sys->brightness ) != DC1394_SUCCESS )
      {
 -        msg_Err( p_demux, "unable to set video format to VGA_NONCOMPRESSED" );
-+        msg_Err( p_demux, "Unable to set video mode");
-         Close( p_this );
-         return VLC_EGENERIC;
+-        Close( p_this );
+-        return VLC_EGENERIC;
++        msg_Err( p_demux, "Unable to set initial brightness to %u",
++                 p_sys->brightness );
      }
 -    p_sys->misc_info.format = FORMAT_VGA_NONCOMPRESSED;
++    msg_Dbg( p_demux, "Initial brightness set to %u", p_sys->brightness );
  
 -    result = dc1394_set_video_mode( p_sys->camera_info.handle,
 -                        p_sys->camera_nodes[p_sys->selected_camera].node,
 -                        p_sys->frame_size );
 -    if( result != DC1394_SUCCESS )
-+    if( dc1394_video_set_iso_speed( p_sys->camera,
-+                    DC1394_ISO_SPEED_400 ) != DC1394_SUCCESS )
++    if( dc1394_video_set_framerate( p_sys->camera,
++                    p_sys->frame_rate ) != DC1394_SUCCESS )
      {
 -        msg_Err( p_demux, "unable to set video mode" );
-+        msg_Err( p_demux, "Unable to set iso speed");
++        msg_Err( p_demux, "Unable to set framerate");
          Close( p_this );
          return VLC_EGENERIC;
      }
 -    p_sys->misc_info.mode = p_sys->frame_size;
--
+ 
 -    /* reprobe everything */
 -    result = dc1394_get_camera_info( p_sys->camera_info.handle,
 -                                     p_sys->camera_info.id,
 -                                     &p_sys->camera_info );
 -    if( result != DC1394_SUCCESS )
--    {
++    if( dc1394_video_set_mode( p_sys->camera,
++                   p_sys->video_mode ) != DC1394_SUCCESS )
+     {
 -        msg_Err( p_demux, "Could not get camera basic information!" );
--        Close( p_this );
--        return VLC_EGENERIC;
--    }
--
++        msg_Err( p_demux, "Unable to set video mode");
+         Close( p_this );
+         return VLC_EGENERIC;
+     }
+ 
 -    result = dc1394_get_camera_misc_info( p_sys->camera_info.handle,
 -                                          p_sys->camera_info.id,
 -                                          &p_sys->misc_info );
 -    if( result != DC1394_SUCCESS )
--    {
++    if( dc1394_video_set_iso_speed( p_sys->camera,
++                    DC1394_ISO_SPEED_400 ) != DC1394_SUCCESS )
+     {
 -        msg_Err( p_demux, "Could not get camera misc information!" );
--        Close( p_this );
--        return VLC_EGENERIC;
--    }
--
++        msg_Err( p_demux, "Unable to set iso speed");
+         Close( p_this );
+         return VLC_EGENERIC;
+     }
+ 
 -    /* set iso_channel */
 -    result = dc1394_set_iso_channel_and_speed( p_sys->camera_info.handle,
 -                                               p_sys->camera_info.id,
@@ -741,7 +740,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
 -    }
 -    msg_Dbg( p_demux, "Using ISO channel %d", p_sys->misc_info.iso_channel );
 -    p_sys->misc_info.iso_channel = p_sys->selected_camera;
- 
+-
      /* and setup capture */
 -    if( p_sys->dma_capture )
 +    res = dc1394_capture_setup( p_sys->camera,
@@ -801,7 +800,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
  
      i_aspect = vout_InitPicture( VLC_OBJECT(p_demux), &p_sys->pic,
                      VLC_FOURCC('U', 'Y', 'V', 'Y'),
-@@ -487,7 +407,7 @@
+@@ -487,7 +409,7 @@
      fmt.video.i_width = i_width;
      fmt.video.i_height = i_height;
  
@@ -810,7 +809,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
               (char*)&fmt.i_codec, fmt.video.i_width, fmt.video.i_height );
  
      p_sys->p_es_video = es_out_Add( p_demux->out, &fmt );
-@@ -508,7 +428,7 @@
+@@ -508,7 +430,7 @@
              fmt.i_bitrate = fmt.audio.i_channels * fmt.audio.i_rate *
                              fmt.audio.i_bitspersample;
  
@@ -819,7 +818,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
              fmt.audio.i_channels, fmt.audio.i_rate );
  
              p_sys->p_es_audio = es_out_Add( p_demux->out, &fmt );
-@@ -516,23 +436,16 @@
+@@ -516,23 +438,16 @@
      }
  
      /* have the camera start sending us data */
@@ -849,7 +848,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
      return VLC_SUCCESS;
  }
  
-@@ -543,10 +456,10 @@
+@@ -543,10 +458,10 @@
      int i_format = AFMT_S16_LE;
      int result;
  
@@ -862,7 +861,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
          CloseAudioDev( p_demux );
      }
  
-@@ -556,7 +469,7 @@
+@@ -556,7 +471,7 @@
      result = ioctl( p_sys->fd_audio, SNDCTL_DSP_SETFMT, &i_format );
      if( (result  < 0) || (i_format != AFMT_S16_LE) )
      {
@@ -871,7 +870,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
                            "(%d)", i_format );
          CloseAudioDev( p_demux );
      }
-@@ -564,7 +477,7 @@
+@@ -564,7 +479,7 @@
      result = ioctl( p_sys->fd_audio, SNDCTL_DSP_CHANNELS, &p_sys->channels );
      if( result < 0 )
      {
@@ -880,7 +879,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
                   p_sys->channels );
          CloseAudioDev( p_demux );
      }
-@@ -572,11 +485,12 @@
+@@ -572,11 +487,12 @@
      result = ioctl( p_sys->fd_audio, SNDCTL_DSP_SPEED, &p_sys->i_sample_rate );
      if( result < 0 )
      {
@@ -895,7 +894,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
               psz_device,
               (p_sys->channels > 1) ? "stereo" : "mono",
               p_sys->i_sample_rate );
-@@ -603,37 +517,27 @@
+@@ -603,37 +519,27 @@
  {
      demux_t     *p_demux = (demux_t*)p_this;
      demux_sys_t *p_sys = p_demux->p_sys;
@@ -943,7 +942,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
  static void MovePixelUYVY( void *src, int spos, void *dst, int dpos )
  {
      char u,v,y;
-@@ -665,6 +569,7 @@
+@@ -665,6 +571,7 @@
          dc[1] = y;
      }
  }
@@ -951,7 +950,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
  
  /*****************************************************************************
   * Demux:
-@@ -673,49 +578,35 @@
+@@ -673,49 +580,35 @@
  {
      demux_sys_t *p_sys = p_demux->p_sys;
      block_t     *p_block = NULL;
@@ -1014,7 +1013,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
      return p_block;
  }
  
-@@ -731,7 +622,7 @@
+@@ -731,7 +624,7 @@
      p_block = block_New( p_demux, p_sys->i_audio_max_frame_size );
      if( !p_block )
      {
@@ -1023,7 +1022,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
          return NULL;
      }
  
-@@ -766,8 +657,7 @@
+@@ -766,8 +659,7 @@
          p_blocka = GrabAudio( p_demux );
  
      /* Try grabbing video frame */
@@ -1033,7 +1032,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
  
      if( !p_blocka && !p_blockv )
      {
-@@ -800,6 +690,7 @@
+@@ -800,6 +692,7 @@
      bool *pb;
      int64_t    *pi64;
  
@@ -1041,7 +1040,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
      switch( i_query )
      {
          /* Special for access_demux */
-@@ -835,8 +726,13 @@
+@@ -835,8 +728,13 @@
      char *psz_parser;
      char *token = NULL;
      char *state = NULL;
@@ -1055,7 +1054,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
      psz_dup = strdup( p_demux->psz_path );
      psz_parser = psz_dup;
      for( token = strtok_r( psz_parser,":",&state); token;
-@@ -851,26 +747,26 @@
+@@ -851,26 +749,26 @@
                      * video size of 160x120 is temporarily disabled
                      */
                  msg_Err( p_demux,
@@ -1089,7 +1088,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
                  p_sys->width = 640;
                  p_sys->height = 480;
              }
-@@ -881,27 +777,62 @@
+@@ -881,27 +779,62 @@
                      " 160x120, 320x240, and 640x480. "
                      "Please specify one of them. You have specified %s.",
                      token );
@@ -1159,7 +1158,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
              else
              {
                  msg_Err( p_demux ,
-@@ -909,11 +840,16 @@
+@@ -909,11 +842,16 @@
                      " 1.875, 3.75, 7.5, 15, 30, 60. "
                      "Please specify one of them. You have specified %s.",
                      token);
@@ -1177,15 +1176,15 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
          else if( strncmp( token, "brightness=", strlen( "brightness=" ) ) == 0 )
          {
              int nr = 0;
-@@ -924,11 +860,27 @@
+@@ -924,11 +862,27 @@
                  msg_Err( p_demux, "Bad brightness value '%s', "
                                    "must be an unsigned integer.",
                                    token );
 -                free( psz_dup );
 +                free(psz_dup);
-+                return VLC_EGENERIC;
-+            }
-+        }
+                 return VLC_EGENERIC;
+             }
+         }
 +        else if( strncmp( token, "buffers=", strlen( "buffers=" ) ) == 0 )
 +        {
 +            int nr = 0;
@@ -1196,17 +1195,17 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
 +            {
 +                msg_Err( p_demux, "DMA buffers must be 1 or greater." );
 +                free(psz_dup);
-                 return VLC_EGENERIC;
-             }
++                return VLC_EGENERIC;
++            }
 +            else p_sys->dma_buffers = in_buf;
-         }
++        }
  #if 0
 +        // NOTE: If controller support is added back, more logic will needed to be added
 +        //       after the cameras are scanned.
          else if( strncmp( token, "controller=", strlen( "controller=" ) ) == 0 )
          {
              int nr = 0;
-@@ -953,31 +905,15 @@
+@@ -953,31 +907,15 @@
                  msg_Err( p_demux, "Bad camera number '%s', "
                                    "must be an unsigned integer.",
                                    token );
@@ -1243,7 +1242,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
          }
          else if( strncmp( token, "adev=", strlen( "adev=" ) ) == 0 )
          {
-@@ -997,8 +933,17 @@
+@@ -997,8 +935,17 @@
          }
          else if( strncmp( token, "focus=", strlen("focus=" ) ) == 0)
          {
@@ -1262,7 +1261,7 @@ diff -uar vlc-1.0.3.orig/modules/access/dc1394.c vlc-1.0.3/modules/access/dc1394
          }
          else if( strncmp( token, "uid=", strlen("uid=") ) == 0)
          {
-@@ -1006,7 +951,41 @@
+@@ -1006,7 +953,41 @@
              sscanf( token, "0x%llx", &p_sys->selected_uid );
          }
      }