Preallocate after we know how large the frames will be (fixes a buffer overrun)

2 files changed, 7 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 868ee38e6..f0066718d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ xine-lib (1.1.15) 2008-??-??
   * Xv deinterlacing didn't take the size of the deinterlaced image into
     account; on some chipsets, this would cause image corruption, while on
     others, there would be no problem.
+  * V4L changes:
+    - Delay preallocating video frames until we know how large they'll be
 
 xine-lib (1.1.14) 2008-06-29
   * DVB changes:
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 00c579c44..9e6b783e3 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -892,10 +892,6 @@ static int open_video_capture_device(v4l_input_plugin_t *this)
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1);
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1);
   
-  /* Pre-allocate some frames for audio and video so it doesn't have to be 
-   * done during capture */
-  allocate_frames(this, 1);
-  
   /* Unmute audio off video capture device */
   unmute_audio(this);
   
@@ -1004,7 +1000,11 @@ static int open_video_capture_device(v4l_input_plugin_t *this)
   
   xine_set_param(this->stream, XINE_PARAM_VO_ZOOM_X, 103);
   xine_set_param(this->stream, XINE_PARAM_VO_ZOOM_Y, 103);
-  
+
+  /* Pre-allocate some frames for audio and video so it doesn't have to be 
+   * done during capture */
+  allocate_frames(this, 1);
+
   /* If we made it here, everything went ok */ 
   this->audio_only = 0;
   if (tuner_found)