]> git.sesse.net Git - vlc/commitdiff
MKV : Add MJPEG codec ID.
authorJai Menon <jmenon86@gmail.com>
Tue, 13 Jul 2010 08:00:35 +0000 (13:30 +0530)
committerRémi Duraffort <ivoire@videolan.org>
Wed, 14 Jul 2010 18:10:02 +0000 (20:10 +0200)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>
modules/demux/mkv/matroska_segment.cpp

index 64e6cd1f10012318288bf417533de71882c2736e..29b55b1ec56ff95dd7a959f25b65387ad65ce71f 100644 (file)
@@ -940,6 +940,10 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
             }
             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" ) )
         {
             if( p_tk->i_extra_data < (int)sizeof( WAVEFORMATEX ) )