[FFmpeg-soc] [soc]: r4673 - concat/ffplay.c.diff

[gkovacs]

Author: gkovacs
Date: Sun Jul 12 09:45:56 2009
New Revision: 4673

Log:
wrong label location

Modified:
   concat/ffplay.c.diff

Modified: concat/ffplay.c.diff
==============================================================================
--- concat/ffplay.c.diff	Sun Jul 12 09:37:37 2009	(r4672)
+++ concat/ffplay.c.diff	Sun Jul 12 09:45:56 2009	(r4673)
@@ -1,5 +1,5 @@
 diff --git a/ffplay.c b/ffplay.c
-index 5f88a46..131079a 100644
+index 5f88a46..4ba6ed0 100644
 --- a/ffplay.c
 +++ b/ffplay.c
 @@ -1336,28 +1336,35 @@ static int video_thread(void *arg)
@@ -52,7 +52,7 @@ index 5f88a46..131079a 100644
          if (got_picture) {
              if (output_picture2(is, frame, pts) < 0)
                  goto the_end;
-@@ -1561,50 +1565,67 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+@@ -1561,50 +1565,66 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
  {
      AVPacket *pkt_temp = &is->audio_pkt_temp;
      AVPacket *pkt = &is->audio_pkt;
@@ -68,11 +68,10 @@ index 5f88a46..131079a 100644
 +        isconcat = 0;
      for(;;) {
 -        /* NOTE: the audio packet can contain several frames */
-+        tryagain:
          while (pkt_temp->size > 0) {
++            tryagain:
              data_size = sizeof(is->audio_buf1);
 -            len1 = avcodec_decode_audio3(dec,
-+            decagain:
 +            len1 = avcodec_decode_audio3(is->audio_st->codec,
                                          (int16_t *)is->audio_buf1, &data_size,
                                          pkt_temp);
@@ -132,7 +131,7 @@ index 5f88a46..131079a 100644
                      break;
                  }
                  is->audio_buf= is->audio_buf2;
-@@ -1618,9 +1639,9 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+@@ -1618,9 +1638,9 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
              /* if no pts, then compute it */
              pts = is->audio_clock;
              *pts_ptr = pts;
@@ -144,7 +143,7 @@ index 5f88a46..131079a 100644
  #if defined(DEBUG_SYNC)
              {
                  static double last_clock;
-@@ -1632,7 +1653,6 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+@@ -1632,7 +1652,6 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
  #endif
              return data_size;
          }
@@ -152,7 +151,7 @@ index 5f88a46..131079a 100644
          /* free the current packet */
          if (pkt->data)
              av_free_packet(pkt);
-@@ -1645,7 +1665,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+@@ -1645,7 +1664,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
          if (packet_queue_get(&is->audioq, pkt, 1) < 0)
              return -1;
          if(pkt->data == flush_pkt.data){