[vlc-devel] [PATCH 2/4] jpeg: support mjpeg codec

Rafaël Carré funman at videolan.org
Tue Jan 28 11:21:56 CET 2014


Why is it different from JPEG anyway?
---
 modules/codec/jpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/jpeg.c b/modules/codec/jpeg.c
index 44572c0..189211a 100644
--- a/modules/codec/jpeg.c
+++ b/modules/codec/jpeg.c
@@ -92,7 +92,7 @@ static int OpenDecoder(vlc_object_t *p_this)
 {
     decoder_t *p_dec = (decoder_t *)p_this;
 
-    if (p_dec->fmt_in.i_codec != VLC_CODEC_JPEG)
+    if (p_dec->fmt_in.i_codec != VLC_CODEC_JPEG && p_dec->fmt_in.i_codec != VLC_CODEC_MJPG)
     {
         return VLC_EGENERIC;
     }
-- 
1.8.5.3




More information about the vlc-devel mailing list