[FFmpeg-cvslog] ffserver: use AVStream.codecpar in find_stream_in_feed()

Reynaldo H. Verdejo Pinochet git at videolan.org
Tue Nov 8 13:38:18 EET 2016


ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Tue Nov  8 00:58:25 2016 -0800| [afcbadf0eda3fbb05e31bf8782adc7e782cb49fc] | committer: Michael Niedermayer

ffserver: use AVStream.codecpar in find_stream_in_feed()

AVStream.codec is deprecated

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=afcbadf0eda3fbb05e31bf8782adc7e782cb49fc
---

 ffserver.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 65280d2..63c408b 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -1191,7 +1191,7 @@ static int extract_rates(char *rates, int ratelen, const char *request)
     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 i;
@@ -1199,7 +1199,7 @@ static int find_stream_in_feed(FFServerStream *feed, AVCodecContext *codec,
     int best = -1;
 
     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 ||
             feed_codec->sample_rate != codec->sample_rate ||
@@ -1240,7 +1240,7 @@ static int modify_current_stream(HTTPContext *c, char *rates)
         return 0;
 
     for (i = 0; i < req->nb_streams; i++) {
-        AVCodecContext *codec = req->streams[i]->codec;
+        AVCodecParameters *codec = req->streams[i]->codecpar;
 
         switch(rates[i]) {
             case 0:



More information about the ffmpeg-cvslog mailing list