avformat/avienc: write last frame duration

Fixes small part of Ticket 3052

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-19 19:59:44 +01:00
parent be44856483
commit 660a8b43ab

View File

@ -67,6 +67,8 @@ typedef struct {
int entry; int entry;
int max_size; int max_size;
int64_t last_dts;
AVIIndex indexes; AVIIndex indexes;
} AVIStream; } AVIStream;
@ -614,6 +616,9 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt)
if ((ret = write_skip_frames(s, stream_index, pkt->dts)) < 0) if ((ret = write_skip_frames(s, stream_index, pkt->dts)) < 0)
return ret; return ret;
if (pkt->dts != AV_NOPTS_VALUE)
avist->last_dts = pkt->dts + pkt->duration;
avist->packet_count++; avist->packet_count++;
// Make sure to put an OpenDML chunk when the file size exceeds the limits // Make sure to put an OpenDML chunk when the file size exceeds the limits
@ -677,6 +682,11 @@ static int avi_write_trailer(AVFormatContext *s)
int i, j, n, nb_frames; int i, j, n, nb_frames;
int64_t file_size; int64_t file_size;
for (i = 0; i < s->nb_streams; i++) {
AVIStream *avist = s->streams[i]->priv_data;
write_skip_frames(s, i, avist->last_dts);
}
if (pb->seekable) { if (pb->seekable) {
if (avi->riff_id == 1) { if (avi->riff_id == 1) {
ff_end_tag(pb, avi->movi_list); ff_end_tag(pb, avi->movi_list);