1.1 --- a/gst-gmyth/nuvdemux/gstnuvdemux.c	Fri May 25 18:22:59 2007 +0100
     1.2 +++ b/gst-gmyth/nuvdemux/gstnuvdemux.c	Wed May 30 14:43:43 2007 +0100
     1.3 @@ -527,17 +527,7 @@
     1.4  	goto done;
     1.5  		  
     1.6    data = buf->data;
     1.7 -<<<<<<< .mine
     1.8 -=======
     1.9 -  /* verifies if it is a MythTV file header */
    1.10 -  if ( ( data[0] == 'M' || data[0] == 'N') && data[6] == 'V' )  {
    1.11 -	  nuv->priv->state = GST_NUV_DEMUX_HEADER_DATA;
    1.12 -	  goto done;
    1.13 -  }
    1.14 -  /* it is not a NUV file header, so now can move the 12 bytes */
    1.15 -  res = gst_nuv_demux_move_bytes (nuv, 12);
    1.16  
    1.17 ->>>>>>> .r719
    1.18    h->i_type = GPOINTER_TO_INT (data[0]);
    1.19    h->i_compression = GPOINTER_TO_INT (data[1]);
    1.20    h->i_keyframe = GPOINTER_TO_INT (data[2]);
    1.21 @@ -1567,6 +1557,7 @@
    1.22  	nuv = GST_NUV_DEMUX (gst_pad_get_parent (pad));
    1.23  	
    1.24  	switch  (GST_EVENT_TYPE (event)) {
    1.25 +	#if 0
    1.26  		case GST_EVENT_NEWSEGMENT:
    1.27  		{
    1.28  			gboolean update;
    1.29 @@ -1598,6 +1589,15 @@
    1.30  			}
    1.31  			break;
    1.32  		}
    1.33 +	#endif
    1.34 +		case GST_EVENT_FLUSH_START:
    1.35 +		{
    1.36 +			nuv->priv->new_file = TRUE;					
    1.37 +			nuv->priv->state = GST_NUV_DEMUX_START;
    1.38 +			nuv->priv->offset = 0;
    1.39 +			res = gst_pad_event_default (pad, event);
    1.40 +			break;
    1.41 +		}
    1.42  		default:
    1.43  			res = gst_pad_event_default (pad, event);
    1.44  			break;