diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 01:40:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 01:40:03 +0100 |
| commit | 4574f11e4dd3e8cfd102c8c675e4de40f7532ce6 (patch) | |
| tree | 6b026738b29cf914a24e609842bc5770ab283902 /libavformat/rdt.c | |
| parent | 2eb890aab22d9cc20df140615008a7c4eec9ac7b (diff) | |
| parent | b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac (diff) | |
| download | ffmpeg-4574f11e4dd3e8cfd102c8c675e4de40f7532ce6.tar.gz | |
Merge commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac'
* commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac':
rdt: Use a separate variable to clarify the different value namespaces
Conflicts:
libavformat/rdt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rdt.c')
| -rw-r--r-- | libavformat/rdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 737794b6a9..bb56a8ba81 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -299,12 +299,12 @@ rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st, AVIOContext pb; if (rdt->audio_pkt_cnt == 0) { - int pos; + int pos, rmflags; ffio_init_context(&pb, (uint8_t *)buf, len, 0, NULL, NULL, NULL, NULL); - flags = (flags & RTP_FLAG_KEY) ? 2 : 0; + rmflags = (flags & RTP_FLAG_KEY) ? 2 : 0; res = ff_rm_parse_packet (rdt->rmctx, &pb, st, rdt->rmst[st->index], len, pkt, - &seq, flags, *timestamp); + &seq, rmflags, *timestamp); pos = avio_tell(&pb); if (res < 0) return res; |