[FFmpeg-soc] [soc]: r5072 - concat/libavformat/utils.c.diff

[gkovacs]

Author: gkovacs
Date: Thu Aug 13 12:24:10 2009
New Revision: 5072

Log:
removed reference to AVPacket->stream in utils.c

Modified:
   concat/libavformat/utils.c.diff

Modified: concat/libavformat/utils.c.diff
==============================================================================
--- concat/libavformat/utils.c.diff	Thu Aug 13 12:22:27 2009	(r5071)
+++ concat/libavformat/utils.c.diff	Thu Aug 13 12:24:10 2009	(r5072)
@@ -1,5 +1,5 @@
 diff --git a/libavformat/utils.c b/libavformat/utils.c
-index 0c1a50d..d2f0f96 100644
+index 0c1a50d..85c8ec0 100644
 --- a/libavformat/utils.c
 +++ b/libavformat/utils.c
 @@ -27,6 +27,7 @@
@@ -60,11 +60,10 @@ index 0c1a50d..d2f0f96 100644
  
      av_init_packet(pkt);
  
-@@ -943,8 +971,10 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
+@@ -943,8 +971,9 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
                  /* return packet if any */
                  if (pkt->size) {
                  got_packet:
-+                    pkt->stream = st;
 +                    pkt->stream_index = stream_index;
 +                    pkt->index_offset = offset;
                      pkt->duration = 0;
@@ -72,17 +71,16 @@ index 0c1a50d..d2f0f96 100644
                      pkt->pts = st->parser->pts;
                      pkt->dts = st->parser->dts;
                      pkt->pos = st->parser->pos;
-@@ -968,6 +998,9 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
+@@ -968,6 +997,8 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
              AVPacket cur_pkt;
              /* read next packet */
              ret = av_read_packet(s, &cur_pkt);
 +            offset = cur_pkt.index_offset;
 +            stream_index = cur_pkt.stream_index;
-+            stream = cur_pkt.stream;
              if (ret < 0) {
                  if (ret == AVERROR(EAGAIN))
                      return ret;
-@@ -980,8 +1013,9 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
+@@ -980,8 +1011,9 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
                                          NULL, 0,
                                          AV_NOPTS_VALUE, AV_NOPTS_VALUE,
                                          AV_NOPTS_VALUE);