X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmjpeg.c;h=f601d92899492c91fd4868f18d158d5033134a98;hb=de587c237065de4696d9d035d0504cdf34990d87;hp=126970bce1a940cc71309a16f5abc11752fb9cd6;hpb=db4b575c88074562a575cc75ac6b30f99f8cdfdb;p=vlc

diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index 126970bce1..f601d92899 100644
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -32,7 +32,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
 
 #include <vlc_codecs.h>
@@ -50,7 +51,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_shortname( "MJPEG");
-    set_description( _("M-JPEG camera demuxer") );
+    set_description( N_("M-JPEG camera demuxer") );
     set_capability( "demux", 5 );
     set_callbacks( Open, Close );
     set_category( CAT_INPUT );
@@ -155,11 +156,8 @@ static char* GetLine( demux_t *p_demux, int *p_pos )
         i--;
     }
     p_line = malloc( i + 1 );
-    if( NULL == p_line )
-    {
-        msg_Err( p_demux, "out of memory" );
+    if( p_line == NULL )
         return NULL;
-    }
     strncpy ( p_line, (char*)p_buf, i );
     p_line[i] = '\0';
 //    msg_Dbg( p_demux, "i = %d, pos = %d, %s", i, *p_pos, p_line );