Removes trailing spaces. Removes tabs.

[vlc] / modules / codec / ffmpeg / postprocess.c

diff --git a/modules/codec/ffmpeg/postprocess.c b/modules/codec/ffmpeg/postprocess.c
index 54de0e3edaeb02b0e89b2ac9f7419660d57d8831..17c938947088cbfd5dbc27d5f5687fda991a1beb 100644 (file)
--- a/modules/codec/ffmpeg/postprocess.c
+++ b/modules/codec/ffmpeg/postprocess.c
@@ -23,8 +23,8 @@
  *****************************************************************************/
 
 #include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/decoder.h>
+#include <vlc_vout.h>
+#include <vlc_codec.h>
 
 /* ffmpeg header */
 #ifdef HAVE_FFMPEG_AVCODEC_H
@@ -35,8 +35,6 @@
 
 #include "ffmpeg.h"
 
-#ifdef LIBAVCODEC_PP
-
 #ifdef HAVE_POSTPROC_POSTPROCESS_H
 #   include <postproc/postprocess.h>
 #else
@@ -118,13 +116,13 @@ void *E_(OpenPostproc)( decoder_t *p_dec, vlc_bool_t *pb_pp )
 }
 
 /*****************************************************************************
- * InitPostproc: 
+ * InitPostproc:
  *****************************************************************************/
 int E_(InitPostproc)( decoder_t *p_dec, void *p_data,
                       int i_width, int i_height, int pix_fmt )
 {
     video_postproc_sys_t *p_sys = (video_postproc_sys_t *)p_data;
-    int32_t i_cpu = p_dec->p_libvlc_global->i_cpu;
+    unsigned i_cpu = vlc_CPU();
     int i_flags = 0;
 
     /* Set CPU capabilities */
@@ -169,7 +167,7 @@ int E_(InitPostproc)( decoder_t *p_dec, void *p_data,
 }
 
 /*****************************************************************************
- * PostprocPict: 
+ * PostprocPict:
  *****************************************************************************/
 int E_(PostprocPict)( decoder_t *p_dec, void *p_data,
                       picture_t *p_pic, AVFrame *p_ff_pic )
@@ -198,7 +196,7 @@ int E_(PostprocPict)( decoder_t *p_dec, void *p_data,
 }
 
 /*****************************************************************************
- * ClosePostproc: 
+ * ClosePostproc:
  *****************************************************************************/
 void E_(ClosePostproc)( decoder_t *p_dec, void *p_data )
 {
@@ -265,5 +263,3 @@ static int PPQCallback( vlc_object_t *p_this, char const *psz_cmd,
 
     return VLC_SUCCESS;
 }
-
-#endif /* LIBAVCODEC_PP */