generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b'

Browse Source 
* commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b':
  rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-06-26 14:51:33 +02:00
commit f972653ec1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/rtsp.c
View File

@ -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)";