diff options
| author | Chiranjeevi Melam <cmelam@rgbnetworks.com> | 2011-09-09 03:32:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-09 03:34:27 +0200 |
| commit | 8096b7c67fbf0bf0931081fa5634df876c8dafbb (patch) | |
| tree | 08a83fedec28e272e971f1346bf278f400610934 /libavformat/asfenc.c | |
| parent | d64066f6e88c827e33002b2c7740efd62cd5ba7f (diff) | |
| download | ffmpeg-8096b7c67fbf0bf0931081fa5634df876c8dafbb.tar.gz | |
asfenc: fix assert failure on long ffserver runs
Diffstat (limited to 'libavformat/asfenc.c')
| -rw-r--r-- | libavformat/asfenc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index b23ea785ef..109d283e17 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -199,8 +199,8 @@ typedef struct { /* packet filling */ unsigned char multi_payloads_present; int packet_size_left; - int packet_timestamp_start; - int packet_timestamp_end; + int64_t packet_timestamp_start; + int64_t packet_timestamp_end; unsigned int packet_nb_payloads; uint8_t packet_buf[PACKET_SIZE]; AVIOContext pb; @@ -684,7 +684,7 @@ static void flush_packet(AVFormatContext *s) static void put_payload_header( AVFormatContext *s, ASFStream *stream, - int presentation_time, + int64_t presentation_time, int m_obj_size, int m_obj_offset, int payload_len, @@ -711,7 +711,7 @@ static void put_payload_header( avio_w8(pb, ASF_PAYLOAD_REPLICATED_DATA_LENGTH); avio_wl32(pb, m_obj_size); //Replicated Data - Media Object Size - avio_wl32(pb, presentation_time);//Replicated Data - Presentation Time + avio_wl32(pb, (uint32_t) presentation_time);//Replicated Data - Presentation Time if (asf->multi_payloads_present){ avio_wl16(pb, payload_len); //payload length @@ -722,7 +722,7 @@ static void put_frame( AVFormatContext *s, ASFStream *stream, AVStream *avst, - int timestamp, + int64_t timestamp, const uint8_t *buf, int m_obj_size, int flags |