[FFmpeg-cvslog] avformat/hls: correct comment for ensure_playlist()

Ganesh Ajjanagadde git at videolan.org
Fri Aug 21 15:30:45 CEST 2015


ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde at gmail.com> | Thu Aug 20 19:27:24 2015 -0400| [5edf8b118d9f1e00389b7a8fc9f43bc873698399] | committer: Michael Niedermayer

avformat/hls: correct comment for ensure_playlist()

Comment was previously slightly incorrect.
Also, it was placed in the wrong location.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/hls.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index caecbde..82dd744 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -482,7 +482,9 @@ static void handle_rendition_args(struct rendition_info *info, const char *key,
 /* used by parse_playlist to allocate a new variant+playlist when the
  * playlist is detected to be a Media Playlist (not Master Playlist)
  * and we have no parent Master Playlist (parsing of which would have
- * allocated the variant and playlist already) */
+ * allocated the variant and playlist already)
+ * *pls == NULL  => Master Playlist or parentless Media Playlist
+ * *pls != NULL => parented Media Playlist, playlist+variant allocated */
 static int ensure_playlist(HLSContext *c, struct playlist **pls, const char *url)
 {
     if (*pls)
@@ -493,8 +495,6 @@ static int ensure_playlist(HLSContext *c, struct playlist **pls, const char *url
     return 0;
 }
 
-/* pls = NULL  => Master Playlist or parentless Media Playlist
- * pls = !NULL => parented Media Playlist, playlist+variant allocated */
 static int open_in(HLSContext *c, AVIOContext **in, const char *url)
 {
     AVDictionary *tmp = NULL;



More information about the ffmpeg-cvslog mailing list