Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
501d6e22
Commit
501d6e22
authored
Apr 18, 2010
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not use vout_AllocatePicture in dynamicoverlay sub filter
parent
447d0c8f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
17 deletions
+4
-17
modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
...les/video_filter/dynamicoverlay/dynamicoverlay_commands.c
+4
-17
No files found.
modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
View file @
501d6e22
...
@@ -483,24 +483,13 @@ static int exec_DataSharedMem( filter_t *p_filter,
...
@@ -483,24 +483,13 @@ static int exec_DataSharedMem( filter_t *p_filter,
uint8_t
*
p_data
,
*
p_in
;
uint8_t
*
p_data
,
*
p_in
;
size_t
i_neededsize
=
0
;
size_t
i_neededsize
=
0
;
p_ovl
->
data
.
p_pic
=
malloc
(
sizeof
(
picture_t
)
);
p_ovl
->
data
.
p_pic
=
picture_New
(
p_params
->
fourcc
,
p_params
->
i_width
,
p_params
->
i_height
,
1
,
1
);
if
(
p_ovl
->
data
.
p_pic
==
NULL
)
if
(
p_ovl
->
data
.
p_pic
==
NULL
)
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
video_format_Setup
(
&
p_ovl
->
format
,
p_params
->
fourcc
,
p_ovl
->
format
=
p_ovl
->
data
.
p_pic
->
format
;
p_params
->
i_width
,
p_params
->
i_height
,
1
,
1
);
if
(
vout_AllocatePicture
(
p_filter
,
p_ovl
->
data
.
p_pic
,
p_ovl
->
format
.
i_chroma
,
p_params
->
i_width
,
p_params
->
i_height
,
p_ovl
->
format
.
i_sar_num
,
p_ovl
->
format
.
i_sar_den
)
)
{
msg_Err
(
p_filter
,
"Unable to allocate picture"
);
free
(
p_ovl
->
data
.
p_pic
);
p_ovl
->
data
.
p_pic
=
NULL
;
return
VLC_ENOMEM
;
}
for
(
size_t
i_plane
=
0
;
i_plane
<
(
size_t
)
p_ovl
->
data
.
p_pic
->
i_planes
;
for
(
size_t
i_plane
=
0
;
i_plane
<
(
size_t
)
p_ovl
->
data
.
p_pic
->
i_planes
;
++
i_plane
)
++
i_plane
)
...
@@ -515,7 +504,6 @@ static int exec_DataSharedMem( filter_t *p_filter,
...
@@ -515,7 +504,6 @@ static int exec_DataSharedMem( filter_t *p_filter,
"Insufficient data in shared memory. need %zu, got %zu"
,
"Insufficient data in shared memory. need %zu, got %zu"
,
i_neededsize
,
i_size
);
i_neededsize
,
i_size
);
picture_Release
(
p_ovl
->
data
.
p_pic
);
picture_Release
(
p_ovl
->
data
.
p_pic
);
free
(
p_ovl
->
data
.
p_pic
);
p_ovl
->
data
.
p_pic
=
NULL
;
p_ovl
->
data
.
p_pic
=
NULL
;
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -525,7 +513,6 @@ static int exec_DataSharedMem( filter_t *p_filter,
...
@@ -525,7 +513,6 @@ static int exec_DataSharedMem( filter_t *p_filter,
{
{
msg_Err
(
p_filter
,
"Unable to attach to shared memory"
);
msg_Err
(
p_filter
,
"Unable to attach to shared memory"
);
picture_Release
(
p_ovl
->
data
.
p_pic
);
picture_Release
(
p_ovl
->
data
.
p_pic
);
free
(
p_ovl
->
data
.
p_pic
);
p_ovl
->
data
.
p_pic
=
NULL
;
p_ovl
->
data
.
p_pic
=
NULL
;
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
...
...
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