diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-02-18 08:15:52 -0800 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-03-06 21:18:50 +0200 |
| commit | 8d061989dd0397da15aa29f52d243fe125bf2f5e (patch) | |
| tree | 699546f4517dee6841f701ff8282c366e0efb22b /libavcodec/h263dec.c | |
| parent | 5a4e9fe855282a99586050a507d0a486ad39df5b (diff) | |
lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs
Not all hwaccels implement all codecs, so using one single list for
multiple such codecs means some codecs will be represented in the list,
even though they don't actually handle that codec. Copying specific
lists in each codec fixes that.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 663fe90244..9714632006 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -738,6 +738,17 @@ av_log(avctx, AV_LOG_DEBUG, "%"PRId64"\n", rdtsc()-time); return (ret && (avctx->err_recognition & AV_EF_EXPLODE))?ret:get_consumed_bytes(s, buf_size); } +const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = { +#if CONFIG_VAAPI + AV_PIX_FMT_VAAPI_VLD, +#endif +#if CONFIG_VDPAU + AV_PIX_FMT_VDPAU, +#endif + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE +}; + AVCodec ff_h263_decoder = { .name = "h263", .type = AVMEDIA_TYPE_VIDEO, @@ -750,5 +761,5 @@ AVCodec ff_h263_decoder = { CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush = ff_mpeg_flush, .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), - .pix_fmts = ff_hwaccel_pixfmt_list_420, + .pix_fmts = ff_h263_hwaccel_pixfmt_list_420, }; |