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

[bcoudurier]

Author: bcoudurier
Date: Thu Jun  5 20:38:30 2008
New Revision: 2393

Log:
find_beststream is now static

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

Modified: dvbmuxer/mpegpes.h
==============================================================================
--- dvbmuxer/mpegpes.h	(original)
+++ dvbmuxer/mpegpes.h	Thu Jun  5 20:38:30 2008
@@ -93,18 +93,6 @@ void ff_pes_muxer_end(AVFormatContext *c
 void ff_pes_write_packet(AVFormatContext *ctx, AVPacket *pkt, int packet_number);
 
 /**
- * Find the best stream to mux into the PES stream.
- * @param[in]  ctx         AVFormatContext
- * @param[in]  packet_size PES stream packet size
- * @param[in]  flush       Wether flushing remaining data is needed
- * @param[in]  scr         Current clock reference
- * @param[out] scr         Updated clock reference, bumped if needed
- * @param[out] best_i      Index of the stream to be muxed
- * @return                 Negative on error, zero if not found, 1 if found
- */
-int ff_pes_find_beststream(AVFormatContext *ctx, int packet_size, int flush, int64_t *scr, int *best_i);
-
-/**
  * Output PES packet to the output file.
  * @param[in]  ctx          AVFormatContext
  * @param[in]  packet_size  PES stream packet size

Modified: dvbmuxer/mpegpesenc.c
==============================================================================
--- dvbmuxer/mpegpesenc.c	(original)
+++ dvbmuxer/mpegpesenc.c	Thu Jun  5 20:38:30 2008
@@ -307,7 +307,7 @@ int ff_pes_remove_decoded_packets(AVForm
     return 0;
 }
 
-int ff_pes_find_beststream(AVFormatContext *ctx, int packet_size, int flush, int64_t *scr, int *best_i)
+static int find_beststream(AVFormatContext *ctx, int packet_size, int flush, int64_t *scr, int *best_i)
 {
     int i, avail_space;
     int best_score= INT_MIN;
@@ -428,8 +428,8 @@ int ff_pes_output_packet(AVFormatContext
     int trailer_size, res;
     PacketDesc *timestamp_packet;
 
-    if((res = ff_pes_find_beststream(ctx, packet_size,
-                                     flush, cr, best_i)) <= 0)
+    if((res = find_beststream(ctx, packet_size,
+                              flush, cr, best_i)) <= 0)
         return res;
     assert(*best_i >= 0);