[FFmpeg-soc] [soc]: r4875 - in concat: ffplay.c.diff libavformat/playlist.c libavformat/playlist.h

[gkovacs]

Author: gkovacs
Date: Sat Aug  1 03:33:14 2009
New Revision: 4875

Log:
temporarily removing ff_playlist_get_stream used only by ffplay

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

Modified: concat/ffplay.c.diff
==============================================================================
--- concat/ffplay.c.diff	Sat Aug  1 03:30:26 2009	(r4874)
+++ concat/ffplay.c.diff	Sat Aug  1 03:33:14 2009	(r4875)
@@ -1,5 +1,5 @@
 diff --git a/ffplay.c b/ffplay.c
-index 5f88a46..7e0ecb1 100644
+index 5f88a46..b49b978 100644
 --- a/ffplay.c
 +++ b/ffplay.c
 @@ -30,6 +30,8 @@
@@ -115,7 +115,7 @@ index 5f88a46..7e0ecb1 100644
                  /* if error, we skip the frame */
                  pkt_temp->size = 0;
 +                if (pl_ctx && pkt) {
-+                    AVStream *propst = ff_playlist_get_stream(pl_ctx, st_idx+1, pkt->stream_index);
++                    AVStream *propst = 0;//ff_playlist_get_stream(pl_ctx, st_idx+1, pkt->stream_index);
 +                    if (propst && propst->codec && propst->codec->codec_type == CODEC_TYPE_AUDIO) {
 +                        if (!propst->codec->codec) {
 +                            AVCodec *codec = avcodec_find_decoder(propst->codec->codec_id);

Modified: concat/libavformat/playlist.c
==============================================================================
--- concat/libavformat/playlist.c	Sat Aug  1 03:30:26 2009	(r4874)
+++ concat/libavformat/playlist.c	Sat Aug  1 03:33:14 2009	(r4875)
@@ -83,16 +83,6 @@ void ff_playlist_set_context(AVFormatCon
         ic->priv_data = ctx;
 }
 
-AVStream *ff_playlist_get_stream(PlaylistContext *ctx, int pe_idx, int stream_index)
-{
-    if (ctx && pe_idx < ctx->pelist_size && ctx->icl && ctx->icl[pe_idx] &&
-        ctx->icl[pe_idx] && stream_index < ctx->icl[pe_idx]->nb_streams &&
-        ctx->icl[pe_idx]->streams && ctx->icl[pe_idx]->streams[stream_index])
-        return ctx->icl[pe_idx]->streams[stream_index];
-    else
-        return NULL;
-}
-
 void ff_playlist_split_encodedstring(char *s, char sep, char ***flist_ptr, int *len_ptr)
 {
     char c, *ts, **flist;

Modified: concat/libavformat/playlist.h
==============================================================================
--- concat/libavformat/playlist.h	Sat Aug  1 03:30:26 2009	(r4874)
+++ concat/libavformat/playlist.h	Sat Aug  1 03:33:14 2009	(r4875)
@@ -82,14 +82,6 @@ PlaylistContext* ff_playlist_get_context
  */
 void ff_playlist_set_context(AVFormatContext *ic, PlaylistContext *ctx);
 
-/** @fn AVStream *ff_playlist_get_stream(PlaylistContext *ctx, int pe_idx, int stream_index)
- *  @brief Obtains a specified stream from a specified item in a PlaylistContext.
- *  @param ctx PlaylistContext which contains the desired stream.
- *  @param pe_idx Index that the PlayElem has in the PlaylistContext (playlist item number), PlayElem should already be open.
- *  @param stream_index Index of the multimedia stream (audio or video) within the PlayElem.
- */
-AVStream *ff_playlist_get_stream(PlaylistContext *ctx, int pe_idx, int stream_index);
-
 /** @fn void ff_playlist_relative_paths(char **flist, int len, const char *workingdir)
  *  @brief Converts a list of mixed relative or absolute paths into all absolute paths.
  *  @param flist List of null-terminated strings of relative or absolute paths.