diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2009-02-26 14:23:05 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2009-02-26 14:23:05 +0000 |
| commit | a68d44ed6f49897bfbba69688437e4aced727c10 (patch) | |
| tree | 946beb1fdae79aea1c2532604f11e4465ad642b6 | |
| parent | 26d6b3e230067833edb551795e834679c820d96e (diff) | |
| download | ffmpeg-a68d44ed6f49897bfbba69688437e4aced727c10.tar.gz | |
Don't (ab)use PKT_FLAG_* in RTP code, since the two have virtually nothing
in common except for this one value. Change was requested by Luca in the
"[FFmpeg-devel] RTP mark bit not passed to parse_packet" thread.
Originally committed as revision 17615 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/rdt.c | 4 | ||||
| -rw-r--r-- | libavformat/rtpdec.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/rdt.c b/libavformat/rdt.c index aeb35c7135..c96ed4a607 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -306,7 +306,7 @@ rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st, int pos; init_put_byte(&pb, buf, len, 0, NULL, NULL, NULL, NULL); - flags = (flags & PKT_FLAG_KEY) ? 2 : 0; + flags = (flags & RTP_FLAG_KEY) ? 2 : 0; res = ff_rm_parse_packet (rdt->rmctx, &pb, st, rdt->rmst[st->index], len, pkt, &seq, &flags, timestamp); pos = url_ftell(&pb); @@ -361,7 +361,7 @@ ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt, if (is_keyframe && (set_id != s->prev_set_id || timestamp != s->prev_timestamp || stream_id != s->prev_stream_id)) { - flags |= PKT_FLAG_KEY; + flags |= RTP_FLAG_KEY; s->prev_set_id = set_id; s->prev_timestamp = timestamp; } diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index ef0ce8551e..f4bc6fb9b2 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -92,6 +92,7 @@ typedef struct { uint32_t jitter; ///< estimated jitter. } RTPStatistics; +#define RTP_FLAG_KEY 0x1 ///< RTP packet contains a keyframe /** * Packet parsing for "private" payloads in the RTP specs. * @@ -102,7 +103,7 @@ typedef struct { * @param timestamp pointer in which to write the timestamp of this RTP packet * @param buf pointer to raw RTP packet data * @param len length of buf - * @param flags flags from the RTP packet header (PKT_FLAG_*) + * @param flags flags from the RTP packet header (RTP_FLAG_*) */ typedef int (*DynamicPayloadPacketHandlerProc) (AVFormatContext *ctx, PayloadContext *s, |