[FFmpeg-soc] [soc]: r4708 - in concat/libavformat: playlist.c playlist.h

[gkovacs]

Author: gkovacs
Date: Mon Jul 13 10:34:33 2009
New Revision: 4708

Log:
removed filename and workingdir from PlaylistContext

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

Modified: concat/libavformat/playlist.c
==============================================================================
--- concat/libavformat/playlist.c	Mon Jul 13 10:25:40 2009	(r4707)
+++ concat/libavformat/playlist.c	Mon Jul 13 10:34:33 2009	(r4708)
@@ -116,6 +116,7 @@ AVStream *ff_playlist_get_stream(Playlis
 void ff_playlist_relative_paths(char **flist, const char *workingdir)
 {
     while (*flist != 0) { // determine if relative paths
+        FILE *file;
         char *fullfpath;
         int wdslen = strlen(workingdir);
         int flslen = strlen(*flist);
@@ -124,7 +125,7 @@ void ff_playlist_relative_paths(char **f
         fullfpath[wdslen] = '/';
         fullfpath[wdslen+1] = 0;
         av_strlcat(fullfpath, *flist, wdslen+flslen+2);
-        if ((FILE *file = fopen(fullfpath, "r"))) {
+        if ((file = fopen(fullfpath, "r"))) {
             fclose(file);
             *flist = fullfpath;
         }

Modified: concat/libavformat/playlist.h
==============================================================================
--- concat/libavformat/playlist.h	Mon Jul 13 10:25:40 2009	(r4707)
+++ concat/libavformat/playlist.h	Mon Jul 13 10:34:33 2009	(r4708)
@@ -52,10 +52,8 @@ typedef struct PlayElem {
  */
 typedef struct PlaylistContext {
     PlayElem **pelist; /**< List of PlayElem, with each representing a playlist item */
-    int pelist_size; /**< Length of the pelist array (number of playlist items) */
+    int pelist_size; /**< Number of PlayElem stored in pelist */
     int pe_curidx; /**< Index of the PlayElem that packets are being read from */
-    char *workingdir; /**< Directory in which the playlist file is stored in */
-    char *filename; /**< Filename (not path) of the playlist file */
     int time_offsets_size; /**< Number of time offsets (number of multimedia streams), 2 with audio and video. */
     int64_t *time_offsets; /**< Time offsets, in 10^-6 seconds, for each multimedia stream */
 } PlaylistContext;