Commit afcbadf0 authored by Reynaldo H. Verdejo Pinochet's avatar Reynaldo H. Verdejo Pinochet Committed by Michael Niedermayer

ffserver: use AVStream.codecpar in find_stream_in_feed()

AVStream.codec is deprecated
Signed-off-by: 's avatarReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 1323349b
...@@ -1191,7 +1191,7 @@ static int extract_rates(char *rates, int ratelen, const char *request) ...@@ -1191,7 +1191,7 @@ static int extract_rates(char *rates, int ratelen, const char *request)
return 0; return 0;
} }
static int find_stream_in_feed(FFServerStream *feed, AVCodecContext *codec, static int find_stream_in_feed(FFServerStream *feed, AVCodecParameters *codec,
int bit_rate) int bit_rate)
{ {
int i; int i;
...@@ -1199,7 +1199,7 @@ static int find_stream_in_feed(FFServerStream *feed, AVCodecContext *codec, ...@@ -1199,7 +1199,7 @@ static int find_stream_in_feed(FFServerStream *feed, AVCodecContext *codec,
int best = -1; int best = -1;
for (i = 0; i < feed->nb_streams; i++) { for (i = 0; i < feed->nb_streams; i++) {
AVCodecContext *feed_codec = feed->streams[i]->codec; AVCodecParameters *feed_codec = feed->streams[i]->codecpar;
if (feed_codec->codec_id != codec->codec_id || if (feed_codec->codec_id != codec->codec_id ||
feed_codec->sample_rate != codec->sample_rate || feed_codec->sample_rate != codec->sample_rate ||
...@@ -1240,7 +1240,7 @@ static int modify_current_stream(HTTPContext *c, char *rates) ...@@ -1240,7 +1240,7 @@ static int modify_current_stream(HTTPContext *c, char *rates)
return 0; return 0;
for (i = 0; i < req->nb_streams; i++) { for (i = 0; i < req->nb_streams; i++) {
AVCodecContext *codec = req->streams[i]->codec; AVCodecParameters *codec = req->streams[i]->codecpar;
switch(rates[i]) { switch(rates[i]) {
case 0: case 0:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment