Skip to content

V
vlc-2-2
Commit 7136b2e6 authored by Jai Menon's avatar Jai Menon Committed by Rémi Duraffort
Browse files
Options

MKV : Add MJPEG codec ID. 

Signed-off-by: default avatarRémi Duraffort <ivoire@videolan.org>
parent 67ffa80a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
modules/demux/mkv/matroska_segment.cpp
View file @ 7136b2e6
...@@ -940,6 +940,10 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) ...@@ -940,6 +940,10 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
} }
stream_Delete( p_mp4_stream ); stream_Delete( p_mp4_stream );
} }
else if( !strcmp( p_tk->psz_codec, "V_MJPEG" ) )
{
p_tk->fmt.i_codec = VLC_CODEC_MJPG;
}
else if( !strcmp( p_tk->psz_codec, "A_MS/ACM" ) ) else if( !strcmp( p_tk->psz_codec, "A_MS/ACM" ) )
{ {
if( p_tk->i_extra_data < (int)sizeof( WAVEFORMATEX ) ) if( p_tk->i_extra_data < (int)sizeof( WAVEFORMATEX ) )
......
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