[vlc-commits] commit: MKV : Add MJPEG codec ID. (Jai Menon )

[git at videolan.org]

vlc | branch: master | Jai Menon <jmenon86 at gmail.com> | Tue Jul 13 13:48:35 2010 +0530| [7136b2e6aaeb52a4f82d916db13957b8391c79b9] | committer: Rémi Duraffort 

MKV : Add MJPEG codec ID.

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7136b2e6aaeb52a4f82d916db13957b8391c79b9
---

 modules/demux/mkv/matroska_segment.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index 64e6cd1..29b55b1 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -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 ) )