diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-29 18:53:57 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-05-02 12:18:44 +0200 |
| commit | 975a1447f76e8d30fc01e6ea5466c84faf3d76e4 (patch) | |
| tree | d462ee5cc7a2f59c44f797c97fc237c999c94e55 /libavformat/utils.c | |
| parent | 6209669de4a0aa056ae05b0a2c78eaf2ca489b23 (diff) | |
| download | ffmpeg-975a1447f76e8d30fc01e6ea5466c84faf3d76e4.tar.gz | |
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 79e70f943e..425b4b3e68 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -868,7 +868,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, if((s->flags & AVFMT_FLAG_IGNDTS) && pkt->pts != AV_NOPTS_VALUE) pkt->dts= AV_NOPTS_VALUE; - if (st->codec->codec_id != CODEC_ID_H264 && pc && pc->pict_type == FF_B_TYPE) + if (st->codec->codec_id != CODEC_ID_H264 && pc && pc->pict_type == AV_PICTURE_TYPE_B) //FIXME Set low_delay = 0 when has_b_frames = 1 st->codec->has_b_frames = 1; @@ -884,7 +884,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, /* XXX: need has_b_frame, but cannot get it if the codec is not initialized */ if (delay && - pc && pc->pict_type != FF_B_TYPE) + pc && pc->pict_type != AV_PICTURE_TYPE_B) presentation_delayed = 1; if(pkt->pts != AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && pkt->dts > pkt->pts && st->pts_wrap_bits<63 @@ -1012,7 +1012,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, /* keyframe computation */ if (pc->key_frame == 1) pkt->flags |= AV_PKT_FLAG_KEY; - else if (pc->key_frame == -1 && pc->pict_type == FF_I_TYPE) + else if (pc->key_frame == -1 && pc->pict_type == AV_PICTURE_TYPE_I) pkt->flags |= AV_PKT_FLAG_KEY; } if (pc) |