Remove dead code

This was done with the help of callcatcher [1]. Only functions which
are statically known to be unused are removed.

Some unused functions are not removed yet, because they might be needed
in the near future (such as open_output_stream for the encode branch).

There is one user visible change: the --subcc option did nothing, and is
removed with this commit.

[1] http://www.skynet.ie/~caolan/Packages/callcatcher.html

6 files changed, 0 insertions, 46 deletions

diff --git a/libvo/aspect.c b/libvo/aspect.c
index 8dcd8b6843..8a26a5ac00 100644
--- a/libvo/aspect.c
+++ b/libvo/aspect.c
@@ -143,11 +143,6 @@ static void panscan_calc_internal(struct vo *vo, int zoom)
     vo->panscan_y = vo_panscan_area * vo->panscan_amount;
 }
 
-void panscan_calc(struct vo *vo)
-{
-    panscan_calc_internal(vo, A_ZOOM);
-}
-
 /**
  * vos that set vo_dwidth and v_dheight correctly should call this to update
  * vo_panscan_x and vo_panscan_y
diff --git a/libvo/aspect.h b/libvo/aspect.h
index 07f928a9ff..f5ff1a8ad7 100644
--- a/libvo/aspect.h
+++ b/libvo/aspect.h
@@ -22,7 +22,6 @@
 
 struct vo;
 void panscan_init(struct vo *vo);
-void panscan_calc(struct vo *vo);
 void panscan_calc_windowed(struct vo *vo);
 
 void aspect_save_orig(struct vo *vo, int orgw, int orgh);
diff --git a/libvo/osd.c b/libvo/osd.c
index 4fabc5c9ac..0b5ef8efa2 100644
--- a/libvo/osd.c
+++ b/libvo/osd.c
@@ -128,20 +128,6 @@ void vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, in
 #endif
 }
 
-void vo_draw_alpha_uyvy(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){
-#if ARCH_X86
-	// ordered by speed / fastest first
-	if(gCpuCaps.hasMMX2)
-		vo_draw_alpha_uyvy_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
-	else if(gCpuCaps.hasMMX)
-		vo_draw_alpha_uyvy_MMX(w, h, src, srca, srcstride, dstbase, dststride);
-	else
-		vo_draw_alpha_uyvy_X86(w, h, src, srca, srcstride, dstbase, dststride);
-#else
-		vo_draw_alpha_uyvy_C(w, h, src, srca, srcstride, dstbase, dststride);
-#endif
-}
-
 void vo_draw_alpha_rgb24(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){
 #if ARCH_X86
 	// ordered by speed / fastest first
diff --git a/libvo/osd.h b/libvo/osd.h
index 4d79e854c8..8f57e6b444 100644
--- a/libvo/osd.h
+++ b/libvo/osd.h
@@ -26,7 +26,6 @@ void vo_draw_alpha_init(void); // build tables
 
 void vo_draw_alpha_yv12(int w,  int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
 void vo_draw_alpha_yuy2(int w,  int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
-void vo_draw_alpha_uyvy(int w,  int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
 void vo_draw_alpha_rgb24(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
 void vo_draw_alpha_rgb32(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
 void vo_draw_alpha_rgb12(int w, int h, unsigned char* src, unsigned char *srca,
diff --git a/libvo/osd_template.c b/libvo/osd_template.c
index 16fe4cff11..2cc07bba39 100644
--- a/libvo/osd_template.c
+++ b/libvo/osd_template.c
@@ -177,30 +177,6 @@ static inline void RENAME(vo_draw_alpha_yuy2)(int w,int h, unsigned char* src, u
     return;
 }
 
-static inline void RENAME(vo_draw_alpha_uyvy)(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){
-  int y;
-#if defined(FAST_OSD)
-  w=w>>1;
-#endif
-  for(y=0;y<h;y++){
-    register int x;
-    for(x=0;x<w;x++){
-#ifdef FAST_OSD
-      if(srca[2*x+0]) dstbase[4*x+2]=src[2*x+0];
-      if(srca[2*x+1]) dstbase[4*x+0]=src[2*x+1];
-#else
-      if(srca[x]) {
-	dstbase[2*x+1]=((dstbase[2*x+1]*srca[x])>>8)+src[x];
-	dstbase[2*x]=((((signed)dstbase[2*x]-128)*srca[x])>>8)+128;
-      }
-#endif
-    }
-    src+=srcstride;
-    srca+=srcstride;
-    dstbase+=dststride;
-  }
-}
-
 static inline void RENAME(vo_draw_alpha_rgb24)(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){
     int y;
 #if HAVE_MMX
diff --git a/libvo/video_out.h b/libvo/video_out.h
index 82302a91d4..e9d9e69202 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -49,7 +49,6 @@ enum mp_voctrl {
     /* libmpcodecs direct rendering */
     VOCTRL_GET_IMAGE,
     VOCTRL_DRAW_IMAGE,
-    VOCTRL_SET_SPU_PALETTE,
     VOCTRL_GET_PANSCAN,
     VOCTRL_SET_PANSCAN,
     VOCTRL_SET_EQUALIZER,               // struct voctrl_set_equalizer_args