ffmpeg | branch: release/3.1 | Hendrik Leppkes <[email protected]> | Sun Jun 26 14:51:33 2016 +0200| [f972653ec19841639a8d5cb072b16e930812342f] | committer: Hendrik Leppkes
Merge commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b' * commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b': rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder Merged-by: Hendrik Leppkes <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f972653ec19841639a8d5cb072b16e930812342f --- libavformat/rtsp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 6f0d2c5..21c80c1 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -248,7 +248,7 @@ static int sdp_parse_rtpmap(AVFormatContext *s, AVCodecParameters *par = st->codecpar; char buf[256]; int i; - AVCodec *c; + const AVCodecDescriptor *desc; const char *c_name; /* See if we can handle this kind of payload. @@ -274,9 +274,9 @@ static int sdp_parse_rtpmap(AVFormatContext *s, par->codec_id = ff_rtp_codec_id(buf, par->codec_type); } - c = avcodec_find_decoder(par->codec_id); - if (c && c->name) - c_name = c->name; + desc = avcodec_descriptor_get(par->codec_id); + if (desc && desc->name) + c_name = desc->name; else c_name = "(null)"; ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
