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

Don't (ab)use PKT_FLAG_* in RTP code, since the two have virtually nothing

Browse Source 
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
This commit is contained in:
Ronald S. Bultje 2009-02-26 14:23:05 +00:00
parent 26d6b3e230
commit a68d44ed6f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rdt.c
View File

@ -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;
}

3
libavformat/rtpdec.h
View File

@ -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,