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/rtpenc_chain.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/rtpenc_chain.h')
| -rw-r--r-- | libavformat/rtpenc_chain.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/rtpenc_chain.h b/libavformat/rtpenc_chain.h index 1ba3617188..21c27c145d 100644 --- a/libavformat/rtpenc_chain.h +++ b/libavformat/rtpenc_chain.h @@ -26,6 +26,7 @@ #include "url.h" int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s, - AVStream *st, URLContext *handle, int packet_size); + AVStream *st, URLContext *handle, int packet_size, + int id); #endif /* AVFORMAT_RTPENC_CHAIN_H */ |