[FFmpeg-soc] [soc]: r5232 - concat/ffmpeg.c.diff

[gkovacs]

Author: gkovacs
Date: Mon Aug 24 07:24:13 2009
New Revision: 5232

Log:
remove trailing whitespace

Modified:
   concat/ffmpeg.c.diff

Modified: concat/ffmpeg.c.diff
==============================================================================
--- concat/ffmpeg.c.diff	Mon Aug 24 07:07:38 2009	(r5231)
+++ concat/ffmpeg.c.diff	Mon Aug 24 07:24:13 2009	(r5232)
@@ -1,5 +1,5 @@
 diff --git a/ffmpeg.c b/ffmpeg.c
-index 2686e1d..28569ea 100644
+index 2686e1d..18b556b 100644
 --- a/ffmpeg.c
 +++ b/ffmpeg.c
 @@ -40,6 +40,7 @@
@@ -20,23 +20,22 @@ index 2686e1d..28569ea 100644
  {
      AVFormatContext *os;
      AVOutputStream *ost;
-@@ -1248,8 +1250,15 @@ static int output_packet(AVInputStream *ist, int ist_index,
+@@ -1248,8 +1250,13 @@ static int output_packet(AVInputStream *ist, int ist_index,
      static unsigned int samples_size= 0;
      AVSubtitle subtitle, *subtitle_to_free;
      int got_subtitle;
 +    int stream_offset = 0;
      AVPacket avpkt;
+-
 +    AVPlaylistContext *pl_ctx = av_playlist_get_context(ic);
- 
 +    if (pl_ctx && pkt) {
 +        ist->st = ic->streams[pkt->stream_index];
 +        stream_offset = pkt->stream_index - av_playlist_localstidx_from_streamidx(pl_ctx, pkt->stream_index);
 +    }
-+     
      if(ist->next_pts == AV_NOPTS_VALUE)
          ist->next_pts= ist->pts;
  
-@@ -1397,7 +1406,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
+@@ -1397,7 +1404,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
                  int frame_size;
  
                  ost = ost_table[i];
@@ -45,7 +44,7 @@ index 2686e1d..28569ea 100644
                      os = output_files[ost->file_index];
  
                      /* set the input output pts pairs */
-@@ -2149,6 +2158,8 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2149,6 +2156,8 @@ static int av_encode(AVFormatContext **output_files,
          AVPacket pkt;
          double ipts_min;
          double opts_min;
@@ -54,7 +53,7 @@ index 2686e1d..28569ea 100644
  
      redo:
          ipts_min= 1e100;
-@@ -2234,12 +2245,43 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2234,12 +2243,43 @@ static int av_encode(AVFormatContext **output_files,
          if (do_pkt_dump) {
              av_pkt_dump_log(NULL, AV_LOG_DEBUG, &pkt, do_hex_dump);
          }
@@ -99,7 +98,7 @@ index 2686e1d..28569ea 100644
          if (ist->discard)
              goto discard_packet;
  
-@@ -2271,8 +2313,7 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2271,8 +2311,7 @@ static int av_encode(AVFormatContext **output_files,
          }
  
          //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size);
@@ -109,7 +108,7 @@ index 2686e1d..28569ea 100644
              if (verbose >= 0)
                  fprintf(stderr, "Error while decoding stream #%d.%d\n",
                          ist->file_index, ist->index);
-@@ -2293,7 +2334,7 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2293,7 +2332,7 @@ static int av_encode(AVFormatContext **output_files,
      for(i=0;i<nb_istreams;i++) {
          ist = ist_table[i];
          if (ist->decoding_needed) {