diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-27 18:05:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-28 22:45:33 +0100 |
| commit | da38da459598c0a8777522720b6a4afd433e29bc (patch) | |
| tree | 679db54bdb97ce8f814f721880f158f8c7a95465 /ffserver.c | |
| parent | 75b436d8b682db6f402fdb0561661ec5c0203cfc (diff) | |
| download | ffmpeg-da38da459598c0a8777522720b6a4afd433e29bc.tar.gz | |
ffserver: Remove some deprecated API use related to codec/codecpar
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ffserver.c b/ffserver.c index 1d8abd94aa..ded514918f 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2288,8 +2288,6 @@ static int http_prepare_data(HTTPContext *c) unlayer_stream(c->pfmt_ctx->streams[i], src); //TODO we no longer copy st->internal, does this matter? av_assert0(!c->pfmt_ctx->streams[i]->priv_data); - /* XXX: should be done in AVStream, not in codec */ - c->pfmt_ctx->streams[i]->codec->frame_number = 0; } /* set output format parameters */ c->pfmt_ctx->oformat = c->stream->fmt; @@ -2387,7 +2385,7 @@ static int http_prepare_data(HTTPContext *c) AVStream *st = c->fmt_in->streams[source_index]; pkt.stream_index = i; if (pkt.flags & AV_PKT_FLAG_KEY && - (st->codec->codec_type == AVMEDIA_TYPE_VIDEO || + (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO || c->stream->nb_streams == 1)) c->got_key_frame = 1; if (!c->stream->send_on_key || c->got_key_frame) @@ -2395,7 +2393,6 @@ static int http_prepare_data(HTTPContext *c) } } } else { - AVCodecContext *codec; AVStream *ist, *ost; send_it: ist = c->fmt_in->streams[source_index]; @@ -2416,13 +2413,11 @@ static int http_prepare_data(HTTPContext *c) av_packet_unref(&pkt); break; } - codec = ctx->streams[0]->codec; /* only one stream per RTP connection */ pkt.stream_index = 0; } else { ctx = c->pfmt_ctx; /* Fudge here */ - codec = ctx->streams[pkt.stream_index]->codec; } if (c->is_packetized) { @@ -2464,7 +2459,6 @@ static int http_prepare_data(HTTPContext *c) c->buffer_ptr = c->pb_buffer; c->buffer_end = c->pb_buffer + len; - codec->frame_number++; if (len == 0) { av_packet_unref(&pkt); goto redo; |