diff options
author | Jean-Daniel Dupas <devlists@shadowlab.org> | 2010-03-31 16:29:58 +0400 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-03-31 16:29:58 +0400 |
commit | cc947f04cc16033d651fda5aab91e4a3c4b6bd4d (patch) | |
tree | 091c6a7609706f5f4ee0408483830a0f6d01f78a /libavformat | |
parent | 46da7fa133bcce2053d04fbb11ecd66b27a0c81e (diff) |
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
Patch by Jean-Daniel Dupas, devlists shadowlab org
Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
46 files changed, 73 insertions, 73 deletions
diff --git a/libavformat/anm.c b/libavformat/anm.c index 0d28ff4e8f..de59b40675 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 ab96cc4339..c505f92c19 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 f3a368ae3b..9f8d69ac5c 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 173dc0c632..5f8e0b96be 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 a74400f860..c9e657ee85 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 51daf500fe..b4a31ec54a 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 9cdd336c05..caf3a892bb 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 3bb73610ad..9230cfb1e4 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 cd3d36a160..033b36bd25 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 f30f2ae1b9..b6f9c6ae54 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 fd05870f0d..afc2272867 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 3f0911fa1e..b2a4bc20fb 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 b9e62aa197..c5c59db711 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 2fa658b4f0..0975025ebc 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 fc51594f6f..3481885e0d 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 9b68737530..c351117132 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 6dcd686b80..d473d3db91 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 a531967d81..85bee971c7 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 365a545234..d1e86d45d0 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 be606e827e..c1397fbb45 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 01c2c7cabe..8a4ae4e446 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 32fc4bc82f..76c74173c5 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 59baa0d6c3..0f03da1eb7 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 f5c344f7ab..a8141ff0db 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 32a3858f56..b37a774295 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 49b8297a4f..5b498e925e 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 1c58cd6c3b..b7e6ba28c6 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 7b934c50c6..39f185eb7a 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 28eac127ec..dfda3cae88 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 940bb03df2..f0eacd5f8a 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 ed90832c14..0dfb3d7321 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 6944b3c069..10fe20d04c 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 1320877900..a7f0401f29 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 25722f3b0e..e1d046f28f 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 8c1b1c5b40..2299f5507c 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 fc070b736c..dd61cfe088 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 7f0db866d9..eb58d66640 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 9dbe3d08dc..03db3ce5b8 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 41c1687745..b33d865b7e 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 a2900b46e0..26b622f035 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 fcf736fd27..3a0b9bb377 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 cec6f99148..939b65d6cc 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 23731a8e6b..9b83fdd355 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 d47fe6af32..4e261ad5d9 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 c871da9d0b..b4b1e024dc 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 9c0e5822b5..4fa2df13e3 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; } |