diff options
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r-- | libavcodec/mpeg12.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 4683f011db..953cd5ec94 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1192,61 +1192,61 @@ static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm, } } -static const enum PixelFormat mpeg1_hwaccel_pixfmt_list_420[] = { +static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = { #if CONFIG_MPEG_XVMC_DECODER - PIX_FMT_XVMC_MPEG2_IDCT, - PIX_FMT_XVMC_MPEG2_MC, + AV_PIX_FMT_XVMC_MPEG2_IDCT, + AV_PIX_FMT_XVMC_MPEG2_MC, #endif #if CONFIG_MPEG1_VDPAU_HWACCEL - PIX_FMT_VDPAU_MPEG1, + AV_PIX_FMT_VDPAU_MPEG1, #endif - PIX_FMT_YUV420P, - PIX_FMT_NONE + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE }; -static const enum PixelFormat mpeg2_hwaccel_pixfmt_list_420[] = { +static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = { #if CONFIG_MPEG_XVMC_DECODER - PIX_FMT_XVMC_MPEG2_IDCT, - PIX_FMT_XVMC_MPEG2_MC, + AV_PIX_FMT_XVMC_MPEG2_IDCT, + AV_PIX_FMT_XVMC_MPEG2_MC, #endif #if CONFIG_MPEG2_VDPAU_HWACCEL - PIX_FMT_VDPAU_MPEG2, + AV_PIX_FMT_VDPAU_MPEG2, #endif #if CONFIG_MPEG2_DXVA2_HWACCEL - PIX_FMT_DXVA2_VLD, + AV_PIX_FMT_DXVA2_VLD, #endif #if CONFIG_MPEG2_VAAPI_HWACCEL - PIX_FMT_VAAPI_VLD, + AV_PIX_FMT_VAAPI_VLD, #endif - PIX_FMT_YUV420P, - PIX_FMT_NONE + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE }; static inline int uses_vdpau(AVCodecContext *avctx) { - return avctx->pix_fmt == PIX_FMT_VDPAU_MPEG1 || avctx->pix_fmt == PIX_FMT_VDPAU_MPEG2; + return avctx->pix_fmt == AV_PIX_FMT_VDPAU_MPEG1 || avctx->pix_fmt == AV_PIX_FMT_VDPAU_MPEG2; } -static enum PixelFormat mpeg_get_pixelformat(AVCodecContext *avctx) +static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx) { Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; if(s->chroma_format < 2) { - enum PixelFormat res; + enum AVPixelFormat res; res = avctx->get_format(avctx, avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO ? mpeg1_hwaccel_pixfmt_list_420 : mpeg2_hwaccel_pixfmt_list_420); - if (res != PIX_FMT_XVMC_MPEG2_IDCT && res != PIX_FMT_XVMC_MPEG2_MC) { + if (res != AV_PIX_FMT_XVMC_MPEG2_IDCT && res != AV_PIX_FMT_XVMC_MPEG2_MC) { avctx->xvmc_acceleration = 0; } else if (!avctx->xvmc_acceleration) { avctx->xvmc_acceleration = 2; } return res; } else if(s->chroma_format == 2) - return PIX_FMT_YUV422P; + return AV_PIX_FMT_YUV422P; else - return PIX_FMT_YUV444P; + return AV_PIX_FMT_YUV444P; } /* Call this function when we know all parameters. @@ -1340,7 +1340,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) avctx->pix_fmt = mpeg_get_pixelformat(avctx); avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt); // until then pix_fmt may be changed right after codec init - if (avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT || + if (avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT || avctx->hwaccel ) if (avctx->idct_algo == FF_IDCT_AUTO) avctx->idct_algo = FF_IDCT_SIMPLE; @@ -2078,7 +2078,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx) avctx->pix_fmt = mpeg_get_pixelformat(avctx); avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt); - if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT || avctx->hwaccel ) + if( avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT || avctx->hwaccel ) if (avctx->idct_algo == FF_IDCT_AUTO) avctx->idct_algo = FF_IDCT_SIMPLE; @@ -2655,7 +2655,7 @@ static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx) } mpeg_decode_init(avctx); - avctx->pix_fmt = PIX_FMT_XVMC_MPEG2_IDCT; + avctx->pix_fmt = AV_PIX_FMT_XVMC_MPEG2_IDCT; avctx->xvmc_acceleration = 2; // 2 - the blocks are packed! return 0; |