[FFmpeg-cvslog] mpegts: Make the pat_period a double

Derek Buitenhuis git at videolan.org
Sat Oct 17 21:02:59 CEST 2015


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Fri Oct 16 15:09:19 2015 -0400| [516d34de424f3ad9720669ac7be22f7537f696b6] | committer: Derek Buitenhuis

mpegts: Make the pat_period a double

Having it as a float didn't even allow enough precision to check
for INT_MAX/2.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=516d34de424f3ad9720669ac7be22f7537f696b6
---

 libavformat/mpegtsenc.c |    4 ++--
 libavformat/version.h   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 45bab1c..6c51c94 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -102,7 +102,7 @@ typedef struct MpegTSWrite {
     int flags;
     int copyts;
     int tables_version;
-    float pat_period;
+    double pat_period;
     float sdt_period;
     int64_t last_pat_ts;
     int64_t last_sdt_ts;
@@ -1555,7 +1555,7 @@ static const AVOption options[] = {
       offsetof(MpegTSWrite, pcr_period), AV_OPT_TYPE_INT,
       { .i64 = PCR_RETRANS_TIME }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
     { "pat_period", "PAT/PMT retransmission time limit in seconds",
-      offsetof(MpegTSWrite, pat_period), AV_OPT_TYPE_FLOAT,
+      offsetof(MpegTSWrite, pat_period), AV_OPT_TYPE_DOUBLE,
       { .dbl = INT_MAX }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
     { "sdt_period", "SDT retransmission time limit in seconds",
       offsetof(MpegTSWrite, sdt_period), AV_OPT_TYPE_FLOAT,
diff --git a/libavformat/version.h b/libavformat/version.h
index 5ded978..3b316f8 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
 
 #define LIBAVFORMAT_VERSION_MAJOR  57
 #define LIBAVFORMAT_VERSION_MINOR   8
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \



More information about the ffmpeg-cvslog mailing list