diff options
| author | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2016-11-08 00:58:25 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-08 12:12:12 +0100 |
| commit | afcbadf0eda3fbb05e31bf8782adc7e782cb49fc (patch) | |
| tree | b72fc20e8e267968ed87810f14235bbee83826ac /ffserver.c | |
| parent | 1323349befd3f55bef2f9e46168f17a53f8f6d4a (diff) | |
| download | ffmpeg-afcbadf0eda3fbb05e31bf8782adc7e782cb49fc.tar.gz | |
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>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ffserver.c b/ffserver.c index 65280d216d..63c408bd11 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: |