Ticket #7849: t7849_mythtv_avi_seektable_fix.diff

programs/mythtranscode/mpeg2fix.cpp

@@ -732 +732 @@
     if (type)
         fmt = av_find_input_format(type);
 
+    avifile = (strcmp(fmt->name, "avi")) ? 1 : 0;
+
     // Open recording
     VERBOSE(MPF_GENERAL, QString("Opening %1").arg(inputfile));
 
@@ -2570 +2572 @@
 
     AVPacket pkt;
     int count = 0;
+    int prevpos = 0;
 
     /*============ initialise AV ===============*/
     QByteArray fname = file.toLocal8Bit();
@@ -2583 +2586 @@
         if (pkt.stream_index == vid_id)
         {
             if (pkt.flags & PKT_FLAG_KEY)
-                posMap[count] = pkt.pos;
+                posMap[count] = avifile ? prevpos + 1 : pkt.pos;
             count++;
         }
+        prevpos = pkt.pos;
+
         av_free_packet(&pkt);
     }
 

programs/mythtranscode/mpeg2fix.h

@@ -244 +244 @@
     int aud_stream_count;
     int64_t ptsIncrement;
     int64_t ptsOffset;  //was initPTS
+    bool avifile;
 
     int discard;
     //control options