diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-09-05 17:25:39 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-09-05 17:25:39 +0000 |
| commit | 6a058d90b5af6a57a0cb45ba8a31de9154bb4962 (patch) | |
| tree | 49f9471d3ea1236f84938659e307633a381c09d4 /libavformat/mpegenc.c | |
| parent | 8baaee65ba6c47e6568aebbaa5976ffcc8b7ce0e (diff) | |
| download | ffmpeg-6a058d90b5af6a57a0cb45ba8a31de9154bb4962.tar.gz | |
revert 10409
there is no need for put_timestamp to be exported it is not used outside the
PES code
Originally committed as revision 10410 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpegenc.c')
| -rw-r--r-- | libavformat/mpegenc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 1bd90c4ecf..2c304da94a 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -478,7 +478,7 @@ static int mpeg_mux_init(AVFormatContext *ctx) 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 *ctx, int stream_index, 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 *ctx, int stream_index, } 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); |