virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

ffserver: user AVStream.codecpar in compute_status()

Browse Source 
AVStream.codec is deprecated

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Reynaldo H. Verdejo Pinochet
2016-11-08 01:07:14 -08:00
committed by Michael Niedermayer
parent afcbadf0ed
commit 822e3e2ddb
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ffserver.c
View File

@@ -1990,11 +1990,11 @@ static void compute_status(HTTPContext *c)
for(i=0;i<stream->nb_streams;i++) { for(i=0;i<stream->nb_streams;i++) {
AVStream *st = stream->streams[i]; AVStream *st = stream->streams[i];
AVCodec *codec = avcodec_find_encoder(st->codec->codec_id); AVCodec *codec = avcodec_find_encoder(st->codecpar->codec_id);
switch(st->codec->codec_type) { switch(st->codecpar->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
audio_bit_rate += st->codec->bit_rate; audio_bit_rate += st->codecpar->bit_rate;
if (codec) { if (codec) {
if (*audio_codec_name) if (*audio_codec_name)
audio_codec_name_extra = "..."; audio_codec_name_extra = "...";
@@ -2002,7 +2002,7 @@ static void compute_status(HTTPContext *c)
} }
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
video_bit_rate += st->codec->bit_rate; video_bit_rate += st->codecpar->bit_rate;
if (codec) { if (codec) {
if (*video_codec_name) if (*video_codec_name)
video_codec_name_extra = "..."; video_codec_name_extra = "...";
@@ -2010,7 +2010,7 @@ static void compute_status(HTTPContext *c)
} }
break; break;
case AVMEDIA_TYPE_DATA: case AVMEDIA_TYPE_DATA:
video_bit_rate += st->codec->bit_rate; video_bit_rate += st->codecpar->bit_rate;
break; break;
default: default:
abort(); abort();
@@ -2107,9 +2107,9 @@ static void compute_status(HTTPContext *c)
if (c1->stream) { if (c1->stream) {
for (j = 0; j < c1->stream->nb_streams; j++) { for (j = 0; j < c1->stream->nb_streams; j++) {
if (!c1->stream->feed) if (!c1->stream->feed)
bitrate += c1->stream->streams[j]->codec->bit_rate; bitrate += c1->stream->streams[j]->codecpar->bit_rate;
else if (c1->feed_streams[j] >= 0) else if (c1->feed_streams[j] >= 0)
bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec->bit_rate; bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codecpar->bit_rate;
} }
} }