[FFmpeg-soc] [soc]: r4886 - in concat/libavformat: playlist.c xspf.c

[gkovacs]

Author: gkovacs
Date: Sat Aug  1 05:16:43 2009
New Revision: 4886

Log:
fixing other locations were 0 and NULL were used improperly

Modified:
   concat/libavformat/playlist.c
   concat/libavformat/xspf.c

Modified: concat/libavformat/playlist.c
==============================================================================
--- concat/libavformat/playlist.c	Sat Aug  1 05:13:55 2009	(r4885)
+++ concat/libavformat/playlist.c	Sat Aug  1 05:16:43 2009	(r4886)
@@ -87,7 +87,8 @@ void ff_playlist_split_encodedstring(con
 {
     char c, *ts, **flist;
     int i, len, buflen, *sepidx;
-    buflen = sepidx = len = 0;
+    sepidx = NULL;
+    buflen = len = 0;
     sepidx = av_fast_realloc(sepidx, &buflen, ++len);
     sepidx[0] = 0;
     ts = s;
@@ -133,7 +134,7 @@ void ff_playlist_add_path(PlaylistContex
     ctx->flist[ctx->pelist_size] = NULL;
     ctx->flist[ctx->pelist_size-1] = itempath;
     ctx->durations = av_realloc(ctx->durations, sizeof(*(ctx->durations)) * (ctx->pelist_size+1));
-    ctx->durations[ctx->pelist_size] = NULL;
+    ctx->durations[ctx->pelist_size] = 0;
 }
 
 void ff_playlist_relative_paths(char **flist, const int len, const char *workingdir)

Modified: concat/libavformat/xspf.c
==============================================================================
--- concat/libavformat/xspf.c	Sat Aug  1 05:13:55 2009	(r4885)
+++ concat/libavformat/xspf.c	Sat Aug  1 05:16:43 2009	(r4886)
@@ -55,7 +55,8 @@ static int xspf_list_files(ByteIOContext
     char buf[1024];
     char s[10];
     char t[] = "<location>";
-    state = flist = buflen = i = j = 0;
+    flist = NULL;
+    state = buflen = i = j = 0;
     while ((c = url_fgetc(b))) {
         if (c == EOF)
             break;