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

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jai Menon <jmenon86 at gmail.com> | Tue Jul 13 13:48:35 2010 +0530| [c84bf792b9d8455c0224d133c38488e717329d67] | committer: Jean-Baptiste Kempf 

MKV : Add MJPEG codec ID.

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

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

 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 bc32dd6..117dc03 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -909,6 +909,10 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
             }
             stream_Delete( p_mp4_stream );
         }
+        else if( !strcmp( tracks[i_track]->psz_codec, "V_MJPEG" ) )
+        {
+            p_tk->fmt.i_codec = VLC_CODEC_MJPG;
+        }
         else if( !strcmp( tracks[i_track]->psz_codec, "A_MS/ACM" ) )
         {
             if( tracks[i_track]->i_extra_data < (int)sizeof( WAVEFORMATEX ) )