RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use duration from pkt 

Originally committed as revision 13228 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-05-21 22:52:21 +00:00
parent 56b8a7b72a
commit 5dae74e095
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/ffm.c
View File

@ -247,16 +247,8 @@ static int ffm_write_packet(AVFormatContext *s, AVPacket *pkt)
FFMStream *fst = st->priv_data;
int64_t pts;
uint8_t header[FRAME_HEADER_SIZE];
int duration;
int size= pkt->size;
//XXX/FIXME use duration from pkt
if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
duration = ((float)st->codec->frame_size / st->codec->sample_rate * 1000000.0);
} else {
duration = (1000000.0 * st->codec->time_base.num / (float)st->codec->time_base.den);
}
pts = fst->pts;
/* packet size & key_frame */
header[0] = pkt->stream_index;
@ -264,7 +256,7 @@ static int ffm_write_packet(AVFormatContext *s, AVPacket *pkt)
if (pkt->flags & PKT_FLAG_KEY)
header[1] |= FLAG_KEY_FRAME;
AV_WB24(header+2, size);
AV_WB24(header+5, duration);
AV_WB24(header+5, pkt->duration);
ffm_write_data(s, header, FRAME_HEADER_SIZE, pts, 1);
ffm_write_data(s, pkt->data, size, pts, 0);