[FFmpeg-soc] [soc]: r1851 - dvbmuxer/ffmpeg_svn.patch

[bcoudurier]

Author: bcoudurier
Date: Tue Jan 29 18:44:13 2008
New Revision: 1851

Log:
update patch against svn

Modified:
   dvbmuxer/ffmpeg_svn.patch

Modified: dvbmuxer/ffmpeg_svn.patch
==============================================================================
--- dvbmuxer/ffmpeg_svn.patch	(original)
+++ dvbmuxer/ffmpeg_svn.patch	Tue Jan 29 18:44:13 2008
@@ -438,15 +438,6 @@ Index: libavformat/mpegtsenc.c
  } MpegTSWrite;
  
  static void mpegts_write_pat(AVFormatContext *s)
-@@ -353,7 +380,7 @@
- static void section_write_packet(MpegTSSection *s, const uint8_t *packet)
- {
-     AVFormatContext *ctx = s->opaque;
--    put_buffer(ctx->pb, packet, TS_PACKET_SIZE);
-+    put_buffer(&ctx->pb, packet, TS_PACKET_SIZE);
- }
- 
- static int mpegts_write_header(AVFormatContext *s)
 @@ -362,7 +389,8 @@
      MpegTSWriteStream *ts_st;
      MpegTSService *service;
@@ -541,15 +532,6 @@ Index: libavformat/mpegtsenc.c
          (TS_PACKET_SIZE * 8 * 1000);
  #if 0
      printf("%d %d %d\n",
-@@ -431,7 +499,7 @@
-     for(i = 0; i < ts->nb_services; i++) {
-         mpegts_write_pmt(s, ts->services[i]);
-     }
--    put_flush_packet(s->pb);
-+    put_flush_packet(&s->pb);
- 
-     return 0;
- 
 @@ -462,46 +530,32 @@
      }
  }
@@ -688,13 +670,11 @@ Index: libavformat/mpegtsenc.c
 +        memcpy(buf + TS_PACKET_SIZE - len, payload + offset, len);
 +        offset += len;
          payload_size -= len;
--        put_buffer(s->pb, buf, TS_PACKET_SIZE);
-+        put_buffer(&s->pb, buf, TS_PACKET_SIZE);
+         put_buffer(s->pb, buf, TS_PACKET_SIZE);
      }
--    put_flush_packet(s->pb);
 +    if(pcr != -1)
 +        ts->cur_pcr = pcr;
-+    put_flush_packet(&s->pb);
+     put_flush_packet(s->pb);
  }
  
 -static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)
@@ -819,7 +799,7 @@ Index: libavformat/mpegtsenc.c
 +        bytestream_put_byte(&q, 0x00);
 +
 +    mpegts_write_pes(ctx, stream, stream->payload, q - stream->payload);
-+    put_flush_packet(&ctx->pb);
++    put_flush_packet(ctx->pb);
 +
 +    s->packet_number++;
 +