Commit 6545e4c2 authored by michael's avatar michael

revert 10409

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10410 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent dd49c395
...@@ -478,7 +478,7 @@ static int mpeg_mux_init(AVFormatContext *ctx) ...@@ -478,7 +478,7 @@ static int mpeg_mux_init(AVFormatContext *ctx)
return AVERROR(ENOMEM); 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, put_byte(pb,
(id << 4) | (id << 4) |
...@@ -856,9 +856,9 @@ static int flush_packet(AVFormatContext *ctx, int stream_index, ...@@ -856,9 +856,9 @@ static int flush_packet(AVFormatContext *ctx, int stream_index,
put_byte(&ctx->pb, header_len - 3 + stuffing_size); put_byte(&ctx->pb, header_len - 3 + stuffing_size);
if (pes_flags & 0x80) /*write pts*/ 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*/ 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*/ if (pes_flags & 0x01) { /*write pes extension*/
put_byte(&ctx->pb, 0x10); /* flags */ put_byte(&ctx->pb, 0x10); /* flags */
...@@ -873,10 +873,10 @@ static int flush_packet(AVFormatContext *ctx, int stream_index, ...@@ -873,10 +873,10 @@ static int flush_packet(AVFormatContext *ctx, int stream_index,
} else { } else {
if (pts != AV_NOPTS_VALUE) { if (pts != AV_NOPTS_VALUE) {
if (dts != pts) { if (dts != pts) {
ff_mpeg_put_ts(&ctx->pb, 0x03, pts); put_timestamp(&ctx->pb, 0x03, pts);
ff_mpeg_put_ts(&ctx->pb, 0x01, dts); put_timestamp(&ctx->pb, 0x01, dts);
} else { } else {
ff_mpeg_put_ts(&ctx->pb, 0x02, pts); put_timestamp(&ctx->pb, 0x02, pts);
} }
} else { } else {
put_byte(&ctx->pb, 0x0f); put_byte(&ctx->pb, 0x0f);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment