summaryrefslogtreecommitdiffstats
path: root/libvo/video_out.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-09-17 17:47:43 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-09-17 18:15:20 +0300
commit74619f275e5f706ecd00c1ec4bb19f18213a9f9e (patch)
treed558de59756def327eac7176765d253a1417fe97 /libvo/video_out.c
parent3b3dfc02ac28283345ec90ade8e0e6e64b672147 (diff)
downloadmpv-74619f275e5f706ecd00c1ec4bb19f18213a9f9e.tar.bz2
mpv-74619f275e5f706ecd00c1ec4bb19f18213a9f9e.tar.xz
VO interface: Remove obsolete draw_frame() from new interface
Diffstat (limited to 'libvo/video_out.c')
-rw-r--r--libvo/video_out.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c
index f81544fc93..9224212b35 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -21,6 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <assert.h>
#include <unistd.h>
//#include <sys/mman.h>
@@ -31,6 +32,7 @@
#include "video_out.h"
#include "aspect.h"
#include "geometry.h"
+#include "old_vo_wrapper.h"
#include "mp_msg.h"
#include "help_mp.h"
@@ -278,9 +280,10 @@ int vo_control(struct vo *vo, uint32_t request, void *data)
int vo_draw_frame(struct vo *vo, uint8_t *src[])
{
+ assert(!vo->driver->is_new);
if (!vo->config_ok)
return 0;
- return vo->driver->draw_frame(vo, src);
+ return old_vo_draw_frame(vo, src);
}
int vo_draw_slice(struct vo *vo, uint8_t *src[], int stride[], int w, int h, int x, int y)