avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()

[ffmpeg] / libavformat / rtp.c

diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index bb4bc17d3fc357caeb9502f77e2c5f89b4b3a96a..b6b4b72aa313020803fc24c535d74a9d0a7f80a8 100644 (file)
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -97,9 +97,10 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec)
 
     /* Was the payload type already specified for the RTP muxer? */
     if (ofmt && ofmt->priv_class) {
-        int payload_type = av_get_int(fmt->priv_data, "payload_type", NULL);
-        if (payload_type >= 0)
-            return payload_type;
+        int64_t payload_type;
+        if (av_opt_get_int(fmt->priv_data, "payload_type", 0, &payload_type) >= 0 &&
+            payload_type >= 0)
+            return (int)payload_type;
     }
 
     /* static payload type */