From 716d413c13981da15323c7a3821860536eefdbbb Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 6 Oct 2012 12:10:34 +0200 Subject: Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat --- libavcodec/vp3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/vp3.c') diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 1f5f6c8982..90532cbe54 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1673,8 +1673,8 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) s->avctx = avctx; s->width = FFALIGN(avctx->width, 16); s->height = FFALIGN(avctx->height, 16); - if (avctx->pix_fmt == PIX_FMT_NONE) - avctx->pix_fmt = PIX_FMT_YUV420P; + if (avctx->pix_fmt == AV_PIX_FMT_NONE) + avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; ff_dsputil_init(&s->dsp, avctx); ff_vp3dsp_init(&s->vp3dsp, avctx->flags); @@ -2115,8 +2115,8 @@ static int vp3_init_thread_copy(AVCodecContext *avctx) } #if CONFIG_THEORA_DECODER -static const enum PixelFormat theora_pix_fmts[4] = { - PIX_FMT_YUV420P, PIX_FMT_NONE, PIX_FMT_YUV422P, PIX_FMT_YUV444P +static const enum AVPixelFormat theora_pix_fmts[4] = { + AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P }; static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) -- cgit v1.2.3