diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-15 11:31:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-15 11:31:13 +0100 |
| commit | a9b1536a018b867e3458a278c2992f7cd2fb707d (patch) | |
| tree | 55556d53044f7e8854f59c9eb7fcab76f3ea19d1 /libavformat/rtp.h | |
| parent | 4d941eac1655b21af33c6e4d52b7bfd7f9e5b990 (diff) | |
| parent | b74dbdd5e99aed7f3bf1ecb5da1b374e5ba35768 (diff) | |
| download | ffmpeg-a9b1536a018b867e3458a278c2992f7cd2fb707d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
bgmc: Fix av_malloc checks in ff_bgmc_init()
rtp: set the payload type as stream id
Conflicts:
libavformat/rtpenc_chain.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtp.h')
| -rw-r--r-- | libavformat/rtp.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavformat/rtp.h b/libavformat/rtp.h index ab2de528a0..1732af8a91 100644 --- a/libavformat/rtp.h +++ b/libavformat/rtp.h @@ -25,13 +25,18 @@ #include "libavcodec/avcodec.h" /** - * Return the payload type for a given codec used in the given format context. + * Return the payload type for a given stream used in the given format context. + * Static payload types are derived from the codec. + * Dynamic payload type are derived from the id field in AVStream. + * The format context private option payload_type overrides both. * * @param fmt The context of the format * @param codec The context of the codec + * @param idx The stream index * @return The payload type (the 'PT' field in the RTP header). */ -int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec); +int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec, + int idx); /** * Initialize a codec context based on the payload type. |