[FFmpeg-soc] [soc]: r2335 - in dvbmuxer: mpegpes.h mpegpesenc.c

[bcoudurier]

Author: bcoudurier
Date: Mon Jun  2 22:13:06 2008
New Revision: 2335

Log:
rename pes_buffer to buf

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

Modified: dvbmuxer/mpegpes.h
==============================================================================
--- dvbmuxer/mpegpes.h	(original)
+++ dvbmuxer/mpegpes.h	Mon Jun  2 22:13:06 2008
@@ -146,7 +146,7 @@ void ff_pes_cal_header(StreamInfo *strea
  * Write PES data from PES Stream into supplied buffer.
  * @param [in] ctx            AVFormatContext
  * @param [in] stream_index   Stream index to write from
- * @param [in] pes_buffer     Buffer to write to
+ * @param [in] buf            Buffer to write to
  * @param [in] pts            Packet pts
  * @param [in] dts            Packet dts
  * @param [in] id             Stream ID
@@ -157,7 +157,7 @@ void ff_pes_cal_header(StreamInfo *strea
  * @param [in] stuffing_size  Packet stuffing size
  * @return                    Bytes written to buffer
  */
-int ff_pes_muxer_write(AVFormatContext *ctx, int stream_index, uint8_t *pes_buffer,
+int ff_pes_muxer_write(AVFormatContext *ctx, int stream_index, uint8_t *buf,
           int64_t pts, int64_t dts, int id, int startcode,
           uint8_t* pes_content, int pes_content_len,
           int header_len, int packet_size, int payload_size, int stuffing_size);

Modified: dvbmuxer/mpegpesenc.c
==============================================================================
--- dvbmuxer/mpegpesenc.c	(original)
+++ dvbmuxer/mpegpesenc.c	Mon Jun  2 22:13:06 2008
@@ -175,7 +175,7 @@ void ff_pes_cal_header(StreamInfo *strea
     }
 }
 
-int ff_pes_muxer_write(AVFormatContext *ctx, int stream_index, uint8_t *pes_buffer,
+int ff_pes_muxer_write(AVFormatContext *ctx, int stream_index, uint8_t *buf,
     int64_t pts, int64_t dts, int id, int startcode,
     uint8_t *pes_content, int pes_content_len,
     int header_len, int packet_size, int payload_size, int stuffing_size)
@@ -183,7 +183,7 @@ int ff_pes_muxer_write(AVFormatContext *
     StreamInfo *stream = ctx->streams[stream_index]->priv_data;
     int pes_flags, i;
     int data_size = payload_size - stuffing_size;
-    uint8_t *q = pes_buffer;
+    uint8_t *q = buf;
 
     bytestream_put_be32(&q, startcode);
 
@@ -236,7 +236,7 @@ int ff_pes_muxer_write(AVFormatContext *
     /* output data */
     if(av_fifo_read(&stream->fifo, q, data_size) < 0)
         return -1;
-    return q - pes_buffer + data_size;
+    return q - buf + data_size;
 }
 
 int ff_pes_remove_decoded_packets(AVFormatContext *ctx, int64_t scr)