[FFmpeg-soc] [soc]: r1108 - in dvbmuxer: mpeg_pes.h mpeg_pes_enc.c
Diego Biurrun
diego at biurrun.de
Tue Aug 21 18:35:58 CEST 2007
On Tue, Aug 21, 2007 at 02:42:59AM +0200, realsun wrote:
>
> Log:
> put ff_insert_timestamp to mpegenc.c and change it to static inline, because it is only used inside the file
>
> --- dvbmuxer/mpeg_pes.h (original)
> +++ dvbmuxer/mpeg_pes.h Tue Aug 21 02:42:58 2007
> @@ -155,13 +155,4 @@ int ff_pes_muxer_write(AVFormatContext *
> */
> int ff_pes_remove_decoded_packets(AVFormatContext *ctx, int64_t scr);
>
> -/**
> - * Insert a timestamp into the ByteIOContext.
> - * @param[in] pb the ByteIOContext to be written to
> - * @param[in] id stream ID
> - * @param[in] timestamp the timestamp
> - * @return NULL
> - */
> -void ff_insert_timestamp(ByteIOContext *pb, int id, int64_t timestamp);
> -
> #endif/* AVFORMAT_MPEG_PES_H */
>
> --- dvbmuxer/mpeg_pes_enc.c (original)
> +++ dvbmuxer/mpeg_pes_enc.c Tue Aug 21 02:42:58 2007
> @@ -65,16 +65,6 @@ int ff_pes_muxer_init(AVFormatContext *c
> return 0;
> }
>
> -void ff_insert_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));
> -}
> -
> static inline void insert_timestamp(uint8_t** p, int id, int64_t timestamp)
> {
> bytestream_put_byte(p,
Log message and patch disagree, please fix the log message.
Diego
More information about the FFmpeg-soc
mailing list