X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fmash.cpp;h=244ee101fd446a6cc2fb8f8aef37cfa9932ef774;hb=a1bd8b94477962ef495117ea161246172ce83859;hp=4bdffb96862e2f61967d37c1f0daa49029e18ad2;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc

diff --git a/modules/codec/mash.cpp b/modules/codec/mash.cpp
index 4bdffb9686..244ee101fd 100644
--- a/modules/codec/mash.cpp
+++ b/modules/codec/mash.cpp
@@ -24,7 +24,12 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>
 #include <vlc_block.h>
@@ -41,7 +46,7 @@ struct decoder_sys_t
      */
     mtime_t i_pts;
     IntraP64Decoder *p_decoder;
-    vlc_bool_t b_inited;
+    bool b_inited;
     int i_counter;
 
 };
@@ -63,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 );
@@ -92,13 +97,10 @@ 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 = VLC_FALSE;
+    p_sys->b_inited = false;
     p_sys->i_counter = 0;
 
     /* Set output properties */
@@ -173,7 +175,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     mvdv = i_video_header & 0x1f; /* vertical motion vector data */
     cc = p_block->i_buffer - 4;
     msg_Dbg( p_dec, "packet size %d", cc );
-    
+ 
     /* Find out p_vdec->i_raw_size */
     p_sys->p_decoder->decode( p_block->p_buffer + 4 /*bp?*/,
                               cc /*cc?*/,
@@ -193,7 +195,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         vout_InitFormat( &p_dec->fmt_out.video, VLC_FOURCC('I','4','2','0'),
                          i_width, i_height,
                          VOUT_ASPECT_FACTOR * i_width / i_height );
-        p_sys->b_inited = VLC_TRUE;
+        p_sys->b_inited = true;
     }
     p_pic = NULL;
     p_sys->i_counter++;
@@ -209,11 +211,11 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         p_sys->p_decoder->sync();
         p_sys->i_counter = 0;
         p_frame = p_sys->p_decoder->frame();
-        p_dec->p_libvlc->pf_memcpy( p_pic->p[0].p_pixels, p_frame, i_width*i_height );
+        vlc_memcpy( p_dec, p_pic->p[0].p_pixels, p_frame, i_width*i_height );
         p_frame += i_width * i_height;
-        p_dec->p_libvlc->pf_memcpy( p_pic->p[1].p_pixels, p_frame, i_width*i_height/4 );
+        vlc_memcpy( p_dec, p_pic->p[1].p_pixels, p_frame, i_width*i_height/4 );
         p_frame += i_width * i_height/4;
-        p_dec->p_libvlc->pf_memcpy( p_pic->p[2].p_pixels, p_frame, i_width*i_height/4 );
+        vlc_memcpy( p_dec, p_pic->p[2].p_pixels, p_frame, i_width*i_height/4 );
         p_pic->date = p_sys->i_pts;
     }
     block_Release( p_block);