From 1969b2a0a760c94e7b05aa209df4449545130a93 Mon Sep 17 00:00:00 2001
From: Johns <johns98@gmx.net>
Date: Sun, 22 Jan 2012 22:46:52 +0100
Subject: [PATCH] Fix bug: close codec missing.

---
 codec.c     |  4 ++++
 softhddev.c | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/codec.c b/codec.c
index fb373d5..a50187c 100644
--- a/codec.c
+++ b/codec.c
@@ -357,6 +357,10 @@ void CodecVideoOpen(VideoDecoder * decoder, const char *name, int codec_id)
 
     Debug(3, "codec: using codec %s or ID %#04x\n", name, codec_id);
 
+    if ( decoder->VideoCtx ) {
+	Error(_("codec: missing close\n"));
+    }
+
     //
     //	ffmpeg compatibility hack
     //
diff --git a/softhddev.c b/softhddev.c
index 649fcd3..102f9f1 100644
--- a/softhddev.c
+++ b/softhddev.c
@@ -389,6 +389,7 @@ static void VideoPacketInit(void)
     }
 
     atomic_set(&VideoPacketsFilled, 0);
+    VideoPacketRead = VideoPacketWrite = 0;
 }
 
 /**
@@ -461,10 +462,10 @@ static void VideoNextPacket(int codec_id)
 
     avpkt = &VideoPacketRb[VideoPacketWrite];
     if (!avpkt->stream_index) {		// ignore empty packets
-	if (codec_id == CODEC_ID_NONE) {
-	    Debug(3, "video: possible stream change loss\n");
+	if (codec_id != CODEC_ID_NONE) {
+	    return;
 	}
-	return;
+	Debug(3, "video: possible stream change loss\n");
     }
 
     if (atomic_read(&VideoPacketsFilled) >= VIDEO_PACKET_MAX - 1) {
@@ -478,6 +479,7 @@ static void VideoNextPacket(int codec_id)
     }
     // clear area for decoder, always enough space allocated
     memset(avpkt->data + avpkt->stream_index, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
     avpkt->priv = (void *)(size_t) codec_id;
 
     // advance packet write
@@ -540,8 +542,8 @@ int VideoDecode(void)
 		CodecVideoClose(MyVideoDecoder);
 		goto skip;
 	    }
+	    // size can be zero
 	    goto skip;
-	    break;
 	case CODEC_ID_MPEG2VIDEO:
 	    if (last_codec_id != CODEC_ID_MPEG2VIDEO) {
 		last_codec_id = CODEC_ID_MPEG2VIDEO;
@@ -619,7 +621,7 @@ static void StopVideo(void)
     }
     VideoPacketExit();
 
-    NewVideoStream = 0;
+    NewVideoStream = 1;
 }
 
 #ifdef DEBUG