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

[bcoudurier]

Author: bcoudurier
Date: Mon Jun  9 20:16:25 2008
New Revision: 2418

Log:
forgot to reenable ts fmt

Modified:
   dvbmuxer/ffmpeg_svn.patch

Modified: dvbmuxer/ffmpeg_svn.patch
==============================================================================
--- dvbmuxer/ffmpeg_svn.patch	(original)
+++ dvbmuxer/ffmpeg_svn.patch	Mon Jun  9 20:16:25 2008
@@ -146,7 +146,7 @@ Index: libavformat/mpegpesenc.c
 ===================================================================
 --- libavformat/mpegpesenc.c	(revision 0)
 +++ libavformat/mpegpesenc.c	(revision 0)
-@@ -0,0 +1,450 @@
+@@ -0,0 +1,452 @@
 +/*
 + * MPEG PES muxer
 + * Copyright (c) 2000-2002 Fabrice Bellard
@@ -305,15 +305,17 @@ Index: libavformat/mpegpesenc.c
 +            *stuffing_size += *payload_size - trailer_size;
 +    }
 +
-+    if (*pad_packet_bytes > 0 && *pad_packet_bytes <= 7) { // can't use padding, so use stuffing
-+        *packet_size += *pad_packet_bytes;
-+        *payload_size += *pad_packet_bytes; // undo the previous adjustment
-+        if (*stuffing_size < 0) {
-+            *stuffing_size = *pad_packet_bytes;
-+        } else {
-+            *stuffing_size += *pad_packet_bytes;
++    if (stream->format != PES_FMT_TS) {
++        if (*pad_packet_bytes > 0 && *pad_packet_bytes <= 7) { // can't use padding, so use stuffing
++            *packet_size += *pad_packet_bytes;
++            *payload_size += *pad_packet_bytes; // undo the previous adjustment
++            if (*stuffing_size < 0) {
++                *stuffing_size = *pad_packet_bytes;
++            } else {
++                *stuffing_size += *pad_packet_bytes;
++            }
++            *pad_packet_bytes = 0;
 +        }
-+        *pad_packet_bytes = 0;
 +    }
 +
 +    if (*stuffing_size < 0)
@@ -350,7 +352,7 @@ Index: libavformat/mpegpesenc.c
 +           P-STD_buffer_size field be included in the first packet of
 +           every stream. (see SVCD standard p. 26 V.2.3.1 and V.2.3.2
 +           and MPEG-2 standard 2.7.7) */
-+        if (stream->packet_number == 0)
++        if (stream->format != PES_FMT_TS && stream->packet_number == 0)
 +            pes_flags |= 0x01;
 +
 +        bytestream_put_byte(&p, pes_flags); /* flags */
@@ -393,7 +395,7 @@ Index: libavformat/mpegpesenc.c
 +            bytestream_put_byte(&p, 0xff);
 +    }
 +
-+    if (startcode == PRIVATE_STREAM_1) {
++    if (stream->format != PES_FMT_TS && startcode == PRIVATE_STREAM_1) {
 +        bytestream_put_byte(&p, stream->id);
 +        if (stream->id >= 0xa0) {
 +            /* LPCM (XXX: check nb_frames) */