From 0d9f863340138e83a5c99f47d3ca46a2dc3b3351 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 12 Feb 2007 19:24:53 +0000 Subject: dont set the keyframe flag for audio as microshitty doesnt do it and some things have problems with our asfs, maybe that has a positive effect? Originally committed as revision 7952 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/asf-enc.c | 8 ++++++-- tests/ffmpeg.regression.ref | 6 +++--- tests/libav.regression.ref | 2 +- tests/rotozoom.regression.ref | 6 +++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/libavformat/asf-enc.c b/libavformat/asf-enc.c index 50c282d61a..1d9b5ab83d 100644 --- a/libavformat/asf-enc.c +++ b/libavformat/asf-enc.c @@ -715,10 +715,14 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt) AVCodecContext *codec; int64_t packet_st,pts; int start_sec,i; + int flags= pkt->flags; codec = s->streams[pkt->stream_index]->codec; stream = &asf->streams[pkt->stream_index]; + if(codec->codec_type == CODEC_TYPE_AUDIO) + flags &= ~PKT_FLAG_KEY; + //XXX /FIXME use duration from AVPacket (quick hack by) pts = (pkt->pts != AV_NOPTS_VALUE) ? pkt->pts : pkt->dts; assert(pts != AV_NOPTS_VALUE); @@ -726,10 +730,10 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt) asf->duration= FFMAX(asf->duration, duration); packet_st = asf->nb_packets; - put_frame(s, stream, pkt->dts, pkt->data, pkt->size, pkt->flags); + put_frame(s, stream, pkt->dts, pkt->data, pkt->size, flags); /* check index */ - if ((!asf->is_streamed) && (codec->codec_type == CODEC_TYPE_VIDEO) && (pkt->flags & PKT_FLAG_KEY)) { + if ((!asf->is_streamed) && (flags & PKT_FLAG_KEY)) { start_sec = (int)(duration / INT64_C(10000000)); if (start_sec != (int)(asf->last_indexed_pts / INT64_C(10000000))) { for(i=asf->nb_index_count;i