diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_encoder.cc | 2 | ||||
| -rw-r--r-- | src/multiplexer.cc | 2 | ||||
| -rw-r--r-- | src/server.cc | 12 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/audio_encoder.cc b/src/audio_encoder.cc index 97c6084..119268c 100644 --- a/src/audio_encoder.cc +++ b/src/audio_encoder.cc @@ -76,7 +76,7 @@ void AudioEncoder::thread_main() out_frame->number = in_frame->number; out_frame->endOfFrameStream = in_frame->endOfFrameStream; - //delete in_frame; + delete in_frame; in_frame = NULL; output_queue->push(out_frame); diff --git a/src/multiplexer.cc b/src/multiplexer.cc index 096ff86..eafcc8b 100644 --- a/src/multiplexer.cc +++ b/src/multiplexer.cc @@ -457,7 +457,7 @@ void Multiplexer::iso11172_stream() */ } -#define BYPASS TYPE_VIDEO +//#define BYPASS TYPE_VIDEO //#define BYPASS TYPE_AUDIO void Multiplexer::multiplex() { diff --git a/src/server.cc b/src/server.cc index 4d556fc..29571d6 100644 --- a/src/server.cc +++ b/src/server.cc @@ -120,11 +120,13 @@ void newConnection(Socket *socket, Info *info) info->info("Closing connection..."); - // Send end of stream frame. - frame->endOfFrameStream = true; - enc->encode(frame); - - if(enc) delete enc; + // No encoder exists, if this is a pure snapshot (image) connection. + if(enc) { + // Send end of stream frame. + frame->endOfFrameStream = true; + enc->encode(frame); + delete enc; + } info->info("CONNECTION CLOSED"); } |