X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2Fsrc%2Fffmpeg.git.patch2;h=e05f3372b15df8897a11cac48b667b2623393e48;hb=a2d9ab21fbb8e29310d9cd0be439522d05d0d0ba;hp=fac116493e1388162e86911f2b62ec0d3009818d;hpb=4fedf98530b3a6ff1ada6d2b9fbbc470e3df300c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch2 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch2
index fac11649..e05f3372 100644
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch2
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch2
@@ -1,6 +1,6 @@
-diff -ur a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
---- a/libavformat/mpegtsenc.c	2017-10-13 16:31:25.000000000 -0600
-+++ b/libavformat/mpegtsenc.c	2017-10-13 20:06:27.930649088 -0600
+diff -urN a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
+--- a/libavformat/mpegtsenc.c	2018-04-20 04:02:57.000000000 -0600
++++ b/libavformat/mpegtsenc.c	2018-04-24 10:27:57.193689213 -0600
 @@ -56,9 +56,8 @@
      int sid;           /* service ID */
      char *name;
@@ -112,7 +112,7 @@ diff -ur a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
 +    ts->delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE);
 +
 +    if (ts->m2ts_mode == -1) {
-+        if (av_match_ext(s->filename, "m2ts")) {
++        if (av_match_ext(s->url, "m2ts")) {
 +            ts->m2ts_mode = 1;
 +        } else {
 +            ts->m2ts_mode = 0;
@@ -245,7 +245,7 @@ diff -ur a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
 -           ts->sdt_packet_period, ts->pat_packet_period);
 -
 -    if (ts->m2ts_mode == -1) {
--        if (av_match_ext(s->filename, "m2ts")) {
+-        if (av_match_ext(s->url, "m2ts")) {
 -            ts->m2ts_mode = 1;
 -        } else {
 -            ts->m2ts_mode = 0;
@@ -496,4 +496,3 @@ diff -ur a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
      { NULL },
  };
  
-Only in b/libavformat: mpegtsenc.c.orig