Ticket #789: mythtv_novideopts_laf.patch

libs/libavformat/utils.c

@@ -545 +545 @@
     ic->iformat = fmt;
     ic->duration = AV_NOPTS_VALUE;
     ic->start_time = AV_NOPTS_VALUE;
+    ic->last_IP_pts = AV_NOPTS_VALUE;
     pstrcpy(ic->filename, sizeof(ic->filename), filename);
 
     /* allocate private data */
@@ -894 +897 @@
             if(st->last_IP_pts != AV_NOPTS_VALUE)
                 st->cur_dts = pkt->dts = st->last_IP_pts;
             else
-                pkt->dts = st->cur_dts;
+                /* if any other stream has already seen a pts, use it in preference */
+                if (s->last_IP_pts != AV_NOPTS_VALUE)
+                    st->cur_dts = pkt->dts = s->last_IP_pts;
+                else
+                    pkt->dts = st->cur_dts;
         } else {
             st->cur_dts = pkt->dts;
         }
@@ -906 +913 @@
             st->cur_dts += st->last_IP_duration;
         st->last_IP_duration  = pkt->duration;
         st->last_IP_pts= pkt->pts;
+        /* save in case any stream doesnt have pts' */
+        if (s->last_IP_pts == AV_NOPTS_VALUE)
+            s->last_IP_pts = st->last_IP_pts;
         /* cannot compute PTS if not present (we can compute it only
            by knowing the futur */
     } else if(pkt->pts != AV_NOPTS_VALUE || pkt->dts != AV_NOPTS_VALUE || pkt->duration){
@@ -1203 +1213 @@
     /* fail safe */
     s->cur_ptr = NULL;
     s->cur_len = 0;
+    s->last_IP_pts = AV_NOPTS_VALUE;
     
     /* for each stream, reset read state */
     for(i = 0; i < s->nb_streams; i++) {

libs/libavformat/avformat.h

@@ -348 +348 @@
     
     int flags;
 #define AVFMT_FLAG_GENPTS       0x0001 ///< generate pts if missing even if it requires parsing future frames
+    /* used in case a stream never has pts, set up any stream that has pts' */
+    int64_t last_IP_pts;
 } AVFormatContext;
 
 typedef struct AVPacketList {