diff options
| author | Caligula useraccount <caligula@sarijopen.student.utwente.nl> | 2015-06-08 03:32:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 03:36:22 +0200 |
| commit | 3b89a673155fa3863e13f3595d651f37b024e6c5 (patch) | |
| tree | f373843ff5fbf59caff9c9ea8279857374557a05 /ffserver.c | |
| parent | 51ac1f616f5863c7bd32e04496339b7c2d27880f (diff) | |
| download | ffmpeg-3b89a673155fa3863e13f3595d651f37b024e6c5.tar.gz | |
ffserver: Use singlejpeg muxer for jpeg
Fixes Ticket4218
Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 */ |