---

yaml --- r: 192775 b: refs/heads/master c: 9a766d5 h: refs/heads/master i: 192773: 5ab5203 192771: 107455e 192767: 09a5654 v: v3
git-mirror · May 18, 2010 · 4a88fd6 · 4a88fd6
1 parent bb27aea
commit 4a88fd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 283328c29db4463c31ee59f9ab418449cfa376b3
+refs/heads/master: 9a766d55b72a439b2e16ecf2ac3eb831ab25e0d3
diff --git a/trunk/drivers/media/video/ivtv/ivtv-streams.c b/trunk/drivers/media/video/ivtv/ivtv-streams.c
@@ -829,6 +829,10 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end)
 		ivtv_set_irq_mask(itv, IVTV_IRQ_ENC_VIM_RST);
 	}
 
+	/* Raw-passthrough is implied on start. Make sure it's stopped so
+	   the encoder will re-initialize when next started */
+	ivtv_vapi(itv, CX2341X_ENC_STOP_CAPTURE, 3, 1, 2, 7);
+
 	wake_up(&s->waitq);
 
 	return 0;