diff options
| author | Jean-Daniel Dupas <devlists@shadowlab.org> | 2010-03-31 12:29:58 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-03-31 12:29:58 +0000 |
| commit | cc947f04cc16033d651fda5aab91e4a3c4b6bd4d (patch) | |
| tree | 091c6a7609706f5f4ee0408483830a0f6d01f78a /libavformat/avidec.c | |
| parent | 46da7fa133bcce2053d04fbb11ecd66b27a0c81e (diff) | |
| download | ffmpeg-cc947f04cc16033d651fda5aab91e4a3c4b6bd4d.tar.gz | |
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/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 8 |
1 files changed, 4 insertions, 4 deletions
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++; |