2nd try fix got_key_frame when video+audio

Originally committed as revision 13559 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Baptiste Coudurier 17 years ago
parent 16e861e3ee
commit 180b7026b9
  1. 6
      ffserver.c

@ -2101,9 +2101,9 @@ static int http_prepare_data(HTTPContext *c)
if (c->feed_streams[i] == pkt.stream_index) {
AVStream *st = c->fmt_in->streams[source_index];
pkt.stream_index = i;
if (st->codec->codec_type == CODEC_TYPE_AUDIO ||
(st->codec->codec_type == CODEC_TYPE_VIDEO &&
pkt.flags & PKT_FLAG_KEY))
if (pkt.flags & PKT_FLAG_KEY &&
(st->codec->codec_type == CODEC_TYPE_VIDEO ||
c->stream->nb_streams == 1))
c->got_key_frame = 1;
if (!c->stream->send_on_key || c->got_key_frame)
goto send_it;

Loading…
Cancel
Save