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

[gkovacs]

Author: gkovacs
Date: Mon Aug 17 16:52:40 2009
New Revision: 5168

Log:
remove added newline

Modified:
   concat/ffmpeg.c.diff

Modified: concat/ffmpeg.c.diff
==============================================================================
--- concat/ffmpeg.c.diff	Mon Aug 17 16:49:34 2009	(r5167)
+++ concat/ffmpeg.c.diff	Mon Aug 17 16:52:40 2009	(r5168)
@@ -1,5 +1,5 @@
 diff --git a/ffmpeg.c b/ffmpeg.c
-index 2686e1d..5944313 100644
+index 2686e1d..6548a8e 100644
 --- a/ffmpeg.c
 +++ b/ffmpeg.c
 @@ -40,6 +40,7 @@
@@ -36,15 +36,7 @@ index 2686e1d..5944313 100644
      if(ist->next_pts == AV_NOPTS_VALUE)
          ist->next_pts= ist->pts;
  
-@@ -1291,6 +1300,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
-                        endianness as CPU */
-                 ret = avcodec_decode_audio3(ist->st->codec, samples, &data_size,
-                                             &avpkt);
-+
-                 if (ret < 0)
-                     goto fail_decode;
-                 avpkt.data += ret;
-@@ -1397,7 +1407,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
+@@ -1397,7 +1406,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
                  int frame_size;
  
                  ost = ost_table[i];
@@ -53,7 +45,7 @@ index 2686e1d..5944313 100644
                      os = output_files[ost->file_index];
  
                      /* set the input output pts pairs */
-@@ -2149,6 +2159,8 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2149,6 +2158,8 @@ static int av_encode(AVFormatContext **output_files,
          AVPacket pkt;
          double ipts_min;
          double opts_min;
@@ -62,7 +54,7 @@ index 2686e1d..5944313 100644
  
      redo:
          ipts_min= 1e100;
-@@ -2234,12 +2246,44 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2234,12 +2245,44 @@ static int av_encode(AVFormatContext **output_files,
          if (do_pkt_dump) {
              av_pkt_dump_log(NULL, AV_LOG_DEBUG, &pkt, do_hex_dump);
          }
@@ -108,7 +100,7 @@ index 2686e1d..5944313 100644
          if (ist->discard)
              goto discard_packet;
  
-@@ -2271,8 +2315,7 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2271,8 +2314,7 @@ static int av_encode(AVFormatContext **output_files,
          }
  
          //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size);
@@ -118,7 +110,7 @@ index 2686e1d..5944313 100644
              if (verbose >= 0)
                  fprintf(stderr, "Error while decoding stream #%d.%d\n",
                          ist->file_index, ist->index);
-@@ -2293,7 +2336,7 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2293,7 +2335,7 @@ static int av_encode(AVFormatContext **output_files,
      for(i=0;i<nb_istreams;i++) {
          ist = ist_table[i];
          if (ist->decoding_needed) {