Commit 13752933 authored by Frédéric Yhuel's avatar Frédéric Yhuel Committed by Jean-Baptiste Kempf

demux/mp4: do not demux f4v files for now

This is a temporary workaround until someone add support for f4v.

Work-around #4915
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit f47133cbac88a1ef04e526df27eaa4e86a6f2d5a)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 6809c5dc
...@@ -279,11 +279,10 @@ static int Open( vlc_object_t * p_this ) ...@@ -279,11 +279,10 @@ static int Open( vlc_object_t * p_this )
bool b_enabled_es; bool b_enabled_es;
/* A little test to see if it could be a mp4 */ /* A little test to see if it could be a mp4 */
if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 ) return VLC_EGENERIC; if( stream_Peek( p_demux->s, &p_peek, 11 ) < 11 ) return VLC_EGENERIC;
switch( VLC_FOURCC( p_peek[4], p_peek[5], p_peek[6], p_peek[7] ) ) switch( VLC_FOURCC( p_peek[4], p_peek[5], p_peek[6], p_peek[7] ) )
{ {
case ATOM_ftyp:
case ATOM_moov: case ATOM_moov:
case ATOM_foov: case ATOM_foov:
case ATOM_moof: case ATOM_moof:
...@@ -294,6 +293,11 @@ static int Open( vlc_object_t * p_this ) ...@@ -294,6 +293,11 @@ static int Open( vlc_object_t * p_this )
case ATOM_wide: case ATOM_wide:
case VLC_FOURCC( 'p', 'n', 'o', 't' ): case VLC_FOURCC( 'p', 'n', 'o', 't' ):
break; break;
case ATOM_ftyp:
/* We don't yet support f4v, but avformat does. */
if( p_peek[8] == 'f' && p_peek[9] == '4' && p_peek[10] == 'v' )
return VLC_EGENERIC;
break;
default: default:
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
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