Index: dtvrecorder.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/dtvrecorder.cpp,v
retrieving revision 1.9
diff -u -r1.9 dtvrecorder.cpp
--- dtvrecorder.cpp	23 Feb 2005 05:04:36 -0000	1.9
+++ dtvrecorder.cpp	29 Mar 2005 01:42:32 -0000
@@ -97,12 +97,11 @@
     bool noPayload = !tspacket->HasPayload();
     bool payloadStart = tspacket->PayloadStart();
 
-    if (noPayload | (!payloadStart & !_scanning_pes_header_for_gop))
+    if (noPayload)
         return; // not scanning or no payload to scan
 
     if (payloadStart)
     { // packet contains start of PES packet
-        _scanning_pes_header_for_gop = true; // start scanning for PES headers
         _position_within_gop_header = 0; // start looking for first byte of pattern
     }
 
@@ -166,9 +165,6 @@
                 HandleKeyframe();
                 _last_keyframe_seen = _last_seq_seen = frameSeenNum;
             }
-            // video slice ... end of "interesting" headers
-            if (0x01 <= k1 && k1 <= 0xAF)
-                _scanning_pes_header_for_gop = false;
             _position_within_gop_header = 0;
         }
     }
Index: dtvrecorder.h
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/dtvrecorder.h,v
retrieving revision 1.4
diff -u -r1.4 dtvrecorder.h
--- dtvrecorder.h	26 Jan 2005 09:04:46 -0000	1.4
+++ dtvrecorder.h	29 Mar 2005 01:42:32 -0000
@@ -18,9 +18,8 @@
   public:
     DTVRecorder::DTVRecorder() : 
         _first_keyframe(0), _position_within_gop_header(0),
-        _scanning_pes_header_for_gop(0), _keyframe_seen(false),
-        _last_keyframe_seen(0), _last_gop_seen(0), _last_seq_seen(0),
-        _stream_fd(-1), _error(false),
+        _keyframe_seen(false), _last_keyframe_seen(0), _last_gop_seen(0),
+        _last_seq_seen(0), _stream_fd(-1), _error(false),
         _request_recording(false), _request_pause(false), _wait_for_keyframe_option(true),
         _recording(false), _paused(false), _wait_for_keyframe(true),
         _buffer(0), _buffer_size(0),
@@ -62,7 +61,6 @@
     // used for scanning pes header for group of pictures header
     int _first_keyframe;
     int _position_within_gop_header;
-    bool _scanning_pes_header_for_gop;
     bool _keyframe_seen;
     long long _last_keyframe_seen, _last_gop_seen, _last_seq_seen;