Browse code

ffserver: use AVStream.codecpar in find_stream_in_feed()

AVStream.codec is deprecated

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reynaldo H. Verdejo Pinochet authored on 2016/11/08 17:58:25
Showing 1 changed files
... ...
@@ -1191,7 +1191,7 @@ static int extract_rates(char *rates, int ratelen, const char *request)
1191 1191
     return 0;
1192 1192
 }
1193 1193
 
1194
-static int find_stream_in_feed(FFServerStream *feed, AVCodecContext *codec,
1194
+static int find_stream_in_feed(FFServerStream *feed, AVCodecParameters *codec,
1195 1195
                                int bit_rate)
1196 1196
 {
1197 1197
     int i;
... ...
@@ -1199,7 +1199,7 @@ static int find_stream_in_feed(FFServerStream *feed, AVCodecContext *codec,
1199 1199
     int best = -1;
1200 1200
 
1201 1201
     for (i = 0; i < feed->nb_streams; i++) {
1202
-        AVCodecContext *feed_codec = feed->streams[i]->codec;
1202
+        AVCodecParameters *feed_codec = feed->streams[i]->codecpar;
1203 1203
 
1204 1204
         if (feed_codec->codec_id != codec->codec_id ||
1205 1205
             feed_codec->sample_rate != codec->sample_rate ||
... ...
@@ -1240,7 +1240,7 @@ static int modify_current_stream(HTTPContext *c, char *rates)
1240 1240
         return 0;
1241 1241
 
1242 1242
     for (i = 0; i < req->nb_streams; i++) {
1243
-        AVCodecContext *codec = req->streams[i]->codec;
1243
+        AVCodecParameters *codec = req->streams[i]->codecpar;
1244 1244
 
1245 1245
         switch(rates[i]) {
1246 1246
             case 0: