* commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac':
rdt: Use a separate variable to clarify the different value namespaces
Conflicts:
libavformat/rdt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
... | ... |
@@ -299,12 +299,12 @@ rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st, |
299 | 299 |
AVIOContext pb; |
300 | 300 |
|
301 | 301 |
if (rdt->audio_pkt_cnt == 0) { |
302 |
- int pos; |
|
302 |
+ int pos, rmflags; |
|
303 | 303 |
|
304 | 304 |
ffio_init_context(&pb, (uint8_t *)buf, len, 0, NULL, NULL, NULL, NULL); |
305 |
- flags = (flags & RTP_FLAG_KEY) ? 2 : 0; |
|
305 |
+ rmflags = (flags & RTP_FLAG_KEY) ? 2 : 0; |
|
306 | 306 |
res = ff_rm_parse_packet (rdt->rmctx, &pb, st, rdt->rmst[st->index], len, pkt, |
307 |
- &seq, flags, *timestamp); |
|
307 |
+ &seq, rmflags, *timestamp); |
|
308 | 308 |
pos = avio_tell(&pb); |
309 | 309 |
if (res < 0) |
310 | 310 |
return res; |