summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlfred E. Heggestad <aeh@db.org>2015-06-27 10:13:09 +0200
committerAlfred E. Heggestad <aeh@db.org>2015-06-27 10:13:09 +0200
commit4172027f214d50348e3fc029e068e8bb4a140deb (patch)
tree14a9ef65adda898cfefd059d3fdcacbca7d87daf /src
parentf8873153be5480ca6b79741e7cbdf667080e562d (diff)
vidcodec: move packet-handler to encode_update
Diffstat (limited to 'src')
-rw-r--r--src/video.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/video.c b/src/video.c
index 39909b5..86ac687 100644
--- a/src/video.c
+++ b/src/video.c
@@ -411,7 +411,7 @@ static void encode_rtp_send(struct vtx *vtx, struct vidframe *frame)
return;
/* Encode the whole picture frame */
- err = vtx->vc->ench(vtx->enc, vtx->picup, frame, packet_handler, vtx);
+ err = vtx->vc->ench(vtx->enc, vtx->picup, frame);
if (err)
return;
@@ -1038,7 +1038,8 @@ int video_encoder_set(struct video *v, struct vidcodec *vc,
vc->name, vc->variant, prm.bitrate, prm.fps);
vtx->enc = mem_deref(vtx->enc);
- err = vc->encupdh(&vtx->enc, vc, &prm, params);
+ err = vc->encupdh(&vtx->enc, vc, &prm, params,
+ packet_handler, vtx);
if (err) {
warning("video: encoder alloc: %m\n", err);
return err;