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
44d12709
Commit
44d12709
authored
Jul 08, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation of the switcher module.
parent
02b33898
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
modules/stream_out/switcher.c
modules/stream_out/switcher.c
+7
-6
No files found.
modules/stream_out/switcher.c
View file @
44d12709
...
...
@@ -34,6 +34,7 @@
#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_avcodec.h>
#include <vlc_filter.h>
#include <vlc_block.h>
...
...
@@ -265,7 +266,7 @@ static int Open( vlc_object_t *p_this )
}
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"port"
,
&
val
);
p_sys
->
i_fd
=
net_ListenUDP1
(
p_stream
,
NULL
,
val
.
i_int
);
p_sys
->
i_fd
=
net_ListenUDP1
(
VLC_OBJECT
(
p_stream
)
,
NULL
,
val
.
i_int
);
if
(
p_sys
->
i_fd
<
0
)
{
free
(
p_sys
);
...
...
@@ -387,13 +388,13 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
vlc_avcodec_lock
();
if
(
avcodec_open
(
id
->
ff_enc_c
,
id
->
ff_enc
)
)
{
avcodec_unlock
();
vlc_
avcodec_unlock
();
msg_Err
(
p_stream
,
"cannot open encoder"
);
av_free
(
id
->
ff_enc_c
);
free
(
id
);
return
NULL
;
}
avcodec_unlock
();
vlc_
avcodec_unlock
();
id
->
p_buffer_out
=
malloc
(
AVCODEC_MAX_AUDIO_FRAME_SIZE
*
2
);
id
->
p_samples
=
calloc
(
id
->
ff_enc_c
->
frame_size
*
p_fmt
->
audio
.
i_channels
,
...
...
@@ -798,14 +799,14 @@ static mtime_t VideoCommand( sout_stream_t *p_stream, sout_stream_id_t *id )
id
->
ff_enc_c
->
mb_decision
=
FF_MB_DECISION_SIMPLE
;
id
->
ff_enc_c
->
pix_fmt
=
PIX_FMT_YUV420P
;
avcodec_lock
();
vlc_
avcodec_lock
();
if
(
avcodec_open
(
id
->
ff_enc_c
,
id
->
ff_enc
)
)
{
avcodec_unlock
();
vlc_
avcodec_unlock
();
msg_Err
(
p_stream
,
"cannot open encoder"
);
return
0
;
}
avcodec_unlock
();
vlc_
avcodec_unlock
();
id
->
p_buffer_out
=
malloc
(
id
->
ff_enc_c
->
width
*
id
->
ff_enc_c
->
height
*
3
);
id
->
p_frame
=
avcodec_alloc_frame
();
...
...
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