[FFmpeg-cvslog] avformat/hlsenc: Refactored 'get_int_from_double' function to allow reuse
Karthick J
git at videolan.org
Thu Nov 30 05:16:31 EET 2017
ffmpeg | branch: master | Karthick J <kjeyapal at akamai.com> | Thu Nov 30 10:54:54 2017 +0800| [3684b5e56a54b850bd725ffc63cb454e23fd79db] | committer: Steven Liu
avformat/hlsenc: Refactored 'get_int_from_double' function to allow reuse
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3684b5e56a54b850bd725ffc63cb454e23fd79db
---
libavformat/hlsenc.c | 7 +------
libavformat/hlsplaylist.h | 5 +++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index f63b08d709..cdfbf45823 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -203,11 +203,6 @@ typedef struct HLSContext {
int http_persistent;
} HLSContext;
-static int get_int_from_double(double val)
-{
- return (int)((val - (int)val) >= 0.001) ? (int)(val + 1) : (int)val;
-}
-
static int mkdir_p(const char *path) {
int ret = 0;
char *temp = av_strdup(path);
@@ -1211,7 +1206,7 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs)
for (en = vs->segments; en; en = en->next) {
if (target_duration <= en->duration)
- target_duration = get_int_from_double(en->duration);
+ target_duration = hls_get_int_from_double(en->duration);
}
vs->discontinuity_set = 0;
diff --git a/libavformat/hlsplaylist.h b/libavformat/hlsplaylist.h
index 9263a6463b..4cbc8cacc9 100644
--- a/libavformat/hlsplaylist.h
+++ b/libavformat/hlsplaylist.h
@@ -36,6 +36,11 @@ typedef enum {
PLAYLIST_TYPE_NB,
} PlaylistType;
+static inline int hls_get_int_from_double(double val)
+{
+ return (int)((val - (int)val) >= 0.001) ? (int)(val + 1) : (int)val;
+}
+
void ff_hls_write_playlist_version(AVIOContext *out, int version);
void ff_hls_write_stream_info(AVStream *st, AVIOContext *out,
int bandwidth, char *filename);
More information about the ffmpeg-cvslog
mailing list