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

[gkovacs]

Author: gkovacs
Date: Fri Jul 24 01:29:45 2009
New Revision: 4795

Log:
removed unused attributes from PlayElem

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

Modified: concat/libavformat/playlist.c
==============================================================================
--- concat/libavformat/playlist.c	Fri Jul 24 01:14:48 2009	(r4794)
+++ concat/libavformat/playlist.c	Fri Jul 24 01:29:45 2009	(r4795)
@@ -37,23 +37,13 @@
 void ff_playlist_init_playelem(PlayElem *pe)
 {
     int err;
-    pe->ic = av_malloc(sizeof(*(pe->ic)));
-    pe->ap = av_mallocz(sizeof(*(pe->ap)));
-    pe->ap->time_base = (AVRational){1, 25};
-    pe->fmt = 0;
-    err = av_open_input_file(&(pe->ic), pe->filename, pe->fmt, 0, pe->ap);
+    pe->ic = av_mallocz(sizeof(*(pe->ic)));
+    err = av_open_input_file(&(pe->ic), pe->filename, pe->ic->iformat, 0, NULL);
     if (err < 0)
         av_log(pe->ic, AV_LOG_ERROR, "Error during av_open_input_file\n");
-    pe->fmt = pe->ic->iformat;
-    if (!pe->fmt)
-        av_log(pe->ic, AV_LOG_ERROR, "Input format not set\n");
     err = av_find_stream_info(pe->ic);
     if (err < 0)
         av_log(pe->ic, AV_LOG_ERROR, "Could not find stream info\n");
-    if (pe->ic->pb)
-        pe->ic->pb->eof_reached = 0;
-    else
-        av_log(pe->ic, AV_LOG_ERROR, "ByteIOContext not set\n");
 }
 
 void ff_playlist_populate_context(AVFormatContext *s)

Modified: concat/libavformat/playlist.h
==============================================================================
--- concat/libavformat/playlist.h	Fri Jul 24 01:14:48 2009	(r4794)
+++ concat/libavformat/playlist.h	Fri Jul 24 01:29:45 2009	(r4795)
@@ -43,8 +43,6 @@
 typedef struct PlayElem {
     AVFormatContext *ic; /**< AVFormatContext for this playlist item */
     char *filename; /**< Filename with absolute path of this playlist item */
-    AVInputFormat *fmt; /**< AVInputFormat manually specified for this playlist item */
-    AVFormatParameters *ap; /**< AVFormatParameters for this playlist item */
 } PlayElem;
 
 /** @struct PlaylistContext