[FFmpeg-cvslog] mpegts: Make the sdt_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:20 2015 -0400| [4ffdba2418abe25562f7c17a7b62e2588d7a3a5f] | committer: Derek Buitenhuis

mpegts: Make the sdt_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=4ffdba2418abe25562f7c17a7b62e2588d7a3a5f
---

 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 6c51c94..4d74252 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -103,7 +103,7 @@ typedef struct MpegTSWrite {
     int copyts;
     int tables_version;
     double pat_period;
-    float sdt_period;
+    double sdt_period;
     int64_t last_pat_ts;
     int64_t last_sdt_ts;
 
@@ -1558,7 +1558,7 @@ static const AVOption options[] = {
       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,
+      offsetof(MpegTSWrite, sdt_period), AV_OPT_TYPE_DOUBLE,
       { .dbl = INT_MAX }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
     { NULL },
 };
diff --git a/libavformat/version.h b/libavformat/version.h
index 3b316f8..4426955 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 101
+#define LIBAVFORMAT_VERSION_MICRO 102
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \



More information about the ffmpeg-cvslog mailing list