diff --git a/ffmpeg.c b/ffmpeg.c
index c053a239555b86fdab675304cf03c3845d2df851..c6058c7afa6fdac6a0b62d808109fa5113cedac5 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -563,7 +563,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx
int a= av_bitstream_filter_filter(bsfc, avctx, NULL,
&new_pkt.data, &new_pkt.size,
pkt->data, pkt->size,
- pkt->flags & PKT_FLAG_KEY);
+ pkt->flags & AV_PKT_FLAG_KEY);
if(a>0){
av_free_packet(pkt);
new_pkt.destruct= av_destruct_packet;
@@ -768,7 +768,7 @@ need_realloc:
pkt.size= ret;
if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
write_frame(s, &pkt, ost->st->codec, bitstream_filters[ost->file_index][pkt.stream_index]);
ost->sync_opts += enc->frame_size;
@@ -803,7 +803,7 @@ need_realloc:
pkt.size= ret;
if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
write_frame(s, &pkt, ost->st->codec, bitstream_filters[ost->file_index][pkt.stream_index]);
}
}
@@ -1077,7 +1077,7 @@ static void do_video_out(AVFormatContext *s,
pkt.data= (uint8_t *)final_picture;
pkt.size= sizeof(AVPicture);
pkt.pts= av_rescale_q(ost->sync_opts, enc->time_base, ost->st->time_base);
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
write_frame(s, &pkt, ost->st->codec, bitstream_filters[ost->file_index][pkt.stream_index]);
enc->coded_frame = old_frame;
@@ -1125,7 +1125,7 @@ static void do_video_out(AVFormatContext *s,
pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1);*/
if(enc->coded_frame->key_frame)
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
write_frame(s, &pkt, ost->st->codec, bitstream_filters[ost->file_index][pkt.stream_index]);
*frame_size = ret;
video_size += ret;
@@ -1507,7 +1507,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
av_init_packet(&opkt);
- if ((!ost->frame_number && !(pkt->flags & PKT_FLAG_KEY)) && !copy_initial_nonkeyframes)
+ if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) && !copy_initial_nonkeyframes)
continue;
/* no reencoding needed : output the packet directly */
@@ -1515,7 +1515,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
avcodec_get_frame_defaults(&avframe);
ost->st->codec->coded_frame= &avframe;
- avframe.key_frame = pkt->flags & PKT_FLAG_KEY;
+ avframe.key_frame = pkt->flags & AV_PKT_FLAG_KEY;
if(ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
audio_size += data_size;
@@ -1544,7 +1544,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
&& ost->st->codec->codec_id != CODEC_ID_MPEG1VIDEO
&& ost->st->codec->codec_id != CODEC_ID_MPEG2VIDEO
) {
- if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & PKT_FLAG_KEY))
+ if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & AV_PKT_FLAG_KEY))
opkt.destruct= av_destruct_packet;
} else {
opkt.data = data_buf;
@@ -1627,7 +1627,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
av_exit(1);
}
audio_size += ret;
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
break;
case AVMEDIA_TYPE_VIDEO:
ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL);
@@ -1637,7 +1637,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
}
video_size += ret;
if(enc->coded_frame && enc->coded_frame->key_frame)
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
if (ost->logfile && enc->stats_out) {
fprintf(ost->logfile, "%s", enc->stats_out);
}
diff --git a/ffserver.c b/ffserver.c
index 076635fa04e7f0b2498ebc3c87ff7122b9e918cb..fad1548c6e337f6a8c315e6635826f1c55b26caa 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2199,7 +2199,7 @@ static int http_prepare_data(HTTPContext *c)
c->switch_pending = 0;
for(i=0;i<c->stream->nb_streams;i++) {
if (c->switch_feed_streams[i] == pkt.stream_index)
- if (pkt.flags & PKT_FLAG_KEY)
+ if (pkt.flags & AV_PKT_FLAG_KEY)
do_switch_stream(c, i);
if (c->switch_feed_streams[i] >= 0)
c->switch_pending = 1;
@@ -2209,7 +2209,7 @@ static int http_prepare_data(HTTPContext *c)
if (c->feed_streams[i] == pkt.stream_index) {
AVStream *st = c->fmt_in->streams[source_index];
pkt.stream_index = i;
- if (pkt.flags & PKT_FLAG_KEY &&
+ if (pkt.flags & AV_PKT_FLAG_KEY &&
(st->codec->codec_type == AVMEDIA_TYPE_VIDEO ||
c->stream->nb_streams == 1))
c->got_key_frame = 1;
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 183d8e63ade4189d7c41601574417d0528181756..12d9b3d47c1e4cd6a9d0b51e59031f2b2e24b57e 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3445,7 +3445,7 @@ attribute_deprecated int avcodec_decode_video(AVCodecContext *avctx, AVFrame *pi
* @param[in] avpkt The input AVpacket containing the input buffer.
* You can create such packet with av_init_packet() and by then setting
* data and size, some decoders might in addition need other fields like
- * flags&PKT_FLAG_KEY. All decoders are designed to use the least
+ * flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
* fields possible.
* @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
* @return On error a negative value is returned, otherwise the number of bytes
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 382ba524cc0b34de4c1a91fa98fdf2374bd0ef1f..aa05ff020b75cbc0dbd102746f3d016c2f9d2730 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -599,7 +599,7 @@ static int decode_frame(AVCodecContext *avctx,
exit_loop:
/* handle p-frames only if a predecessor frame is available */
if(s->last_picture->data[0] != NULL) {
- if(!(avpkt->flags & PKT_FLAG_KEY)) {
+ if(!(avpkt->flags & AV_PKT_FLAG_KEY)) {
int i, j;
uint8_t *pd = s->current_picture->data[0];
uint8_t *pd_last = s->last_picture->data[0];
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index 8ffbc58974d6363cc79532653be024cbc6c64465..1f35135a658bea42929976184c316a4bb1814013 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -129,7 +129,7 @@ static inline int dc1394_read_common(AVFormatContext *c, AVFormatParameters *ap,
av_init_packet(&dc1394->packet);
dc1394->packet.size = avpicture_get_size(fmt->pix_fmt, fmt->width, fmt->height);
dc1394->packet.stream_index = vst->index;
- dc1394->packet.flags |= PKT_FLAG_KEY;
+ dc1394->packet.flags |= AV_PKT_FLAG_KEY;
dc1394->current_frame = 0;
dc1394->fps = fps->frame_rate;
diff --git a/libavformat/anm.c b/libavformat/anm.c
index 0d28ff4e8f6bb73e4bcccd7f47fe327611469d22..de59b40675512ee90618c6785df825629568c4f6 100644
--- a/libavformat/anm.c
+++ b/libavformat/anm.c
@@ -219,7 +219,7 @@ repeat:
if (pkt->size < 0)
return pkt->size;
if (p->base_record + anm->record == 0)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
anm->record++;
return 0;
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index ab96cc433993038354de3c4b89b974d0d8500ae3..c505f92c19dd53bd0d18361bd92c5d65ebb07591 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -888,12 +888,12 @@ static int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *
asf_st->pkt.pos =
asf_st->packet_pos= asf->packet_pos;
//printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n",
-//asf->stream_index, asf->packet_key_frame, asf_st->pkt.flags & PKT_FLAG_KEY,
+//asf->stream_index, asf->packet_key_frame, asf_st->pkt.flags & AV_PKT_FLAG_KEY,
//s->streams[asf->stream_index]->codec->codec_type == AVMEDIA_TYPE_AUDIO, asf->packet_obj_size);
if (s->streams[asf->stream_index]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
asf->packet_key_frame = 1;
if (asf->packet_key_frame)
- asf_st->pkt.flags |= PKT_FLAG_KEY;
+ asf_st->pkt.flags |= AV_PKT_FLAG_KEY;
}
/* read data */
@@ -1068,7 +1068,7 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos,
pts= pkt->pts;
av_free_packet(pkt);
- if(pkt->flags&PKT_FLAG_KEY){
+ if(pkt->flags&AV_PKT_FLAG_KEY){
i= pkt->stream_index;
asf_st= s->streams[i]->priv_data;
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index f3a368ae3bda808f9c4b0a9c6fa222b0c7fe03af..9f8d69ac5c2e9b4fc6d6199c5698b16173f2f072 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -668,7 +668,7 @@ static void put_payload_header(
int val;
val = stream->num;
- if (flags & PKT_FLAG_KEY)
+ if (flags & AV_PKT_FLAG_KEY)
val |= ASF_PL_FLAG_KEY_FRAME;
put_byte(pb, val);
@@ -771,7 +771,7 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt)
stream = &asf->streams[pkt->stream_index];
if(codec->codec_type == AVMEDIA_TYPE_AUDIO)
- flags &= ~PKT_FLAG_KEY;
+ flags &= ~AV_PKT_FLAG_KEY;
pts = (pkt->pts != AV_NOPTS_VALUE) ? pkt->pts : pkt->dts;
assert(pts != AV_NOPTS_VALUE);
@@ -782,7 +782,7 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt)
put_frame(s, stream, s->streams[pkt->stream_index], pkt->dts, pkt->data, pkt->size, flags);
/* check index */
- if ((!asf->is_streamed) && (flags & PKT_FLAG_KEY)) {
+ if ((!asf->is_streamed) && (flags & AV_PKT_FLAG_KEY)) {
start_sec = (int)(duration / INT64_C(10000000));
if (start_sec != (int)(asf->last_indexed_pts / INT64_C(10000000))) {
for(i=asf->nb_index_count;i<start_sec;i++) {
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 173dc0c632d0939d2ac3bce26f862ce936b73313..5f8e0b96bebdc62f50750c2dcde20a368755f6b3 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -165,7 +165,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
end= strchr(p, '\n');
av_new_packet(pkt, end ? end-p+1 : strlen(p));
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
pkt->pos= p - ass->event_buffer + s->streams[0]->codec->extradata_size;
pkt->pts= pkt->dts= get_pts(p);
memcpy(pkt->data, p, pkt->size);
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index a74400f86050f40246b4401c01931d7ba7b4ce02..c9e657ee859ee91adc87d417bd3e0d45a463ada7 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -777,7 +777,7 @@ resync:
size = dv_produce_packet(avi->dv_demux, pkt,
pkt->data, pkt->size);
pkt->destruct = dstr;
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
} else {
/* XXX: How to handle B-frames in AVI? */
pkt->dts = ast->frame_offset;
@@ -797,10 +797,10 @@ resync:
if(index >= 0 && e->timestamp == ast->frame_offset){
if (e->flags & AVINDEX_KEYFRAME)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
}
} else {
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
}
if(ast->sample_size)
ast->frame_offset += pkt->size;
@@ -885,7 +885,7 @@ resync:
if( (st->discard >= AVDISCARD_DEFAULT && size==0)
- /*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & PKT_FLAG_KEY))*/ //FIXME needs a little reordering
+ /*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & AV_PKT_FLAG_KEY))*/ //FIXME needs a little reordering
|| st->discard >= AVDISCARD_ALL){
if(ast->sample_size) ast->frame_offset += pkt->size;
else ast->frame_offset++;
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 51daf500fe3ca2c9e2504cf882b1b2bff83edc3e..b4a31ec54a964d42323e188b1f864880906fa639 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -540,7 +540,7 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt)
}
avi_stream2fourcc(&tag[0], stream_index, enc->codec_type);
- if(pkt->flags&PKT_FLAG_KEY)
+ if(pkt->flags&AV_PKT_FLAG_KEY)
flags = 0x10;
if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
avist->audio_strm_length += size;
diff --git a/libavformat/avs.c b/libavformat/avs.c
index 9cdd336c05adfe4d19d13ec5c718ab05ad05c18d..caf3a892bb7dcf80d63f7389929ee10f92b3c16a 100644
--- a/libavformat/avs.c
+++ b/libavformat/avs.c
@@ -113,7 +113,7 @@ avs_read_video_packet(AVFormatContext * s, AVPacket * pkt,
pkt->size = ret + palette_size;
pkt->stream_index = avs->st_video->index;
if (sub_type == 0)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
return 0;
}
@@ -134,7 +134,7 @@ static int avs_read_audio_packet(AVFormatContext * s, AVPacket * pkt)
return ret;
pkt->stream_index = avs->st_audio->index;
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
return size;
}
diff --git a/libavformat/bink.c b/libavformat/bink.c
index 3bb73610adfbddfc56f4a195ad3da6abeddb4b2f..9230cfb1e472aa0ad633feb40220869bab89a962 100644
--- a/libavformat/bink.c
+++ b/libavformat/bink.c
@@ -233,7 +233,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
return ret;
pkt->stream_index = 0;
pkt->pts = bink->video_pts++;
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
/* -1 instructs the next call to read_packet() to read the next frame */
bink->current_track = -1;
diff --git a/libavformat/c93.c b/libavformat/c93.c
index cd3d36a1600c6cba555b2dd9b04d2eeffda3e4a1..033b36bd250f2715f44ee198ec29739c22c72e96 100644
--- a/libavformat/c93.c
+++ b/libavformat/c93.c
@@ -126,7 +126,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
ret = voc_get_packet(s, pkt, c93->audio, datasize - 26);
if (ret > 0) {
pkt->stream_index = 1;
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
return ret;
}
}
@@ -182,7 +182,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
/* only the first frame is guaranteed to not reference previous frames */
if (c93->current_block == 0 && c93->current_frame == 0) {
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
pkt->data[0] |= C93_FIRST_FRAME;
}
return 0;
diff --git a/libavformat/dv.c b/libavformat/dv.c
index f30f2ae1b9b709da6ebc59b40f837f49f920c310..b6f9c6ae542fbe38ffaa6fcc11cf5fd935a0f493 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -221,7 +221,7 @@ static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame)
c->audio_pkt[i].size = 0;
c->audio_pkt[i].data = c->audio_buf[i];
c->audio_pkt[i].stream_index = c->ast[i]->index;
- c->audio_pkt[i].flags |= PKT_FLAG_KEY;
+ c->audio_pkt[i].flags |= AV_PKT_FLAG_KEY;
}
c->ast[i]->codec->sample_rate = dv_audio_frequency[freq];
c->ast[i]->codec->channels = 2;
@@ -355,7 +355,7 @@ int dv_produce_packet(DVDemuxContext *c, AVPacket *pkt,
av_init_packet(pkt);
pkt->data = buf;
pkt->size = size;
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
pkt->stream_index = c->vst->id;
pkt->pts = c->frames;
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index fd05870f0d5e9dd69189adb206103db5ad88ed76..afc22728677104f06f6b9bc3900afd2b803ae78f 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -520,7 +520,7 @@ static int ea_read_packet(AVFormatContext *s,
case pQGT_TAG:
case TGQs_TAG:
case MADk_TAG:
- key = PKT_FLAG_KEY;
+ key = AV_PKT_FLAG_KEY;
case MVIf_TAG:
case fVGT_TAG:
case MADm_TAG:
@@ -537,7 +537,7 @@ static int ea_read_packet(AVFormatContext *s,
case MV0K_TAG:
case MPCh_TAG:
case pIQT_TAG:
- key = PKT_FLAG_KEY;
+ key = AV_PKT_FLAG_KEY;
case MV0F_TAG:
get_video_packet:
ret = av_get_packet(pb, pkt, chunk_size);
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 3f0911fa1e0b5c46e5a85b4e77b960f2e9608896..b2a4bc20fb3bfa41b30e0b797f2119c075c1155e 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -432,7 +432,7 @@ static int ffm_read_packet(AVFormatContext *s, AVPacket *pkt)
}
pkt->pos = url_ftell(s->pb);
if (ffm->header[1] & FLAG_KEY_FRAME)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
ffm->read_state = READ_HEADER;
if (ffm_read_data(s, pkt->data, size, 0) != size) {
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c
index b9e62aa197f64cf729663fe383bd90c4b14a65c0..c5c59db71173a789e8fb7002240fb49a0c42d68b 100644
--- a/libavformat/ffmenc.c
+++ b/libavformat/ffmenc.c
@@ -210,7 +210,7 @@ static int ffm_write_packet(AVFormatContext *s, AVPacket *pkt)
/* packet size & key_frame */
header[0] = pkt->stream_index;
header[1] = 0;
- if (pkt->flags & PKT_FLAG_KEY)
+ if (pkt->flags & AV_PKT_FLAG_KEY)
header[1] |= FLAG_KEY_FRAME;
AV_WB24(header+2, pkt->size);
AV_WB24(header+5, pkt->duration);
diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c
index 2fa658b4f0aa7418ca18f01b40efb551fe889103..0975025ebc49481c41ecd90242828c212c880c28 100644
--- a/libavformat/filmstripdec.c
+++ b/libavformat/filmstripdec.c
@@ -87,7 +87,7 @@ static int read_packet(AVFormatContext *s,
url_fskip(s->pb, st->codec->width * film->leading * 4);
if (pkt->size < 0)
return pkt->size;
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
return 0;
}
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index fc51594f6f229ffbd348259483349fefa54894a5..3481885e0dc84257b3d0a443454d7172c7ecd885 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -437,7 +437,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->stream_index = st->index;
if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY))
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
return ret;
}
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 9b687375308b557f434d9f2c2c36d3fa1d5b9383..c3511171323a250d423473021035e1808339089c 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -351,7 +351,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
return -1;
}
- flags |= pkt->flags & PKT_FLAG_KEY ? FLV_FRAME_KEY : FLV_FRAME_INTER;
+ flags |= pkt->flags & AV_PKT_FLAG_KEY ? FLV_FRAME_KEY : FLV_FRAME_INTER;
} else {
assert(enc->codec_type == AVMEDIA_TYPE_AUDIO);
flags = get_audio_flags(enc);
diff --git a/libavformat/iff.c b/libavformat/iff.c
index 6dcd686b806247e5fc90266789b9d17560b5acd7..d473d3db9158cf2a823ff1712446d8335ae30bb8 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -263,7 +263,7 @@ static int iff_read_packet(AVFormatContext *s,
}
if(iff->sent_bytes == 0)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
if(s->streams[0]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
iff->sent_bytes += PACKET_SIZE;
diff --git a/libavformat/img2.c b/libavformat/img2.c
index a531967d81b3e0bb475be0dc1b62c93b8ee7a3cc..85bee971c7c8647bec669f866e2cdc0782fc2cdf 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -292,7 +292,7 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
av_new_packet(pkt, size[0] + size[1] + size[2]);
pkt->stream_index = 0;
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
pkt->size= 0;
for(i=0; i<3; i++){
diff --git a/libavformat/libnut.c b/libavformat/libnut.c
index 365a5452349e9ab729b015b1677eb3d3e0a6f08b..d1e86d45d09cf8682d9e2fa8b01aede0cc32c891 100644
--- a/libavformat/libnut.c
+++ b/libavformat/libnut.c
@@ -128,7 +128,7 @@ static int nut_write_packet(AVFormatContext * avf, AVPacket * pkt) {
p.len = pkt->size;
p.stream = pkt->stream_index;
p.pts = pkt->pts;
- p.flags = pkt->flags & PKT_FLAG_KEY ? NUT_FLAG_KEY : 0;
+ p.flags = pkt->flags & AV_PKT_FLAG_KEY ? NUT_FLAG_KEY : 0;
p.next_pts = 0;
nut_write_frame_reorder(priv->nut, &p, pkt->data);
@@ -269,7 +269,7 @@ static int nut_read_packet(AVFormatContext * avf, AVPacket * pkt) {
return -1;
}
- if (pd.flags & NUT_FLAG_KEY) pkt->flags |= PKT_FLAG_KEY;
+ if (pd.flags & NUT_FLAG_KEY) pkt->flags |= AV_PKT_FLAG_KEY;
pkt->pts = pd.pts;
pkt->stream_index = pd.stream;
pkt->pos = url_ftell(avf->pb);
diff --git a/libavformat/lmlm4.c b/libavformat/lmlm4.c
index be606e827ee195fccd768617de25262dd7374863..c1397fbb450033c680b2253237fd4201bcf43fa8 100644
--- a/libavformat/lmlm4.c
+++ b/libavformat/lmlm4.c
@@ -104,7 +104,7 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) {
switch (frame_type) {
case LMLM4_I_FRAME:
- pkt->flags = PKT_FLAG_KEY;
+ pkt->flags = AV_PKT_FLAG_KEY;
case LMLM4_P_FRAME:
case LMLM4_B_FRAME:
pkt->stream_index = 0;
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 01c2c7cabe51302b7efe92191b1420d8e1413bf4..8a4ae4e4461802b8a9d60f34938187ea6036d378 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1547,7 +1547,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
flags = *data++;
size -= 3;
if (is_keyframe == -1)
- is_keyframe = flags & 0x80 ? PKT_FLAG_KEY : 0;
+ is_keyframe = flags & 0x80 ? AV_PKT_FLAG_KEY : 0;
if (cluster_time != (uint64_t)-1
&& (block_time >= 0 || cluster_time >= -block_time)) {
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 32fc4bc82ff5e11929950e711614fead6a8901c0..76c74173c5046ea6af074757b9d4630d70ca5697 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -866,7 +866,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
MatroskaMuxContext *mkv = s->priv_data;
ByteIOContext *pb = s->pb;
AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
- int keyframe = !!(pkt->flags & PKT_FLAG_KEY);
+ int keyframe = !!(pkt->flags & AV_PKT_FLAG_KEY);
int duration = pkt->duration;
int ret;
int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 59baa0d6c3008db88fb2957d94a05fe301875f02..0f03da1eb722d5c2cb668d384465b7a8ce230fb7 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2344,7 +2344,7 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
}
if (st->discard == AVDISCARD_ALL)
goto retry;
- pkt->flags |= sample->flags & AVINDEX_KEYFRAME ? PKT_FLAG_KEY : 0;
+ pkt->flags |= sample->flags & AVINDEX_KEYFRAME ? AV_PKT_FLAG_KEY : 0;
pkt->pos = sample->pos;
dprintf(s, "stream %d, pts %"PRId64", dts %"PRId64", pos 0x%"PRIx64", duration %d\n",
pkt->stream_index, pkt->pts, pkt->dts, pkt->pos, pkt->duration);
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index f5c344f7abf0b2ecbc78f915d299dded7f560e2c..a8141ff0dbfab75e124bae1c96c68e2f1dabb5ce 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1987,7 +1987,7 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
trk->flags |= MOV_TRACK_CTTS;
trk->cluster[trk->entry].cts = pkt->pts - pkt->dts;
trk->cluster[trk->entry].flags = 0;
- if (pkt->flags & PKT_FLAG_KEY) {
+ if (pkt->flags & AV_PKT_FLAG_KEY) {
if (mov->mode == MODE_MOV && enc->codec_id == CODEC_ID_MPEG2VIDEO) {
mov_parse_mpeg2_frame(pkt, &trk->cluster[trk->entry].flags);
if (trk->cluster[trk->entry].flags & MOV_PARTIAL_SYNC_SAMPLE)
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 32a3858f565a796250d504e47a456ff592ff619b..b37a7742952a06bf780fdeb745e21a5623947820 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -1156,7 +1156,7 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt)
int64_t pts, dts;
PacketDesc *pkt_desc;
const int preload= av_rescale(ctx->preload, 90000, AV_TIME_BASE);
- const int is_iframe = st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (pkt->flags & PKT_FLAG_KEY);
+ const int is_iframe = st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (pkt->flags & AV_PKT_FLAG_KEY);
pts= pkt->pts;
dts= pkt->dts;
diff --git a/libavformat/msnwc_tcp.c b/libavformat/msnwc_tcp.c
index 49b8297a4f8f96a3607f50497cac9c3ff701909b..5b498e925eae4d9f11a19c950565a2a820438fb2 100644
--- a/libavformat/msnwc_tcp.c
+++ b/libavformat/msnwc_tcp.c
@@ -125,7 +125,7 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt)
/* Some aMsn generated videos (or was it Mercury Messenger?) don't set
* this bit and rely on the codec to get keyframe information */
if(keyframe&1)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
return HEADER_SIZE + size;
}
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 1c58cd6c3b6691a3fa54cf7befcea3e2026f8cd8..b7e6ba28c626bd833cfb217bf7e89badd3029e23 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -620,7 +620,7 @@ null_chunk_retry:
av_get_packet(pb, pkt, vsize);
pkt->stream_index = st[NSV_ST_VIDEO]->index;//NSV_ST_VIDEO;
pkt->dts = nst->frame_offset;
- pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */
+ pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? AV_PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */
/*
for (i = 0; i < MIN(8, vsize); i++)
PRINT(("NSV video: [%d] = %02x\n", i, pkt->data[i]));
@@ -660,7 +660,7 @@ null_chunk_retry:
}
av_get_packet(pb, pkt, asize);
pkt->stream_index = st[NSV_ST_AUDIO]->index;//NSV_ST_AUDIO;
- pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */
+ pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? AV_PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */
if( nsv->state == NSV_HAS_READ_NSVS && st[NSV_ST_VIDEO] ) {
/* on a nsvs frame we have new information on a/v sync */
pkt->dts = (((NSVStream*)st[NSV_ST_VIDEO]->priv_data)->frame_offset-1);
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 7b934c50c66cd08988b0bf1bd67dc051d67caec1..39f185eb7a7ac433afea188e8d615ba4f890d360 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -754,7 +754,7 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code){
pkt->stream_index = stream_id;
if (stc->last_flags & FLAG_KEY)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
pkt->pts = pts;
return 0;
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 28eac127ecb2d27c2db16bac0bf1d8dbb4bdb46c..dfda3cae88527837f647a910b59ba5819d6b5650 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -603,7 +603,7 @@ static int write_header(AVFormatContext *s){
static int get_needed_flags(NUTContext *nut, StreamContext *nus, FrameCode *fc, AVPacket *pkt){
int flags= 0;
- if(pkt->flags & PKT_FLAG_KEY ) flags |= FLAG_KEY;
+ if(pkt->flags & AV_PKT_FLAG_KEY ) flags |= FLAG_KEY;
if(pkt->stream_index != fc->stream_id ) flags |= FLAG_STREAM_ID;
if(pkt->size / fc->size_mul ) flags |= FLAG_SIZE_MSB;
if(pkt->pts - nus->last_pts != fc->pts_delta) flags |= FLAG_CODED_PTS;
@@ -644,7 +644,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt){
FrameCode *fc;
int64_t coded_pts;
int best_length, frame_code, flags, needed_flags, i, header_idx, best_header_idx;
- int key_frame = !!(pkt->flags & PKT_FLAG_KEY);
+ int key_frame = !!(pkt->flags & AV_PKT_FLAG_KEY);
int store_sp=0;
int ret;
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index 940bb03df2a68f1af52d6c764a0c0ccd6991c356..f0eacd5f8a7daffc27935bb12fcdb0a690302e5c 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -220,7 +220,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
return ret;
// HACK: we have no idea if it is a keyframe,
// but if we mark none seeking will not work at all.
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
pkt->pos = pos;
pkt->pts = AV_RL32(&hdr[4]);
pkt->stream_index = ctx->v_id;
@@ -240,7 +240,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
break;
}
ret = av_get_packet(pb, pkt, size);
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
pkt->pos = pos;
pkt->pts = AV_RL32(&hdr[4]);
pkt->stream_index = ctx->a_id;
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index ed90832c149f031ac9298370b5f4f133877c0637..0dfb3d7321d185bb3b36c2b45de0991270892533 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -544,7 +544,7 @@ retry:
// pflags might not be set until after this
pts = ogg_calc_pts(s, idx, &dts);
- if (os->keyframe_seek && !(os->pflags & PKT_FLAG_KEY))
+ if (os->keyframe_seek && !(os->pflags & AV_PKT_FLAG_KEY))
goto retry;
os->keyframe_seek = 0;
@@ -594,7 +594,7 @@ ogg_read_timestamp (AVFormatContext * s, int stream_index, int64_t * pos_arg,
while (url_ftell(bc) < pos_limit && !ogg_packet(s, &i, NULL, NULL, pos_arg)) {
if (i == stream_index) {
pts = ogg_calc_pts(s, i, NULL);
- if (os->keyframe_seek && !(os->pflags & PKT_FLAG_KEY))
+ if (os->keyframe_seek && !(os->pflags & AV_PKT_FLAG_KEY))
pts = AV_NOPTS_VALUE;
}
if (pts != AV_NOPTS_VALUE)
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 6944b3c0699d2e7d8ab2b57346e6ec5884749398..10fe20d04c4c35aedeebb244fab7b82c6d9fc028 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -256,7 +256,7 @@ static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt)
if (st->codec->codec_id == CODEC_ID_THEORA) {
int64_t pts = oggstream->vrev < 1 ? pkt->pts : pkt->pts + pkt->duration;
int pframe_count;
- if (pkt->flags & PKT_FLAG_KEY)
+ if (pkt->flags & AV_PKT_FLAG_KEY)
oggstream->last_kf_pts = pts;
pframe_count = pts - oggstream->last_kf_pts;
// prevent frame count from overflow if key frame flag is not set
diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c
index 132087790026f518d230d3c03b7ee7fc56671f99..a7f0401f29aed72ab79a9cfb8ce66f5ff0f798d1 100644
--- a/libavformat/oggparsedirac.c
+++ b/libavformat/oggparsedirac.c
@@ -59,7 +59,7 @@ static uint64_t dirac_gptopts(AVFormatContext *s, int idx, uint64_t granule,
int64_t pts = dts + ((gp >> 9) & 0x1fff);
if (!dist)
- os->pflags |= PKT_FLAG_KEY;
+ os->pflags |= AV_PKT_FLAG_KEY;
if (dts_out)
*dts_out = dts;
@@ -93,7 +93,7 @@ static uint64_t old_dirac_gptopts(AVFormatContext *s, int idx, uint64_t gp,
uint64_t pframe = gp & 0x3fffffff;
if (!pframe)
- os->pflags |= PKT_FLAG_KEY;
+ os->pflags |= AV_PKT_FLAG_KEY;
return iframe + pframe;
}
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index 25722f3b0e1f935217c758d364ab7048f94d9260..e1d046f28ff4cea9c2d0904bfbba8f9a16827e23 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -143,7 +143,7 @@ ogm_packet(AVFormatContext *s, int idx)
int lb;
if(*p & 8)
- os->pflags |= PKT_FLAG_KEY;
+ os->pflags |= AV_PKT_FLAG_KEY;
lb = ((*p & 2) << 1) | ((*p >> 6) & 3);
os->pstart += lb + 1;
diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c
index 8c1b1c5b40fce42811909d7a34483d2978238d3a..2299f5507c1b11f505b633e9acf54f463193e3b7 100644
--- a/libavformat/oggparsetheora.c
+++ b/libavformat/oggparsetheora.c
@@ -136,7 +136,7 @@ theora_gptopts(AVFormatContext *ctx, int idx, uint64_t gp, int64_t *dts)
iframe++;
if(!pframe)
- os->pflags |= PKT_FLAG_KEY;
+ os->pflags |= AV_PKT_FLAG_KEY;
if (dts)
*dts = iframe + pframe;
diff --git a/libavformat/output-example.c b/libavformat/output-example.c
index fc070b736c74642baa9d7e31ebcc8dcd9585e2f2..dd61cfe088ed59d401b626e51a82839eb6a326bf 100644
--- a/libavformat/output-example.c
+++ b/libavformat/output-example.c
@@ -159,7 +159,7 @@ static void write_audio_frame(AVFormatContext *oc, AVStream *st)
if (c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE)
pkt.pts= av_rescale_q(c->coded_frame->pts, c->time_base, st->time_base);
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
pkt.stream_index= st->index;
pkt.data= audio_outbuf;
@@ -368,7 +368,7 @@ static void write_video_frame(AVFormatContext *oc, AVStream *st)
AVPacket pkt;
av_init_packet(&pkt);
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
pkt.stream_index= st->index;
pkt.data= (uint8_t *)picture;
pkt.size= sizeof(AVPicture);
@@ -385,7 +385,7 @@ static void write_video_frame(AVFormatContext *oc, AVStream *st)
if (c->coded_frame->pts != AV_NOPTS_VALUE)
pkt.pts= av_rescale_q(c->coded_frame->pts, c->time_base, st->time_base);
if(c->coded_frame->key_frame)
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
pkt.stream_index= st->index;
pkt.data= video_outbuf;
pkt.size= out_size;
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 7f0db866d92f1a7698d30fba51be6d94235738ab..eb58d66640d91db85cb409c4ffb614869f02c75f 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -804,7 +804,7 @@ ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb,
pkt->pts= timestamp;
if (flags & 2)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
return st->codec->codec_type == AVMEDIA_TYPE_AUDIO ? rm->audio_pkt_cnt : 0;
}
@@ -828,7 +828,7 @@ ff_rm_retrieve_cache (AVFormatContext *s, ByteIOContext *pb,
rm->audio_pkt_cnt--;
if ((pkt->pts = ast->audiotimestamp) != AV_NOPTS_VALUE) {
ast->audiotimestamp = AV_NOPTS_VALUE;
- pkt->flags = PKT_FLAG_KEY;
+ pkt->flags = AV_PKT_FLAG_KEY;
} else
pkt->flags = 0;
pkt->stream_index = st->index;
diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c
index 9dbe3d08dccf8d9736569175db979d1457a04956..03db3ce5b8961e21ac9887a6ee97b225758dee45 100644
--- a/libavformat/rmenc.c
+++ b/libavformat/rmenc.c
@@ -346,7 +346,7 @@ static int rm_write_audio(AVFormatContext *s, const uint8_t *buf, int size, int
/* XXX: suppress this malloc */
buf1= (uint8_t*) av_malloc( size * sizeof(uint8_t) );
- write_packet_header(s, stream, size, !!(flags & PKT_FLAG_KEY));
+ write_packet_header(s, stream, size, !!(flags & AV_PKT_FLAG_KEY));
/* for AC-3, the words seem to be reversed */
for(i=0;i<size;i+=2) {
@@ -365,7 +365,7 @@ static int rm_write_video(AVFormatContext *s, const uint8_t *buf, int size, int
RMMuxContext *rm = s->priv_data;
ByteIOContext *pb = s->pb;
StreamInfo *stream = rm->video_stream;
- int key_frame = !!(flags & PKT_FLAG_KEY);
+ int key_frame = !!(flags & AV_PKT_FLAG_KEY);
/* XXX: this is incorrect: should be a parameter */
diff --git a/libavformat/rpl.c b/libavformat/rpl.c
index 41c1687745e6c4feb58c82848be5bc504cbdbd56..b33d865b7e9135142e385dbde01b38ed2375e456 100644
--- a/libavformat/rpl.c
+++ b/libavformat/rpl.c
@@ -344,7 +344,7 @@ static int rpl_read_packet(AVFormatContext *s, AVPacket *pkt)
// None of the Escape formats have keyframes, and the ADPCM
// format used doesn't have keyframes.
if (rpl->chunk_number == 0 && rpl->frame_in_part == 0)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
return ret;
}
diff --git a/libavformat/seek.c b/libavformat/seek.c
index a2900b46e0c84a01216cbeda859a4ee73316d9a0..26b622f035aeeb35371508de9f475905b9fb0eee 100644
--- a/libavformat/seek.c
+++ b/libavformat/seek.c
@@ -162,7 +162,7 @@ static void search_hi_lo_keyframes(AVFormatContext *s,
// Evaluate key frames with known TS (or any frames, if AVSEEK_FLAG_ANY set).
if (pts != AV_NOPTS_VALUE &&
- ((flg & PKT_FLAG_KEY) || (flags & AVSEEK_FLAG_ANY))) {
+ ((flg & AV_PKT_FLAG_KEY) || (flags & AVSEEK_FLAG_ANY))) {
if (flags & AVSEEK_FLAG_BYTE) {
// for byte seeking, use position as timestamp
ts = pos;
diff --git a/libavformat/siff.c b/libavformat/siff.c
index fcf736fd27f2db947a6c0fe7204ef12b63d3c4a6..3a0b9bb377a5c0860898776902053c9e7588d89f 100644
--- a/libavformat/siff.c
+++ b/libavformat/siff.c
@@ -216,7 +216,7 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
c->curstrm = 0;
}
if(!c->cur_frame || c->curstrm)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
if (c->curstrm == -1)
c->cur_frame++;
}else{
diff --git a/libavformat/tmv.c b/libavformat/tmv.c
index cec6f99148e2fbaa66a1ac72348e8d6b29594fa5..939b65d6cca925bdd7e5fd59e1ccaf04d06e0771 100644
--- a/libavformat/tmv.c
+++ b/libavformat/tmv.c
@@ -156,7 +156,7 @@ static int tmv_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->stream_index = tmv->stream_index;
tmv->stream_index ^= 1;
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
return ret;
}
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 23731a8e6b32d8bfb93826b24fd7c5345ad5281b..9b83fdd355e3ae79b2fcbb7544daf1fefab8c64d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -986,14 +986,14 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
/* update flags */
if(is_intra_only(st->codec))
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
else if (pc) {
pkt->flags = 0;
/* keyframe computation */
if (pc->key_frame == 1)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
else if (pc->key_frame == -1 && pc->pict_type == FF_I_TYPE)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
}
if (pc)
pkt->convergence_duration = pc->convergence_duration;
@@ -1018,7 +1018,7 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
compute_pkt_fields(s, st, NULL, pkt);
s->cur_st = NULL;
if ((s->iformat->flags & AVFMT_GENERIC_INDEX) &&
- (pkt->flags & PKT_FLAG_KEY) && pkt->dts != AV_NOPTS_VALUE) {
+ (pkt->flags & AV_PKT_FLAG_KEY) && pkt->dts != AV_NOPTS_VALUE) {
ff_reduce_index(s, st->index);
av_add_index_entry(st, pkt->pos, pkt->dts, 0, 0, AVINDEX_KEYFRAME);
}
@@ -1045,7 +1045,7 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
pkt->destruct = NULL;
compute_pkt_fields(s, st, st->parser, pkt);
- if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & PKT_FLAG_KEY){
+ if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & AV_PKT_FLAG_KEY){
ff_reduce_index(s, st->index);
av_add_index_entry(st, st->parser->frame_offset, pkt->dts,
0, 0, AVINDEX_KEYFRAME);
@@ -1621,7 +1621,7 @@ static int av_seek_frame_generic(AVFormatContext *s,
break;
av_free_packet(&pkt);
if(stream_index == pkt.stream_index){
- if((pkt.flags & PKT_FLAG_KEY) && pkt.dts > timestamp)
+ if((pkt.flags & AV_PKT_FLAG_KEY) && pkt.dts > timestamp)
break;
}
}
@@ -3381,7 +3381,7 @@ static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt, int
#undef fprintf
#define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
PRINT("stream #%d:\n", pkt->stream_index);
- PRINT(" keyframe=%d\n", ((pkt->flags & PKT_FLAG_KEY) != 0));
+ PRINT(" keyframe=%d\n", ((pkt->flags & AV_PKT_FLAG_KEY) != 0));
PRINT(" duration=%0.3f\n", (double)pkt->duration / AV_TIME_BASE);
/* DTS is _always_ valid after av_read_frame() */
PRINT(" dts=");
diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c
index d47fe6af3287d4c688e9002926521875161fa5f7..4e261ad5d9e1ad608a580e42cb42229a34ce539e 100644
--- a/libavformat/vc1test.c
+++ b/libavformat/vc1test.c
@@ -103,7 +103,7 @@ static int vc1t_read_packet(AVFormatContext *s,
return AVERROR(EIO);
if(s->streams[0]->time_base.den == 1000)
pkt->pts = pts;
- pkt->flags |= keyframe ? PKT_FLAG_KEY : 0;
+ pkt->flags |= keyframe ? AV_PKT_FLAG_KEY : 0;
pkt->pos -= 8;
return pkt->size;
diff --git a/libavformat/vc1testenc.c b/libavformat/vc1testenc.c
index c871da9d0bd8217117fed5fb1e0d9f4caa50d0c9..b4b1e024dca4f4f9bedfb2ec51ffb006ff560d3f 100644
--- a/libavformat/vc1testenc.c
+++ b/libavformat/vc1testenc.c
@@ -58,7 +58,7 @@ static int vc1test_write_packet(AVFormatContext *s, AVPacket *pkt)
if (!pkt->size)
return 0;
- put_le32(pb, pkt->size | ((pkt->flags & PKT_FLAG_KEY) ? 0x80000000 : 0));
+ put_le32(pb, pkt->size | ((pkt->flags & AV_PKT_FLAG_KEY) ? 0x80000000 : 0));
put_le32(pb, pkt->pts);
put_buffer(pb, pkt->data, pkt->size);
put_flush_packet(pb);
diff --git a/libavformat/yop.c b/libavformat/yop.c
index 9c0e5822b55ec320bd246f6c349f5616ebe258ba..4fa2df13e3e3841f42a95d1fa059c6e38c4b14de 100644
--- a/libavformat/yop.c
+++ b/libavformat/yop.c
@@ -127,7 +127,7 @@ static int yop_read_packet(AVFormatContext *s, AVPacket *pkt)
yop->video_packet.data = NULL;
yop->video_packet.size = 0;
pkt->data[0] = yop->odd_frame;
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
yop->odd_frame ^= 1;
return pkt->size;
}
diff --git a/tools/pktdumper.c b/tools/pktdumper.c
index f7ac83d5f68c59933de9c17bd6eb90fe1d73a375..ee60414060468e06a954163068aa44aa22cec383 100644
--- a/tools/pktdumper.c
+++ b/tools/pktdumper.c
@@ -99,8 +99,8 @@ int main(int argc, char **argv)
while ((err = av_read_frame(fctx, &pkt)) >= 0) {
int fd;
- snprintf(pktfilename, PATH_MAX-1, fntemplate, pktnum, pkt.stream_index, pkt.pts, pkt.size, (pkt.flags & PKT_FLAG_KEY)?'K':'_');
- printf(PKTFILESUFF"\n", pktnum, pkt.stream_index, pkt.pts, pkt.size, (pkt.flags & PKT_FLAG_KEY)?'K':'_');
+ snprintf(pktfilename, PATH_MAX-1, fntemplate, pktnum, pkt.stream_index, pkt.pts, pkt.size, (pkt.flags & AV_PKT_FLAG_KEY)?'K':'_');
+ printf(PKTFILESUFF"\n", pktnum, pkt.stream_index, pkt.pts, pkt.size, (pkt.flags & AV_PKT_FLAG_KEY)?'K':'_');
//printf("open(\"%s\")\n", pktfilename);
if (!nowrite) {
fd = open(pktfilename, O_WRONLY|O_CREAT, 0644);