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
6443ce82
Commit
6443ce82
authored
Nov 19, 2006
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Don't Warn on VP62 video in NSV. It's supported now, so no need to print useless info about it.
parent
33e36e85
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
modules/demux/nsv.c
modules/demux/nsv.c
+4
-4
No files found.
modules/demux/nsv.c
View file @
6443ce82
...
@@ -449,7 +449,6 @@ static int ReadNSVs( demux_t *p_demux )
...
@@ -449,7 +449,6 @@ static int ReadNSVs( demux_t *p_demux )
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
msg_Dbg
(
p_demux
,
"new NSVs chunk"
);
/* Video */
/* Video */
switch
(
(
fcc
=
VLC_FOURCC
(
header
[
4
],
header
[
5
],
header
[
6
],
header
[
7
]
)
)
)
switch
(
(
fcc
=
VLC_FOURCC
(
header
[
4
],
header
[
5
],
header
[
6
],
header
[
7
]
)
)
)
{
{
...
@@ -457,10 +456,11 @@ static int ReadNSVs( demux_t *p_demux )
...
@@ -457,10 +456,11 @@ static int ReadNSVs( demux_t *p_demux )
case
VLC_FOURCC
(
'V'
,
'P'
,
'3'
,
'1'
):
case
VLC_FOURCC
(
'V'
,
'P'
,
'3'
,
'1'
):
fcc
=
VLC_FOURCC
(
'V'
,
'P'
,
'3'
,
'1'
);
fcc
=
VLC_FOURCC
(
'V'
,
'P'
,
'3'
,
'1'
);
break
;
break
;
case
VLC_FOURCC
(
'V'
,
'P'
,
'6'
,
'2'
):
case
VLC_FOURCC
(
'N'
,
'O'
,
'N'
,
'E'
):
case
VLC_FOURCC
(
'N'
,
'O'
,
'N'
,
'E'
):
break
;
break
;
default:
default:
msg_Warn
(
p_demux
,
"unknown codec
"
);
msg_Warn
(
p_demux
,
"unknown codec
%4.4s"
,
(
char
*
)
&
fcc
);
break
;
break
;
}
}
if
(
fcc
!=
VLC_FOURCC
(
'N'
,
'O'
,
'N'
,
'E'
)
&&
fcc
!=
p_sys
->
fmt_video
.
i_codec
)
if
(
fcc
!=
VLC_FOURCC
(
'N'
,
'O'
,
'N'
,
'E'
)
&&
fcc
!=
p_sys
->
fmt_video
.
i_codec
)
...
@@ -496,7 +496,7 @@ static int ReadNSVs( demux_t *p_demux )
...
@@ -496,7 +496,7 @@ static int ReadNSVs( demux_t *p_demux )
case
VLC_FOURCC
(
'N'
,
'O'
,
'N'
,
'E'
):
case
VLC_FOURCC
(
'N'
,
'O'
,
'N'
,
'E'
):
break
;
break
;
default:
default:
msg_Warn
(
p_demux
,
"unknown codec
"
);
msg_Warn
(
p_demux
,
"unknown codec
%4.4s"
,
(
char
*
)
&
fcc
);
break
;
break
;
}
}
...
@@ -546,7 +546,7 @@ static int ReadNSVs( demux_t *p_demux )
...
@@ -546,7 +546,7 @@ static int ReadNSVs( demux_t *p_demux )
msg_Dbg
(
p_demux
,
"invalid fps (0x00)"
);
msg_Dbg
(
p_demux
,
"invalid fps (0x00)"
);
p_sys
->
i_pcr_inc
=
40000
;
p_sys
->
i_pcr_inc
=
40000
;
}
}
msg_Dbg
(
p_demux
,
" - fps=%.3f"
,
1000000
.
0
/
(
double
)
p_sys
->
i_pcr_inc
);
//
msg_Dbg( p_demux, " - fps=%.3f", 1000000.0 / (double)p_sys->i_pcr_inc );
return
VLC_SUCCESS
;
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