X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fmash.cpp;h=244ee101fd446a6cc2fb8f8aef37cfa9932ef774;hb=e5127326704fa04d68ae39c807e1d5e738a854dc;hp=74e63f885a843cba4f65a1e7d3d70aa58ee96828;hpb=5b55ee1bb0a0212b967f8f4a33824ffc6b7c7f09;p=vlc

diff --git a/modules/codec/mash.cpp b/modules/codec/mash.cpp
index 74e63f885a..244ee101fd 100644
--- a/modules/codec/mash.cpp
+++ b/modules/codec/mash.cpp
@@ -28,7 +28,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>
 #include <vlc_block.h>
@@ -67,7 +68,7 @@ static block_t   *SendFrame  ( decoder_t *, block_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Video decoder using openmash") );
+    set_description( N_("Video decoder using openmash") );
     set_capability( "decoder", 50 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_VCODEC );
@@ -96,10 +97,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     /* Allocate the memory needed to store the decoder's structure */
     if( ( p_dec->p_sys = p_sys =
           (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
-    {
-        msg_Err( p_dec, "out of memory" );
-        return VLC_EGENERIC;
-    }
+        return VLC_ENOMEM;
     /* Misc init */
     p_sys->i_pts = 0;
     p_sys->b_inited = false;