mpegts-mythtv harmonization

mythtv/external/FFmpeg/libavformat/avformat.h

@@ -1155,6 +1155,12 @@ typedef struct AVProgram {
     int pcr_pid;
     int pmt_version;
 
+    /**
+     * A reference-counted buffer holding the last seen PMT in an MPEG-TS.
+     * Only set by mpegts-mythtv.
+     */
+    AVBufferRef *pmt_section;
+
     /*****************************************************************
      * All fields below this line are not part of the public API. They
      * may not be used outside of libavformat and can be changed and
@@ -1334,14 +1340,8 @@ typedef struct AVFormatContext {
 
     /* Myth addons */
     /* mpeg-ts support */
-    void (*streams_changed)(void*);
+    void (*streams_changed)(void* stream_change_data, int avprogram_id);
     void *stream_change_data;
-
-    /**
-     * A reference-counted buffer holding the last seen PMT in an MPEG-TS.
-     * Only set by mpegts-mythtv.
-     */
-    AVBufferRef *pmt_section;
     /* End Myth addons */
 
     /**

mythtv/external/FFmpeg/libavformat/mpeg.c

@@ -638,7 +638,7 @@ static int mpegps_read_packet(AVFormatContext *s,
 
     /* notify the callback of the change in streams */
     if (s->streams_changed) {
-        s->streams_changed(s->stream_change_data);
+        s->streams_changed(s->stream_change_data, -1);
     }
 
 found: