On Wed, 14 Nov 2012, Luca Barbato wrote:
Support multiple video/audio streams with different format in the
same session.
Signed-off-by: Luca Barbato <[email protected]>
---
diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index 4314c46..58990ce 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -90,18 +90,10 @@ int ff_rtp_get_codec_info(AVCodecContext *codec, int
payload_type)
return -1;
}
-int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec)
+int ff_rtp_get_payload_type(AVFormatContext *fmt,
+ AVCodecContext *codec, int idx)
{
int i;
- AVOutputFormat *ofmt = fmt ? fmt->oformat : NULL;
-
- /* Was the payload type already specified for the RTP muxer? */
- if (ofmt && ofmt->priv_class) {
- 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;
- }
On a second thought, I think it might be worthwhile to keep this around -
it might be needed in a case where you generate the SDP before opening the
RTP muxers, and you have chosen a nonstandard PT via the payload_type
option. OTOH, you could do that via ->id now instead as well, so perhaps
it's ok to drop it. What do you think?
The rest looks good to me.
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
