Skip to content

V
vlc-gpu
Commit eeaad0a8 authored by Jean-Philippe Andre's avatar Jean-Philippe Andre
Browse files
Options

M-JPEG: fix MJPEG demux to be able to read VLC MPJPEG streams 

That's clearly a hack but at least it works.
parent 306f4f06
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
modules/demux/mjpeg.c
View file @ eeaad0a8
...@@ -185,18 +185,19 @@ static bool CheckMimeHeader( demux_t *p_demux, int *p_header_size ) ...@@ -185,18 +185,19 @@ static bool CheckMimeHeader( demux_t *p_demux, int *p_header_size )
*p_header_size = -1; *p_header_size = -1;
return false; return false;
} }
if( p_sys->i_data_peeked < 3) if( p_sys->i_data_peeked < 5)
{ {
msg_Err( p_demux, "data shortage" ); msg_Err( p_demux, "data shortage" );
*p_header_size = -2; *p_header_size = -2;
return false; return false;
} }
if( strncmp( (char *)p_sys->p_peek, "--", 2 ) ) if( strncmp( (char *)p_sys->p_peek, "--", 2 ) != 0
&& strncmp( (char *)p_sys->p_peek, "\r\n--", 4 ) != 0 )
{ {
*p_header_size = 0; *p_header_size = 0;
return false; return false;
} }
i_pos = 2; i_pos = *p_sys->p_peek == '-' ? 2 : 4;
psz_line = GetLine( p_demux, &i_pos ); psz_line = GetLine( p_demux, &i_pos );
if( NULL == psz_line ) if( NULL == psz_line )
{ {
......
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