Commit 0cab348c authored by Dennis van Amerongen's avatar Dennis van Amerongen

Backport [17877]: Don't warn on VP62 in NSV.

parent 343daf47
...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment