summaryrefslogtreecommitdiff
path: root/code
diff options
context:
space:
mode:
authorUros Majstorovic <majstor@majstor.org>2017-09-09 15:51:17 +0000
committerUros Majstorovic <majstor@majstor.org>2017-09-09 15:51:17 +0000
commitf80da46b5117930349a5d033857c94f659f687ce (patch)
tree66f2befe130b6c52eeeca652d5e6732f03e51483 /code
parent7d3e6b74812527f69aabf9c1bbb0eb37051f94da (diff)
parent2f99b87aed4d6a5934c8760f329225563698305a (diff)
fixed conflict
Diffstat (limited to 'code')
-rw-r--r--code/core/rbuf_send.c2
-rw-r--r--code/test/vid/Makefile3
-rw-r--r--code/test/vid/client.c1
-rw-r--r--code/test/vid/tools.c2
4 files changed, 6 insertions, 2 deletions
diff --git a/code/core/rbuf_send.c b/code/core/rbuf_send.c
index 323596f..bc1c1b9 100644
--- a/code/core/rbuf_send.c
+++ b/code/core/rbuf_send.c
@@ -82,7 +82,7 @@ ssize_t ecp_rbuf_handle_ack(ECPConnection *conn, ecp_seq_t seq, unsigned char mt
int rv = ECP_OK;
buf = conn->rbuf.send;
- if (buf == NULL) return ECP_ERR;
+ if (buf == NULL) return ECP_OK;
if (size < 0) return size;
if (size < rsize) return ECP_ERR;
diff --git a/code/test/vid/Makefile b/code/test/vid/Makefile
index 1689040..3f78157 100644
--- a/code/test/vid/Makefile
+++ b/code/test/vid/Makefile
@@ -1,4 +1,5 @@
-LIBVPX_HOME=/home/majstor/libvpx
+# LIBVPX_HOME=/home/majstor/libvpx
+LIBVPX_HOME=/Users/majstor/src/libvpx
CFLAGS=-D_V4L2_KERNEL_ -I/usr/src/linux-headers-$(uname -r) -I$(LIBVPX_HOME) -I../../core -I../../vconn -I../../util
LDFLAGS=-L$(LIBVPX_HOME)
dep=../../core/libecpcore.a ../../core/crypto/libecpcr.a ../../core/htable/libecpht.a ../../core/posix/libecptr.a ../../core/posix/libecptm.a ../../vconn/libecpvconn.a ../../util/libecputil.a ../init.o
diff --git a/code/test/vid/client.c b/code/test/vid/client.c
index cc84435..858d2ad 100644
--- a/code/test/vid/client.c
+++ b/code/test/vid/client.c
@@ -93,6 +93,7 @@ int main(int argc, char *argv[]) {
const char *codec_arg = "vp9";
const VpxInterface *decoder = get_vpx_decoder_by_name(codec_arg);
+ outfile = stdout;
if (!decoder) die_codec(NULL, "Unknown input codec.");
fprintf(stderr, "Using %s\n", vpx_codec_iface_name(decoder->codec_interface()));
diff --git a/code/test/vid/tools.c b/code/test/vid/tools.c
index 3331670..0307ef6 100644
--- a/code/test/vid/tools.c
+++ b/code/test/vid/tools.c
@@ -159,5 +159,7 @@ int vpx_img_write_f(const vpx_image_t *img, FILE *file) {
buf += stride;
}
}
+
+ return 1;
}