diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /stream/tvi_dummy.c | |
parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz |
Merge branch 'master' into release/current
Diffstat (limited to 'stream/tvi_dummy.c')
-rw-r--r-- | stream/tvi_dummy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/stream/tvi_dummy.c b/stream/tvi_dummy.c index 571dace9ab..9eee9437f0 100644 --- a/stream/tvi_dummy.c +++ b/stream/tvi_dummy.c @@ -20,6 +20,7 @@ #include "config.h" #include <stdio.h> +#include "common/common.h" #include "video/img_fourcc.h" #include "tv.h" @@ -105,7 +106,7 @@ static int do_control(priv_t *priv, int cmd, void *arg) static double grab_video_frame(priv_t *priv, char *buffer, int len) { memset(buffer, 0x42, len); - return 1; + return MP_NOPTS_VALUE; } static int get_video_framesize(priv_t *priv) @@ -117,7 +118,7 @@ static int get_video_framesize(priv_t *priv) static double grab_audio_frame(priv_t *priv, char *buffer, int len) { memset(buffer, 0x42, len); - return 1; + return MP_NOPTS_VALUE; } static int get_audio_framesize(priv_t *priv) |