Author: gkovacs
Date: Sun Aug 30 00:36:41 2009
New Revision: 5353
Log:
break long lines
Modified:
concat/libavformat/m3u.c
concat/libavformat/pls.c
concat/libavformat/utils.c.diff
concat/libavformat/xspf.c
Modified: concat/libavformat/m3u.c
==============================================================================
--- concat/libavformat/m3u.c Sun Aug 30 00:35:11 2009 (r5352)
+++ concat/libavformat/m3u.c Sun Aug 30 00:36:41 2009 (r5353)
@@ -106,7 +106,8 @@ static int m3u_read_header(AVFormatConte
s->priv_data = ctx;
ctx->master_formatcontext = s;
if (!ctx->formatcontext_list[ctx->pe_curidx]) {
- if (!(ctx->formatcontext_list[ctx->pe_curidx] =
ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx])))
+ if (!(ctx->formatcontext_list[ctx->pe_curidx] =
+ ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx])))
return AVERROR_NOFMT;
}
ff_playlist_set_streams(ctx);
Modified: concat/libavformat/pls.c
==============================================================================
--- concat/libavformat/pls.c Sun Aug 30 00:35:11 2009 (r5352)
+++ concat/libavformat/pls.c Sun Aug 30 00:36:41 2009 (r5353)
@@ -125,7 +125,8 @@ static int pls_read_header(AVFormatConte
s->priv_data = ctx;
ctx->master_formatcontext = s;
if (!ctx->formatcontext_list[ctx->pe_curidx]) {
- if (!(ctx->formatcontext_list[ctx->pe_curidx] =
ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx])))
+ if (!(ctx->formatcontext_list[ctx->pe_curidx] =
+ ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx])))
return AVERROR_NOFMT;
}
ff_playlist_set_streams(ctx);
Modified: concat/libavformat/utils.c.diff
==============================================================================
--- concat/libavformat/utils.c.diff Sun Aug 30 00:35:11 2009 (r5352)
+++ concat/libavformat/utils.c.diff Sun Aug 30 00:36:41 2009 (r5353)
@@ -1,5 +1,5 @@
diff --git a/libavformat/utils.c b/libavformat/utils.c
-index 4cec286..2d2549a 100644
+index 4cec286..f673716 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -27,6 +27,8 @@
@@ -21,7 +21,7 @@ index 4cec286..2d2549a 100644
AVProbeData probe_data, *pd = &probe_data;
ByteIOContext *pb = NULL;
-@@ -447,6 +450,30 @@ int av_open_input_file(AVFormatContext **ic_ptr, const
char *filename,
+@@ -447,6 +450,31 @@ int av_open_input_file(AVFormatContext **ic_ptr, const
char *filename,
fmt = av_probe_input_format(pd, 0);
}
@@ -39,7 +39,8 @@ index 4cec286..2d2549a 100644
+ av_free(flist);
+ av_strlcpy(ic->filename, filename, sizeof(ic->filename));
+ if
(!playlist_ctx->formatcontext_list[playlist_ctx->pe_curidx]) {
-+ if
(!(playlist_ctx->formatcontext_list[playlist_ctx->pe_curidx] =
ff_playlist_alloc_formatcontext(playlist_ctx->flist[playlist_ctx->pe_curidx])))
++ if
(!(playlist_ctx->formatcontext_list[playlist_ctx->pe_curidx] =
++
ff_playlist_alloc_formatcontext(playlist_ctx->flist[playlist_ctx->pe_curidx])))
+ return AVERROR_NOFMT;
+ }
+ ff_playlist_set_streams(playlist_ctx);
Modified: concat/libavformat/xspf.c
==============================================================================
--- concat/libavformat/xspf.c Sun Aug 30 00:35:11 2009 (r5352)
+++ concat/libavformat/xspf.c Sun Aug 30 00:36:41 2009 (r5353)
@@ -148,7 +148,8 @@ static int xspf_read_header(AVFormatCont
s->priv_data = ctx;
ctx->master_formatcontext = s;
if (!ctx->formatcontext_list[ctx->pe_curidx]) {
- if (!(ctx->formatcontext_list[ctx->pe_curidx] =
ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx])))
+ if (!(ctx->formatcontext_list[ctx->pe_curidx] =
+ ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx])))
return AVERROR_NOFMT;
}
ff_playlist_set_streams(ctx);
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
