diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:46:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:46:43 +0100 |
| commit | bb3420d88e71ee9bb04166467dde3056ff3aa2b6 (patch) | |
| tree | 6153ab3fbc83a4f033cb3aa1f6f1b935068e505b /libavformat/rtpdec.h | |
| parent | be2c0adc968d3f8fc4a72dea7117529016f0a1ad (diff) | |
| parent | 90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59 (diff) | |
| download | ffmpeg-bb3420d88e71ee9bb04166467dde3056ff3aa2b6.tar.gz | |
Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59'
* commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59':
rtpdec: Pass the sequence number to depacketizers
configure: Make avconv depend on null, anull and resample filters
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec.h')
| -rw-r--r-- | libavformat/rtpdec.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index 854c687451..fb1acc279d 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -101,6 +101,7 @@ typedef struct RTPStatistics { * updated by the function if returning older, buffered data * @param buf pointer to raw RTP packet data * @param len length of buf + * @param seq RTP sequence number of the packet * @param flags flags from the RTP packet header (RTP_FLAG_*) */ typedef int (*DynamicPayloadPacketHandlerProc)(AVFormatContext *ctx, @@ -108,7 +109,7 @@ typedef int (*DynamicPayloadPacketHandlerProc)(AVFormatContext *ctx, AVStream *st, AVPacket *pkt, uint32_t *timestamp, const uint8_t * buf, - int len, int flags); + int len, uint16_t seq, int flags); struct RTPDynamicProtocolHandler { const char enc_name[50]; |