generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-12-21 17:46:43 +01:00
parent be2c0adc96 90c784cc13
commit bb3420d88e
18 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/rtpdec_xiph.c
View File

@@ -69,12 +69,10 @@ static void xiph_free_context(PayloadContext * data)
av_free(data);
}
static int xiph_handle_packet(AVFormatContext * ctx,
PayloadContext * data,
AVStream * st,
AVPacket * pkt,
uint32_t * timestamp,
const uint8_t * buf, int len, int flags)
static int xiph_handle_packet(AVFormatContext *ctx, PayloadContext *data,
AVStream *st, AVPacket *pkt, uint32_t *timestamp,
const uint8_t *buf, int len, uint16_t seq,
int flags)
{
int ident, fragmented, tdt, num_pkts, pkt_len;