diff options
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 48 |
1 files changed, 33 insertions, 15 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f8fa3590e4..04ca363610 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1117,9 +1117,41 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const en return fmt[0]; } +static AVHWAccel *find_hwaccel(enum AVCodecID codec_id, + enum AVPixelFormat pix_fmt) +{ + AVHWAccel *hwaccel = NULL; + + while ((hwaccel = av_hwaccel_next(hwaccel))) + if (hwaccel->id == codec_id + && hwaccel->pix_fmt == pix_fmt) + return hwaccel; + return NULL; +} + + int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) { - return avctx->get_format(avctx, fmt); + const AVPixFmtDescriptor *desc; + enum AVPixelFormat ret = avctx->get_format(avctx, fmt); + + desc = av_pix_fmt_desc_get(ret); + if (!desc) + return AV_PIX_FMT_NONE; + + if (desc->flags & AV_PIX_FMT_FLAG_HWACCEL) { + avctx->hwaccel = find_hwaccel(avctx->codec_id, ret); + if (!avctx->hwaccel) { + av_log(avctx, AV_LOG_ERROR, + "Could not find an AVHWAccel for the pixel format: %s", + desc->name); + return AV_PIX_FMT_NONE; + } + } else { + avctx->hwaccel = NULL; + } + + return ret; } #if FF_API_AVFRAME_LAVC @@ -3314,20 +3346,6 @@ AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel) return hwaccel ? hwaccel->next : first_hwaccel; } -AVHWAccel *ff_find_hwaccel(AVCodecContext *avctx) -{ - enum AVCodecID codec_id = avctx->codec->id; - enum AVPixelFormat pix_fmt = avctx->pix_fmt; - - AVHWAccel *hwaccel = NULL; - - while ((hwaccel = av_hwaccel_next(hwaccel))) - if (hwaccel->id == codec_id - && hwaccel->pix_fmt == pix_fmt) - return hwaccel; - return NULL; -} - int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)) { if (lockmgr_cb) { |