[FFmpeg-soc] [soc]: r2328 - in dvbmuxer: mpegenc.c mpegpes.h mpegpesenc.c mpegtsenc.c

[bcoudurier]

Author: bcoudurier
Date: Mon Jun  2 21:35:56 2008
New Revision: 2328

Log:
remove duplicate parameter id

Modified:
   dvbmuxer/mpegenc.c
   dvbmuxer/mpegpes.h
   dvbmuxer/mpegpesenc.c
   dvbmuxer/mpegtsenc.c

Modified: dvbmuxer/mpegenc.c
==============================================================================
--- dvbmuxer/mpegenc.c	(original)
+++ dvbmuxer/mpegenc.c	Mon Jun  2 21:35:56 2008
@@ -721,7 +721,7 @@ static int flush_packet(AVFormatContext 
     packet_size -= pad_packet_bytes + zero_trail_bytes;
 
     if (packet_size > 0) {
-        ff_pes_cal_header(id, stream,
+        ff_pes_cal_header(stream,
                           &packet_size, &header_len, &pts, &dts,
                           &payload_size, &startcode, &stuffing_size,
                           &trailer_size, &pad_packet_bytes);

Modified: dvbmuxer/mpegpes.h
==============================================================================
--- dvbmuxer/mpegpes.h	(original)
+++ dvbmuxer/mpegpes.h	Mon Jun  2 21:35:56 2008
@@ -124,7 +124,6 @@ int ff_pes_get_nb_frames(AVFormatContext
 
 /**
  * Caculate next PES packet informations
- * @param[in]  id                Stream id
  * @param[in]  stream            PES stream
  * @param[out] packet_size       PES packet size
  * @param[out] header_len        PES header length
@@ -138,7 +137,7 @@ int ff_pes_get_nb_frames(AVFormatContext
  * @param[out] trailer_size      Unwritten trailer size
  * @param[out] pad_packet_bytes  Packet padding size
  */
-void ff_pes_cal_header(int id, StreamInfo *stream,
+void ff_pes_cal_header(StreamInfo *stream,
           int *packet_size,  int *header_len, int64_t *pts, int64_t *dts,
           int *payload_size, int *startcode, int *stuffing_size,
           int *trailer_size, int *pad_packet_bytes);

Modified: dvbmuxer/mpegpesenc.c
==============================================================================
--- dvbmuxer/mpegpesenc.c	(original)
+++ dvbmuxer/mpegpesenc.c	Mon Jun  2 21:35:56 2008
@@ -89,7 +89,7 @@ int ff_pes_get_nb_frames(AVFormatContext
     return nb_frames;
 }
 
-void ff_pes_cal_header(int id, StreamInfo *stream,
+void ff_pes_cal_header(StreamInfo *stream,
     int *packet_size,  int *header_len, int64_t *pts, int64_t *dts,
     int *payload_size, int *startcode, int *stuffing_size,
     int *trailer_size, int *pad_packet_bytes)
@@ -118,16 +118,16 @@ void ff_pes_cal_header(int id, StreamInf
 
     *payload_size = *packet_size - *header_len;
     if (stream->format != PES_FMT_TS) {
-        if (id < 0xc0) {
+        if (stream->id < 0xc0) {
             *startcode = PRIVATE_STREAM_1;
             *payload_size -= 1;
-            if (id >= 0x40) {
+            if (stream->id >= 0x40) {
                 *payload_size -= 3;
-                if (id >= 0xa0)
+                if (stream->id >= 0xa0)
                     *payload_size -= 3;
             }
         } else {
-            *startcode = 0x100 + id;
+            *startcode = 0x100 + stream->id;
         }
     }
     *stuffing_size = *payload_size - av_fifo_size(&stream->fifo);

Modified: dvbmuxer/mpegtsenc.c
==============================================================================
--- dvbmuxer/mpegtsenc.c	(original)
+++ dvbmuxer/mpegtsenc.c	Mon Jun  2 21:35:56 2008
@@ -636,7 +636,7 @@ static int flush_packet(AVFormatContext 
     packet_size = s->packet_size;
 
     if (packet_size > 0) {
-        ff_pes_cal_header(id, pes_stream,
+        ff_pes_cal_header(pes_stream,
                           &packet_size, &header_len, &pts, &dts,
                           &payload_size, &startcode, &stuffing_size,
                           &trailer_size, &pad_packet_bytes);