Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
002746bf
Commit
002746bf
authored
Dec 23, 2009
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x264: remove unneeded p_buffer
parent
2e74ee84
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
16 deletions
+1
-16
modules/codec/x264.c
modules/codec/x264.c
+1
-16
No files found.
modules/codec/x264.c
View file @
002746bf
...
...
@@ -670,9 +670,6 @@ struct encoder_sys_t
x264_t
*
h
;
x264_param_t
param
;
int
i_buffer
;
uint8_t
*
p_buffer
;
mtime_t
i_interpolated_dts
;
char
*
psz_stat_name
;
...
...
@@ -712,7 +709,6 @@ static int Open ( vlc_object_t *p_this )
return
VLC_ENOMEM
;
p_sys
->
i_interpolated_dts
=
0
;
p_sys
->
psz_stat_name
=
NULL
;
p_sys
->
p_buffer
=
NULL
;
x264_param_default
(
&
p_sys
->
param
);
p_sys
->
param
.
i_width
=
p_enc
->
fmt_in
.
video
.
i_width
;
...
...
@@ -1159,16 +1155,6 @@ static int Open ( vlc_object_t *p_this )
return
VLC_EGENERIC
;
}
/* alloc mem */
p_sys
->
i_buffer
=
4
*
p_enc
->
fmt_in
.
video
.
i_width
*
p_enc
->
fmt_in
.
video
.
i_height
+
1000
;
p_sys
->
p_buffer
=
malloc
(
p_sys
->
i_buffer
);
if
(
!
p_sys
->
p_buffer
)
{
Close
(
VLC_OBJECT
(
p_enc
)
);
return
VLC_ENOMEM
;
}
/* get the globals headers */
p_enc
->
fmt_out
.
i_extra
=
0
;
p_enc
->
fmt_out
.
p_extra
=
NULL
;
...
...
@@ -1224,7 +1210,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
p_block
=
block_New
(
p_enc
,
i_out
);
if
(
!
p_block
)
return
NULL
;
/* copy encoded data directly to block
, instead taking via p_sys->p_buffer
*/
/* copy encoded data directly to block */
for
(
i
=
0
,
i_out
=
0
;
i
<
i_nal
;
i
++
)
{
memcpy
(
p_block
->
p_buffer
+
i_out
,
nal
[
i
].
p_payload
,
nal
[
i
].
i_payload
);
...
...
@@ -1311,6 +1297,5 @@ static void Close( vlc_object_t *p_this )
vlc_mutex_unlock
(
lock
.
p_address
);
#endif
free
(
p_sys
->
p_buffer
);
free
(
p_sys
);
}
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