# HG changeset patch
# User rosfran
# Date 1180118819 -3600
# Node ID 1ee5df4c9ccdefc9b6697e71736e3d97e0897a40
# Parent  e01c60057f07e824a419872b68825ce53ae1115c
[svn r722] Removed the conflicted state.

diff -r e01c60057f07 -r 1ee5df4c9ccd gst-gmyth/nuvdemux/gstnuvdemux.c
--- a/gst-gmyth/nuvdemux/gstnuvdemux.c	Fri May 25 18:25:50 2007 +0100
+++ b/gst-gmyth/nuvdemux/gstnuvdemux.c	Fri May 25 19:46:59 2007 +0100
@@ -527,17 +527,7 @@
 	goto done;
 		  
   data = buf->data;
-<<<<<<< .mine
-=======
-  /* verifies if it is a MythTV file header */
-  if ( ( data[0] == 'M' || data[0] == 'N') && data[6] == 'V' )  {
-	  nuv->priv->state = GST_NUV_DEMUX_HEADER_DATA;
-	  goto done;
-  }
-  /* it is not a NUV file header, so now can move the 12 bytes */
-  res = gst_nuv_demux_move_bytes (nuv, 12);
 
->>>>>>> .r719
   h->i_type = GPOINTER_TO_INT (data[0]);
   h->i_compression = GPOINTER_TO_INT (data[1]);
   h->i_keyframe = GPOINTER_TO_INT (data[2]);
@@ -1567,6 +1557,7 @@
 	nuv = GST_NUV_DEMUX (gst_pad_get_parent (pad));
 	
 	switch  (GST_EVENT_TYPE (event)) {
+	#if 0
 		case GST_EVENT_NEWSEGMENT:
 		{
 			gboolean update;
@@ -1598,6 +1589,15 @@
 			}
 			break;
 		}
+	#endif
+		case GST_EVENT_FLUSH_START:
+		{
+			nuv->priv->new_file = TRUE;					
+			nuv->priv->state = GST_NUV_DEMUX_START;
+			nuv->priv->offset = 0;
+			res = gst_pad_event_default (pad, event);
+			break;
+		}
 		default:
 			res = gst_pad_event_default (pad, event);
 			break;