Commit 0989a120 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by Luca Barbato

mpeg12: Always invoke the get_format() callback

Signed-off-by: 's avatarLuca Barbato <lu_zero@gentoo.org>
parent c7caed88
...@@ -1177,10 +1177,21 @@ static const enum AVPixelFormat mpeg12_hwaccel_pixfmt_list_420[] = { ...@@ -1177,10 +1177,21 @@ static const enum AVPixelFormat mpeg12_hwaccel_pixfmt_list_420[] = {
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
static const enum AVPixelFormat mpeg12_pixfmt_list_422[] = {
AV_PIX_FMT_YUV422P,
AV_PIX_FMT_NONE
};
static const enum AVPixelFormat mpeg12_pixfmt_list_444[] = {
AV_PIX_FMT_YUV444P,
AV_PIX_FMT_NONE
};
static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx) static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx)
{ {
Mpeg1Context *s1 = avctx->priv_data; Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx; MpegEncContext *s = &s1->mpeg_enc_ctx;
const enum AVPixelFormat *pix_fmts;
#if FF_API_XVMC #if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
...@@ -1190,11 +1201,13 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -1190,11 +1201,13 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */ #endif /* FF_API_XVMC */
if (s->chroma_format < 2) if (s->chroma_format < 2)
return avctx->get_format(avctx, mpeg12_hwaccel_pixfmt_list_420); pix_fmts = mpeg12_hwaccel_pixfmt_list_420;
else if (s->chroma_format == 2) else if (s->chroma_format == 2)
return AV_PIX_FMT_YUV422P; pix_fmts = mpeg12_pixfmt_list_422;
else else
return AV_PIX_FMT_YUV444P; pix_fmts = mpeg12_pixfmt_list_444;
return avctx->get_format(avctx, pix_fmts);
} }
/* Call this function when we know all parameters. /* Call this function when we know all parameters.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment