Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
2c48c5b1
Commit
2c48c5b1
authored
Mar 17, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout_aa: fix pontential memleak and cosmetics.
parent
be4ffc8b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
modules/video_output/aa.c
modules/video_output/aa.c
+9
-9
No files found.
modules/video_output/aa.c
View file @
2c48c5b1
/*****************************************************************************
/*****************************************************************************
* vout_aa.c: Aa video output display method for testing purposes
* vout_aa.c: Aa video output display method for testing purposes
*****************************************************************************
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002
-2009
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
* Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
...
@@ -90,7 +90,7 @@ static int Create( vlc_object_t *p_this )
...
@@ -90,7 +90,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
/* Allocate structure */
p_vout
->
p_sys
=
malloc
(
sizeof
(
vout_sys_t
)
);
p_vout
->
p_sys
=
malloc
(
sizeof
(
vout_sys_t
)
);
if
(
p_vout
->
p_sys
==
NULL
)
if
(
p_vout
->
p_sys
==
NULL
)
return
(
1
)
;
return
VLC_ENOMEM
;
/* Don't parse any options, but take $AAOPTS into account */
/* Don't parse any options, but take $AAOPTS into account */
aa_parseoptions
(
NULL
,
NULL
,
NULL
,
NULL
);
aa_parseoptions
(
NULL
,
NULL
,
NULL
,
NULL
);
...
@@ -98,7 +98,8 @@ static int Create( vlc_object_t *p_this )
...
@@ -98,7 +98,8 @@ static int Create( vlc_object_t *p_this )
if
(
!
(
p_vout
->
p_sys
->
aa_context
=
aa_autoinit
(
&
aa_defparams
)))
if
(
!
(
p_vout
->
p_sys
->
aa_context
=
aa_autoinit
(
&
aa_defparams
)))
{
{
msg_Err
(
p_vout
,
"cannot initialize aalib"
);
msg_Err
(
p_vout
,
"cannot initialize aalib"
);
return
(
1
);
free
(
p_vout
->
p_sys
);
return
VLC_EGENERIC
;
}
}
p_vout
->
pf_init
=
Init
;
p_vout
->
pf_init
=
Init
;
...
@@ -112,7 +113,8 @@ static int Create( vlc_object_t *p_this )
...
@@ -112,7 +113,8 @@ static int Create( vlc_object_t *p_this )
aa_autoinitkbd
(
p_vout
->
p_sys
->
aa_context
,
0
);
aa_autoinitkbd
(
p_vout
->
p_sys
->
aa_context
,
0
);
aa_autoinitmouse
(
p_vout
->
p_sys
->
aa_context
,
AA_MOUSEPRESSMASK
);
aa_autoinitmouse
(
p_vout
->
p_sys
->
aa_context
,
AA_MOUSEPRESSMASK
);
aa_hidemouse
(
p_vout
->
p_sys
->
aa_context
);
aa_hidemouse
(
p_vout
->
p_sys
->
aa_context
);
return
(
0
);
return
VLC_SUCCESS
;
}
}
/*****************************************************************************
/*****************************************************************************
...
@@ -143,9 +145,7 @@ static int Init( vout_thread_t *p_vout )
...
@@ -143,9 +145,7 @@ static int Init( vout_thread_t *p_vout )
}
}
if
(
p_pic
==
NULL
)
if
(
p_pic
==
NULL
)
{
return
VLC_EGENERIC
;
return
-
1
;
}
/* Allocate the picture */
/* Allocate the picture */
p_pic
->
p
->
p_pixels
=
aa_image
(
p_vout
->
p_sys
->
aa_context
);
p_pic
->
p
->
p_pixels
=
aa_image
(
p_vout
->
p_sys
->
aa_context
);
...
@@ -162,7 +162,7 @@ static int Init( vout_thread_t *p_vout )
...
@@ -162,7 +162,7 @@ static int Init( vout_thread_t *p_vout )
PP_OUTPUTPICTURE
[
I_OUTPUTPICTURES
]
=
p_pic
;
PP_OUTPUTPICTURE
[
I_OUTPUTPICTURES
]
=
p_pic
;
I_OUTPUTPICTURES
++
;
I_OUTPUTPICTURES
++
;
return
0
;
return
VLC_SUCCESS
;
}
}
/*****************************************************************************
/*****************************************************************************
...
@@ -212,7 +212,7 @@ static int Manage( vout_thread_t *p_vout )
...
@@ -212,7 +212,7 @@ static int Manage( vout_thread_t *p_vout )
default:
default:
break
;
break
;
}
}
return
(
0
)
;
return
VLC_SUCCESS
;
}
}
/*****************************************************************************
/*****************************************************************************
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment