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
1a90a3cd
Commit
1a90a3cd
authored
Mar 05, 2005
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* ALL: a few fixes.
parent
9336401b
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
13 deletions
+19
-13
modules/access/dvdnav.c
modules/access/dvdnav.c
+4
-0
modules/access/screen/x11.c
modules/access/screen/x11.c
+3
-2
modules/codec/rawvideo.c
modules/codec/rawvideo.c
+4
-0
modules/control/http.c
modules/control/http.c
+4
-8
src/input/input.c
src/input/input.c
+1
-1
src/interface/interface.c
src/interface/interface.c
+3
-2
No files found.
modules/access/dvdnav.c
View file @
1a90a3cd
...
@@ -734,6 +734,10 @@ static int Demux( demux_t *p_demux )
...
@@ -734,6 +734,10 @@ static int Demux( demux_t *p_demux )
case
DVDNAV_STOP
:
/* EOF */
case
DVDNAV_STOP
:
/* EOF */
msg_Dbg
(
p_demux
,
"DVDNAV_STOP"
);
msg_Dbg
(
p_demux
,
"DVDNAV_STOP"
);
#if DVD_READ_CACHE
dvdnav_free_cache_block
(
p_sys
->
dvdnav
,
packet
);
#endif
return
0
;
return
0
;
case
DVDNAV_HIGHLIGHT
:
case
DVDNAV_HIGHLIGHT
:
...
...
modules/access/screen/x11.c
View file @
1a90a3cd
...
@@ -69,9 +69,10 @@ int screen_InitCapture( demux_t *p_demux )
...
@@ -69,9 +69,10 @@ int screen_InitCapture( demux_t *p_demux )
case
16
:
case
16
:
i_chroma
=
VLC_FOURCC
(
'R'
,
'V'
,
'1'
,
'6'
);
break
;
i_chroma
=
VLC_FOURCC
(
'R'
,
'V'
,
'1'
,
'6'
);
break
;
case
24
:
case
24
:
i_chroma
=
VLC_FOURCC
(
'R'
,
'V'
,
'2'
,
'4'
);
break
;
case
32
:
case
32
:
i_chroma
=
VLC_FOURCC
(
'R'
,
'V'
,
'3'
,
'2'
);
break
;
i_chroma
=
VLC_FOURCC
(
'R'
,
'V'
,
'3'
,
'2'
);
win_info
.
depth
=
32
;
break
;
default:
default:
msg_Err
(
p_demux
,
"unknown screen depth %i"
,
win_info
.
depth
);
msg_Err
(
p_demux
,
"unknown screen depth %i"
,
win_info
.
depth
);
XCloseDisplay
(
p_display
);
XCloseDisplay
(
p_display
);
...
...
modules/codec/rawvideo.c
View file @
1a90a3cd
...
@@ -108,6 +108,10 @@ static int OpenDecoder( vlc_object_t *p_this )
...
@@ -108,6 +108,10 @@ static int OpenDecoder( vlc_object_t *p_this )
case
VLC_FOURCC
(
'R'
,
'V'
,
'1'
,
'5'
):
case
VLC_FOURCC
(
'R'
,
'V'
,
'1'
,
'5'
):
break
;
break
;
case
VLC_FOURCC
(
'y'
,
'v'
,
'1'
,
'2'
):
p_dec
->
fmt_in
.
i_codec
=
VLC_FOURCC
(
'Y'
,
'V'
,
'1'
,
'2'
);
break
;
default:
default:
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
...
modules/control/http.c
View file @
1a90a3cd
...
@@ -146,8 +146,7 @@ static int uri_test_param( char *psz_uri, const char *psz_name );
...
@@ -146,8 +146,7 @@ static int uri_test_param( char *psz_uri, const char *psz_name );
static
void
uri_decode_url_encoded
(
char
*
psz
);
static
void
uri_decode_url_encoded
(
char
*
psz
);
static
char
*
Find_end_MRL
(
char
*
psz
);
static
char
*
Find_end_MRL
(
char
*
psz
);
static
playlist_item_t
*
parse_MRL
(
intf_thread_t
*
,
char
*
psz
);
static
playlist_item_t
*
parse_MRL
(
intf_thread_t
*
,
char
*
psz
);
/*****************************************************************************
/*****************************************************************************
*
*
...
@@ -3291,7 +3290,7 @@ static char *Find_end_MRL( char *psz )
...
@@ -3291,7 +3290,7 @@ static char *Find_end_MRL( char *psz )
* create an item with all information in it, and return the item.
* create an item with all information in it, and return the item.
* return NULL if there is an error.
* return NULL if there is an error.
**********************************************************************/
**********************************************************************/
playlist_item_t
*
parse_MRL
(
intf_thread_t
*
p_intf
,
char
*
psz
)
static
playlist_item_t
*
parse_MRL
(
intf_thread_t
*
p_intf
,
char
*
psz
)
{
{
char
**
ppsz_options
=
NULL
;
char
**
ppsz_options
=
NULL
;
char
*
mrl
;
char
*
mrl
;
...
@@ -3395,11 +3394,8 @@ playlist_item_t * parse_MRL( intf_thread_t *p_intf, char *psz )
...
@@ -3395,11 +3394,8 @@ playlist_item_t * parse_MRL( intf_thread_t *p_intf, char *psz )
}
}
}
}
for
(
i
=
0
;
i
<
i_options
;
i
++
)
for
(
i
=
0
;
i
<
i_options
;
i
++
)
free
(
ppsz_options
[
i
]
);
{
if
(
i_options
)
free
(
ppsz_options
);
free
(
ppsz_options
[
i
]
);
}
free
(
ppsz_options
);
return
p_item
;
return
p_item
;
}
}
src/input/input.c
View file @
1a90a3cd
...
@@ -620,7 +620,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
...
@@ -620,7 +620,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
p_input
->
p_sout
=
sout_NewInstance
(
p_input
,
psz
);
p_input
->
p_sout
=
sout_NewInstance
(
p_input
,
psz
);
if
(
p_input
->
p_sout
==
NULL
)
if
(
p_input
->
p_sout
==
NULL
)
{
{
msg_Err
(
p_input
,
"cannot start stream output instance,"
\
msg_Err
(
p_input
,
"cannot start stream output instance,
"
\
"aborting"
);
"aborting"
);
free
(
psz
);
free
(
psz
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
...
src/interface/interface.c
View file @
1a90a3cd
...
@@ -163,7 +163,8 @@ int intf_RunThread( intf_thread_t *p_intf )
...
@@ -163,7 +163,8 @@ int intf_RunThread( intf_thread_t *p_intf )
[
VLCApplication
sharedApplication
];
[
VLCApplication
sharedApplication
];
}
}
if
(
p_intf
->
b_block
&&
(
!
strncmp
(
p_intf
->
p_module
->
psz_object_name
,
"macosx"
,
6
)
||
if
(
p_intf
->
b_block
&&
(
!
strncmp
(
p_intf
->
p_module
->
psz_object_name
,
"macosx"
,
6
)
||
!
strncmp
(
p_intf
->
p_vlc
->
psz_object_name
,
"clivlc"
,
6
)
)
)
!
strncmp
(
p_intf
->
p_vlc
->
psz_object_name
,
"clivlc"
,
6
)
)
)
{
{
/* VLC in normal primary interface mode */
/* VLC in normal primary interface mode */
...
...
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