summaryrefslogtreecommitdiff
path: root/src/intel_video.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-06-19 15:28:43 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-06-19 15:28:43 +0100
commit06634604abf15fdd27dd007fcf81595da994146b (patch)
treea316efc23ee9063c76f64cd81f709761eeda5a42 /src/intel_video.c
parent8bfea58dbc634cadc399d3132030c591e086880c (diff)
Initialise adaptors to 0 in case xf86XVListGenericAdaptors does not
Reported-by: Zdenek Kabelac <zkabelac@redhat.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_video.c')
-rw-r--r--src/intel_video.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/intel_video.c b/src/intel_video.c
index 235845f2..0e9845d7 100644
--- a/src/intel_video.c
+++ b/src/intel_video.c
@@ -329,11 +329,9 @@ void I830InitVideo(ScreenPtr screen)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
intel_screen_private *intel = intel_get_screen_private(scrn);
- XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
+ XF86VideoAdaptorPtr *adaptors = NULL, *newAdaptors = NULL;
XF86VideoAdaptorPtr overlayAdaptor = NULL, texturedAdaptor = NULL;
- int num_adaptors;
-
- num_adaptors = xf86XVListGenericAdaptors(scrn, &adaptors);
+ int num_adaptors = xf86XVListGenericAdaptors(scrn, &adaptors);
/* Give our adaptor list enough space for the overlay and/or texture video
* adaptors.
*/