RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-15 19:55:08 +00:00
Code Issues Projects Releases Wiki Activity

mpeg12: Always invoke the get_format() callback

Browse Source 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Rémi Denis-Courmont 2014-09-25 11:59:58 +03:00 committed by Luca Barbato
parent ce42316321
commit 4e03b2097c
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/mpeg12dec.c
View File

@ -1181,10 +1181,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
@ -1194,11 +1205,13 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */ #endif /* FF_API_XVMC */
if (s->chroma_format < 2) if (s->chroma_format < 2)
return ff_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 ff_get_format(avctx, pix_fmts);
} }
/* Call this function when we know all parameters. /* Call this function when we know all parameters.