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

[bcoudurier]

Author: bcoudurier
Date: Tue Jun  3 22:16:36 2008
New Revision: 2368

Log:
rename and static now

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

Modified: dvbmuxer/mpegpes.h
==============================================================================
--- dvbmuxer/mpegpes.h	(original)
+++ dvbmuxer/mpegpes.h	Tue Jun  3 22:16:36 2008
@@ -113,26 +113,6 @@ int ff_pes_find_beststream(AVFormatConte
 int ff_pes_get_nb_frames(AVFormatContext *ctx, StreamInfo *stream, int len);
 
 /**
- * Caculate next PES packet informations
- * @param[in]  stream            PES stream
- * @param[out] packet_size       PES packet size
- * @param[out] header_len        PES header length
- * @param[in]  pts               Current pts
- * @param[out] pts               AV_NOPTS_VALUE if reset
- * @param[in]  dts               Current dts
- * @param[out] dts               AV_NOPTS_VALUE if reset
- * @param[out] payload_size      PES payload size
- * @param[out] startcode         PES startcode
- * @param[out] stuffing_size     PES stuffing size
- * @param[out] trailer_size      Unwritten trailer size
- * @param[out] pad_packet_bytes  Packet padding size
- */
-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);
-
-/**
  * Write PES data from PES Stream into supplied buffer.
  * @param [in]  ctx               AVFormatContext
  * @param [in]  stream_index      Stream index to write from

Modified: dvbmuxer/mpegpesenc.c
==============================================================================
--- dvbmuxer/mpegpesenc.c	(original)
+++ dvbmuxer/mpegpesenc.c	Tue Jun  3 22:16:36 2008
@@ -87,7 +87,7 @@ int ff_pes_get_nb_frames(AVFormatContext
     return nb_frames;
 }
 
-void ff_pes_cal_header(StreamInfo *stream,
+static void calc_pes_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)
@@ -182,10 +182,9 @@ int ff_pes_write_buf(AVFormatContext *ct
     uint8_t *p = buf;
     int nb_frames;
 
-    ff_pes_cal_header(stream,
-                      packet_size, &header_len, pts, dts,
-                      payload_size, &startcode, stuffing_size,
-                      &trailer_size, pad_packet_bytes);
+    calc_pes_header(stream, packet_size, &header_len, pts, dts,
+                    payload_size, &startcode, stuffing_size,
+                    &trailer_size, pad_packet_bytes);
 
     nb_frames= ff_pes_get_nb_frames(ctx, stream, *payload_size - *stuffing_size);