[FFmpeg-cvslog] r10410 - trunk/libavformat/mpegenc.c

[michael]

Author: michael
Date: Wed Sep  5 19:25:39 2007
New Revision: 10410

Log:
revert 10409
there is no need for put_timestamp to be exported it is not used outside the
PES code


Modified:
   trunk/libavformat/mpegenc.c

Modified: trunk/libavformat/mpegenc.c
==============================================================================
--- trunk/libavformat/mpegenc.c	(original)
+++ trunk/libavformat/mpegenc.c	Wed Sep  5 19:25:39 2007
@@ -478,7 +478,7 @@ static int mpeg_mux_init(AVFormatContext
     return AVERROR(ENOMEM);
 }
 
-void ff_mpeg_put_ts(ByteIOContext *pb, int id, int64_t timestamp)
+static inline void put_timestamp(ByteIOContext *pb, int id, int64_t timestamp)
 {
     put_byte(pb,
              (id << 4) |
@@ -856,9 +856,9 @@ static int flush_packet(AVFormatContext 
             put_byte(&ctx->pb, header_len - 3 + stuffing_size);
 
             if (pes_flags & 0x80)  /*write pts*/
-                ff_mpeg_put_ts(&ctx->pb, (pes_flags & 0x40) ? 0x03 : 0x02, pts);
+                put_timestamp(&ctx->pb, (pes_flags & 0x40) ? 0x03 : 0x02, pts);
             if (pes_flags & 0x40)  /*write dts*/
-                ff_mpeg_put_ts(&ctx->pb, 0x01, dts);
+                put_timestamp(&ctx->pb, 0x01, dts);
 
             if (pes_flags & 0x01) {  /*write pes extension*/
                 put_byte(&ctx->pb, 0x10); /* flags */
@@ -873,10 +873,10 @@ static int flush_packet(AVFormatContext 
         } else {
             if (pts != AV_NOPTS_VALUE) {
                 if (dts != pts) {
-                    ff_mpeg_put_ts(&ctx->pb, 0x03, pts);
-                    ff_mpeg_put_ts(&ctx->pb, 0x01, dts);
+                    put_timestamp(&ctx->pb, 0x03, pts);
+                    put_timestamp(&ctx->pb, 0x01, dts);
                 } else {
-                    ff_mpeg_put_ts(&ctx->pb, 0x02, pts);
+                    put_timestamp(&ctx->pb, 0x02, pts);
                 }
             } else {
                 put_byte(&ctx->pb, 0x0f);