[FFmpeg-soc] [soc]: r2395 - in dvbmuxer: mpegenc.c mpegtsenc.c

[bcoudurier]

Author: bcoudurier
Date: Thu Jun  5 22:05:52 2008
New Revision: 2395

Log:
remove now useless function, minimize svn diff

Modified:
   dvbmuxer/mpegenc.c
   dvbmuxer/mpegtsenc.c

Modified: dvbmuxer/mpegenc.c
==============================================================================
--- dvbmuxer/mpegenc.c	(original)
+++ dvbmuxer/mpegenc.c	Thu Jun  5 22:05:52 2008
@@ -465,17 +465,6 @@ static int mpeg_mux_init(AVFormatContext
     return AVERROR(ENOMEM);
 }
 
-static inline void put_timestamp(ByteIOContext *pb, int id, int64_t timestamp)
-{
-    put_byte(pb,
-             (id << 4) |
-             (((timestamp >> 30) & 0x07) << 1) |
-             1);
-    put_be16(pb, (uint16_t)((((timestamp >> 15) & 0x7fff) << 1) | 1));
-    put_be16(pb, (uint16_t)((((timestamp) & 0x7fff) << 1) | 1));
-}
-
-
 /* return the number of padding bytes that should be inserted into
    the multiplexed stream.*/
 static int get_vcd_padding_size(AVFormatContext *ctx, int64_t pts)
@@ -807,7 +796,6 @@ static int output_packet(AVFormatContext
     if ((es_size = ff_pes_output_packet(ctx, s->packet_size, &scr, &best_i,
                                         flush, flush_packet)) <= 0)
         return es_size;
-
     stream= ctx->streams[best_i]->priv_data;
 
     if (s->is_vcd) {

Modified: dvbmuxer/mpegtsenc.c
==============================================================================
--- dvbmuxer/mpegtsenc.c	(original)
+++ dvbmuxer/mpegtsenc.c	Thu Jun  5 22:05:52 2008
@@ -645,8 +645,8 @@ static int output_packet(AVFormatContext
     if ((es_size = ff_pes_output_packet(ctx, DEFAULT_PES_PAYLOAD_SIZE,
                                         &pcr, &best_i, flush, flush_packet)) <= 0)
         return es_size;
-
     stream= ctx->streams[best_i]->priv_data;
+
     stream->buffer_index += es_size;
     while(stream->premux_packet && stream->premux_packet->unwritten_size <= es_size){
         es_size -= stream->premux_packet->unwritten_size;