[FFmpeg-devel] [PATCH 1/2] hlsenc: remove the AVIOContext for the playlist from the muxer context

2015-02-20 Thread Hendrik Leppkes 
Its only used in one function, having it in the context serves no purpose.
---
 libavformat/hlsenc.c | 28 +---
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 29bf30e..1831c17 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -85,8 +85,6 @@ typedef struct HLSContext {
 char *baseurl;
 char *format_options_str;
 AVDictionary *format_options;
-
-AVIOContext *pb;
 } HLSContext;
 
 static int hls_delete_old_segments(HLSContext *hls) {
@@ -243,10 +241,11 @@ static int hls_window(AVFormatContext *s, int last)
 HLSSegment *en;
 int target_duration = 0;
 int ret = 0;
+AVIOContext *out = NULL;
 int64_t sequence = FFMAX(hls-start_sequence, hls-sequence - 
hls-nb_entries);
 int version = hls-flags  HLS_SINGLE_FILE ? 4 : 3;
 
-if ((ret = avio_open2(hls-pb, s-filename, AVIO_FLAG_WRITE,
+if ((ret = avio_open2(out, s-filename, AVIO_FLAG_WRITE,
   s-interrupt_callback, NULL))  0)
 goto fail;
 
@@ -255,32 +254,32 @@ static int hls_window(AVFormatContext *s, int last)
 target_duration = ceil(en-duration);
 }
 
-avio_printf(hls-pb, #EXTM3U\n);
-avio_printf(hls-pb, #EXT-X-VERSION:%d\n, version);
+avio_printf(out, #EXTM3U\n);
+avio_printf(out, #EXT-X-VERSION:%d\n, version);
 if (hls-allowcache == 0 || hls-allowcache == 1) {
-avio_printf(hls-pb, #EXT-X-ALLOW-CACHE:%s\n, hls-allowcache == 0 ? 
NO : YES);
+avio_printf(out, #EXT-X-ALLOW-CACHE:%s\n, hls-allowcache == 0 ? 
NO : YES);
 }
-avio_printf(hls-pb, #EXT-X-TARGETDURATION:%d\n, target_duration);
-avio_printf(hls-pb, #EXT-X-MEDIA-SEQUENCE:%PRId64\n, sequence);
+avio_printf(out, #EXT-X-TARGETDURATION:%d\n, target_duration);
+avio_printf(out, #EXT-X-MEDIA-SEQUENCE:%PRId64\n, sequence);
 
 av_log(s, AV_LOG_VERBOSE, EXT-X-MEDIA-SEQUENCE:%PRId64\n,
sequence);
 
 for (en = hls-segments; en; en = en-next) {
-avio_printf(hls-pb, #EXTINF:%f,\n, en-duration);
+avio_printf(out, #EXTINF:%f,\n, en-duration);
 if (hls-flags  HLS_SINGLE_FILE)
- avio_printf(hls-pb, #EXT-X-BYTERANGE:%PRIi64@%PRIi64\n,
+ avio_printf(out, #EXT-X-BYTERANGE:%PRIi64@%PRIi64\n,
  en-size, en-pos);
 if (hls-baseurl)
-avio_printf(hls-pb, %s, hls-baseurl);
-avio_printf(hls-pb, %s\n, en-filename);
+avio_printf(out, %s, hls-baseurl);
+avio_printf(out, %s\n, en-filename);
 }
 
 if (last)
-avio_printf(hls-pb, #EXT-X-ENDLIST\n);
+avio_printf(out, #EXT-X-ENDLIST\n);
 
 fail:
-avio_closep(hls-pb);
+avio_closep(out);
 return ret;
 }
 
@@ -486,7 +485,6 @@ static int hls_write_trailer(struct AVFormatContext *s)
 
 hls_free_segments(hls-segments);
 hls_free_segments(hls-old_segments);
-avio_closep(hls-pb);
 return 0;
 }
 
-- 
1.9.5.msysgit.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 1/2] hlsenc: remove the AVIOContext for the playlist from the muxer context

2015-02-20 Thread Michael Niedermayer 
On Fri, Feb 20, 2015 at 12:55:13PM +0100, Hendrik Leppkes wrote:
 Its only used in one function, having it in the context serves no purpose.
 ---
  libavformat/hlsenc.c | 28 +---
  1 file changed, 13 insertions(+), 15 deletions(-)

applied

thanks

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Freedom in capitalist society always remains about the same as it was in
ancient Greek republics: Freedom for slave owners. -- Vladimir Lenin


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel