summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-23 18:00:42 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-23 18:00:42 +0000
commit1f9463e268522b15bbe3bdf54ebd1a5e924feff7 (patch)
tree1aa02f43044503d9aaf180ff8de22d7d882c4b24 /libvo
parentb6a0fee3502442e46c5347a8d01bdf74702819dd (diff)
downloadmpv-1f9463e268522b15bbe3bdf54ebd1a5e924feff7.tar.bz2
mpv-1f9463e268522b15bbe3bdf54ebd1a5e924feff7.tar.xz
yvu9,if09,y8,y800 support and multifile fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6532 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_xvidix.c11
-rw-r--r--libvo/vosub_vidix.c3
2 files changed, 12 insertions, 2 deletions
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index affb66a5d3..4c76a0722d 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -236,6 +236,14 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
case IMGFMT_YUY2:
image_depth = 16;
break;
+ case IMGFMT_YVU9:
+ case IMGFMT_IF09:
+ image_depth = 9;
+ break;
+ case IMGFMT_Y800:
+ case IMGFMT_Y8:
+ image_depth = 8;
+ break;
default:
image_depth = 16;
mp_msg(MSGT_VO, MSGL_FATAL, "Unknown image format: %s\n",
@@ -478,5 +486,6 @@ static uint32_t control(uint32_t request, void *data, ...)
}
return VO_TRUE;
}
- return VO_NOTIMPL;
+ vidix_control(request, data);
+// return VO_NOTIMPL;
}
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c
index 6ea30b69d1..7d43654721 100644
--- a/libvo/vosub_vidix.c
+++ b/libvo/vosub_vidix.c
@@ -761,8 +761,9 @@ uint32_t vidix_control(uint32_t request, void *data, ...)
*(uint32_t *)data = vidix_play.num_frames;
return VO_TRUE;
}
+ return VO_NOTIMPL;
// WARNING: we drop extra parameters (...) here!
- return server_control(request,data); //VO_NOTIMPL;
+// return server_control(request,data); //VO_NOTIMPL;
}
int vidix_preinit(const char *drvname,void *server)