From 3b89a673155fa3863e13f3595d651f37b024e6c5 Mon Sep 17 00:00:00 2001 From: Caligula useraccount Date: Mon, 8 Jun 2015 03:32:29 +0200 Subject: ffserver: Use singlejpeg muxer for jpeg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes Ticket4218 Based on patch by: Otávio Ribeiro Signed-off-by: Michael Niedermayer --- ffserver.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ffserver.c') diff --git a/ffserver.c b/ffserver.c index 3cb29e4726..2b19bba9ba 100644 --- a/ffserver.c +++ b/ffserver.c @@ -967,6 +967,10 @@ static int handle_connection(HTTPContext *c) /* close connection if trailer sent */ if (c->state == HTTPSTATE_SEND_DATA_TRAILER) return -1; + /* Check if it is a single jpeg frame 123 */ + if (c->stream->single_frame && c->data_count > c->cur_frame_bytes && c->cur_frame_bytes > 0) { + close_connection(c); + } break; case HTTPSTATE_RECEIVE_DATA: /* no need to read if no events */ -- cgit v1.2.3