diff options
| author | Aman Gupta <aman@tmm1.net> | 2019-08-22 11:02:45 -0700 |
|---|---|---|
| committer | Aman Gupta <aman@tmm1.net> | 2019-08-23 17:07:57 -0700 |
| commit | 23a3e1460a7a609651bfe75b7b4c428eaa8f3902 (patch) | |
| tree | ab28e23374908fbfb9a4811a80cc50b96dd6741b /libavcodec | |
| parent | 76c82843ccad11666603e3f1f6d9d9a36c780a32 (diff) | |
| download | ffmpeg-23a3e1460a7a609651bfe75b7b4c428eaa8f3902.tar.gz | |
avcodec/omx: ensure zerocopy mode can be disabled on rpi builds
fixes https://trac.ffmpeg.org/ticket/6586
Signed-off-by: Aman Gupta <aman@tmm1.net>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/omx.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 8c722b573c..1a9a0715f8 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -644,10 +644,6 @@ static av_cold int omx_encode_init(AVCodecContext *avctx) OMX_BUFFERHEADERTYPE *buffer; OMX_ERRORTYPE err; -#if CONFIG_OMX_RPI - s->input_zerocopy = 1; -#endif - s->omx_context = omx_init(avctx, s->libname, s->libprefix); if (!s->omx_context) return AVERROR_ENCODER_NOT_FOUND; @@ -933,7 +929,7 @@ static av_cold int omx_encode_end(AVCodecContext *avctx) static const AVOption options[] = { { "omx_libname", "OpenMAX library name", OFFSET(libname), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VDE }, { "omx_libprefix", "OpenMAX library prefix", OFFSET(libprefix), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VDE }, - { "zerocopy", "Try to avoid copying input frames if possible", OFFSET(input_zerocopy), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "zerocopy", "Try to avoid copying input frames if possible", OFFSET(input_zerocopy), AV_OPT_TYPE_INT, { .i64 = CONFIG_OMX_RPI }, 0, 1, VE }, { "profile", "Set the encoding profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = FF_PROFILE_UNKNOWN }, FF_PROFILE_UNKNOWN, FF_PROFILE_H264_HIGH, VE, "profile" }, { "baseline", "", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_BASELINE }, 0, 0, VE, "profile" }, { "main", "", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_MAIN }, 0, 0, VE, "profile" }, |