2nd try fix got_key_frame when video+audio

Originally committed as revision 13559 to svn://svn.ffmpeg.org/ffmpeg/trunk

2nd try fix got_key_frame when video+audio
Originally committed as revision 13559 to svn://svn.ffmpeg.org/ffmpeg/trunk
180b7026 · Baptiste Coudurier · 16e861e3 · 180b7026
Commit 180b7026 authored May 30, 2008 by Baptiste Coudurier
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

ffserver.c ffserver.c +3 -3

No files found.
--- a/ffserver.c
+++ b/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;