[FFmpeg-soc] [soc]: r5364 - concat/libavformat/concatgen.c

gkovacs subversion at mplayerhq.hu
Sun Aug 30 01:09:53 CEST 2009


Author: gkovacs
Date: Sun Aug 30 01:09:53 2009
New Revision: 5364

Log:
break long lines in concatgen.c

Modified:
   concat/libavformat/concatgen.c

Modified: concat/libavformat/concatgen.c
==============================================================================
--- concat/libavformat/concatgen.c	Sun Aug 30 01:07:26 2009	(r5363)
+++ concat/libavformat/concatgen.c	Sun Aug 30 01:09:53 2009	(r5364)
@@ -80,15 +80,22 @@ int ff_concatgen_read_packet(AVFormatCon
             // TODO switch from AVERROR_EOF to AVERROR_EOS
             // -32 AVERROR_EOF for avi, -51 for ogg
 
-                av_log(ic, AV_LOG_DEBUG, "Switching stream %d to %d\n", stream_index, ctx->pe_curidx+1);
+                av_log(ic, AV_LOG_DEBUG,
+                       "Switching stream %d to %d\n",
+                       stream_index, ctx->pe_curidx+1);
                 if (!ctx->formatcontext_list[++ctx->pe_curidx]) {
-                    if (!(ctx->formatcontext_list[ctx->pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) {
-                        av_log(NULL, AV_LOG_ERROR, "Failed to switch to AVFormatContext %d\n", ctx->pe_curidx);
+                    if (!(ctx->formatcontext_list[ctx->pe_curidx] =
+                        ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) {
+                        av_log(NULL, AV_LOG_ERROR,
+                               "Failed to switch to AVFormatContext %d\n",
+                               ctx->pe_curidx);
                         break;
                     }
                 }
                 if ((ff_playlist_set_streams(ctx)) < 0) {
-                    av_log(NULL, AV_LOG_ERROR, "Failed to open codecs for streams in %d\n", ctx->pe_curidx);
+                    av_log(NULL, AV_LOG_ERROR,
+                           "Failed to open codecs for streams in %d\n",
+                           ctx->pe_curidx);
                     break;
                 }
                 // have_switched_streams is set to avoid infinite loop
@@ -123,14 +130,19 @@ int ff_concatgen_read_seek(AVFormatConte
                                                         pts_avtimebase,
                                                         &localpts_avtimebase);
     if (!ctx->formatcontext_list[ctx->pe_curidx]) {
-        if (!(ctx->formatcontext_list[ctx->pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) {
-            av_log(NULL, AV_LOG_ERROR, "Failed to switch to AVFormatContext %d\n", ctx->pe_curidx);
+        if (!(ctx->formatcontext_list[ctx->pe_curidx] =
+            ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) {
+            av_log(NULL, AV_LOG_ERROR,
+                   "Failed to switch to AVFormatContext %d\n",
+                   ctx->pe_curidx);
             return AVERROR_NOFMT;
         }
     }
     err = ff_playlist_set_streams(ctx);
     if (err < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Failed to open codecs for streams in %d\n", ctx->pe_curidx);
+        av_log(NULL, AV_LOG_ERROR,
+               "Failed to open codecs for streams in %d\n",
+               ctx->pe_curidx);
         return err;
     }
     ic = ctx->formatcontext_list[ctx->pe_curidx];


More information about the FFmpeg-soc mailing list