eden-emu/FFmpeg
17
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rtp: Fix ff_rtp_get_payload_type

Browse source 
It was broken in 3b3ea34655
"Remove all uses of deprecated AVOptions API", where any
presence of a payload_type AVOption caused its value to
be returned, even if it wasn't set (and thus had the default
-1 value).

This caused the RTP muxer to be broken.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2011-10-17 20:24:54 +03:00
parent 02a1a28c61
commit 2e69dd66b6
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libavformat/rtp.c
View file

@ -98,7 +98,8 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec)
/* Was the payload type already specified for the RTP muxer? */ /* Was the payload type already specified for the RTP muxer? */
if (ofmt && ofmt->priv_class) { if (ofmt && ofmt->priv_class) {
int64_t payload_type; int64_t payload_type;
if (av_opt_get_int(fmt->priv_data, "payload_type", 0, &payload_type) >= 0) if (av_opt_get_int(fmt->priv_data, "payload_type", 0, &payload_type) >= 0 &&
payload_type >= 0)
return (int)payload_type; return (int)payload_type;
} }