From patchwork Wed Sep 13 17:12:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Reimar_D=C3=B6ffinger?= X-Patchwork-Id: 5133 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp1107847jaa; Wed, 13 Sep 2017 10:12:59 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7U3ubP7TQkju0BTmWPm99x1gSz0FjAf6HtCU1N/1Xkf1OoSvCzbO1sowJ7Tej7o5CcUtIk X-Received: by 10.223.151.157 with SMTP id s29mr16537890wrb.168.1505322779213; Wed, 13 Sep 2017 10:12:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505322779; cv=none; d=google.com; s=arc-20160816; b=oZPbnpDZxipzhc6aiZSOs9ywqNnJxRK5MgSBo5QuTeKx070i+CP8oy6QTGDcdv2jf4 BIk4WLKzvw6EI21+BNxAFE37cquip2RF2DZAm2kbGNIoDegTDp6z+/vCUmoG4S3fmE+v ag5jK5UCO1kcMw/AfSFi/Ga1s80nZ1Pat5wbyY8wjEvZU0fGbX1fh8iIHIsq9m+7lSCj PCL0Zsq1pLUaBYPF7+sBs7AAOl5P3EZuiWJf43OGeSFUJ7y4OYNaVnxJuiHEJqjEPISy Lxxk+NOY8VH3NCb+9WUe8dzgChiKPabXt7thdsOPPYxa4t9SCB47Jj2hbOh6RfidRCHk HHIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to:arc-authentication-results; bh=7Lan11ZxZlduVVONVqmOjveuGqbonutbkEsxPX9bIPI=; b=QRE8Rh7t/pdGEgc2Rvml2qZ68EnstoyzjCrqYoyDeJ1Va+SepcblKMLz18oGLeb+RH oIlLPojJ1kJY9NhIqd2Fi90Toc9PmWGnYysXhSf4Fic4fSc+ti4zeeUp3Y8hUagu2J5u vX8ve92/DIEtaJ8iNc5fm2juCq3WGuUlS96ex76Bp6zHc0yNd+yeIFTjqYkiEKykNZ1v MlnZ+IV6lnvxoqbDBFPnIuauSQ2KKj1VqnMipsGqepjDNx30Lp8iey2tTGZHCIPMj3a2 ggC/G4efbsPSmM3jtRPYwE/ZWo8kSbm1pdFIbQW9RA8JganoFjSPNc2/q6U/6y0k2JLH w75g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p97si11166561wrb.359.2017.09.13.10.12.58; Wed, 13 Sep 2017 10:12:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0EC92689BF2; Wed, 13 Sep 2017 20:12:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8320C689720 for ; Wed, 13 Sep 2017 20:12:43 +0300 (EEST) Received: from localhost ([87.143.204.117]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MdK8t-1e9yx01Gvz-00ITvE for ; Wed, 13 Sep 2017 19:12:49 +0200 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Sep 2017 19:12:48 +0200 Message-Id: <20170913171248.5028-1-Reimar.Doeffinger@gmx.de> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-Provags-ID: V03:K0:Jj5wi5k8RXi4fKTaHHSRZxS4x6jarbOTsPgWJXNLeosyJW5NwGR oEG83MbJIJbKqQZwXqraBaKdMGKlDgX0d3E+DKcZPTN1GuQ45BSZUxZ3fKTpVsI9KvCLYdl oSTPiT/K2vj5vuswrCgiecTMVjXzgIkOBWlndftxp/DlxaH6QdNnRc0zVml3JtALABscb1u 92mUGnQByiENY/Dw+GBPQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:gzRgM6luKVo=:HuSMHg+hHlSmR/DE5HxLvf bes492Jy4SVglTPmCjlsli/LZf14qwHU4IGPdpxB8Ypr/UPvSzHPk0MSY5Rl3690Nvaivm7cB 8CGb5CwL4K5uHxa32hQxOg82/MotceCn5ZqFLI3FwCuIv8wDOhUjG9DEzA0lD22yEoF28LUpb 8JVXOoTJ9OCgib/cTYoiTFFMXoWnTK0HI9VggdVAyQG6KWIP74m8EuTCvm3tWayY9pLXjGBOk UCcYfT/vNkZJjWWoy7A9ehiXBwT0IjyxF9RVsbtGlrznGvtgMVV88fbd+EL8/So6UCi/iZaD+ negUWNpKdLCfhfTyI48iyCSNQM4EwhK8fQK92qVkeXGHTTmtUZV1odLx64oiGdqymcs6fofBm 1/mmjnfM1EDHBp8wz9LDPqQyp8JUE+cIPWZLyVgzaB//siCvez3NgLB2fDVTOv3xHrXE1aAA6 9NHKEACMxCTEG4g8BULOQDBB8BnRlVM8nbP+LpbA+3pyNZu6n149CnXLOumWinEnFMPRT+O57 fJox15IlKEZW8J0B4Lo0tkaz9Zb3aHE4jyTQBn+RlmKMKEo2MXXL/Xy5MG1p0uieQJDYgIBVF V7kHWEJw2DSbYwVbqVm/a9/1kqv7WkzGgrCsggnJ7iFoJxdeVB4miBcgtFfHA6QcCYhwLEUrI w5P+bDObsB6roeTcwM25ldwrYDMvM9hPfG9ipLDsS1WfXc66mLB6Dpj50WXgVINqVt0S249pr kfKwNqSrXKRtNllpSjXV2LIBLtiu3WHMkYqDKOW6OaNhs98wixZbwIL4WK654pJ/iM0hTAlS5 /R5jo3DJ0GQ9AbLQzdWFIphUe62dJyJJILkueJSgDfnLU52xws= Subject: [FFmpeg-devel] [PATCH] avcodec/frame_thread_encoder: Fix AV_OPT_TYPE_STRING handling in avctx X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is the equivalent to what 7d317d4706b49d572a1eb5269438753be18362c7 did for the codec-specific options. av_opt_copy has specific handling so it's fine that we already copied the whole context before. Signed-off-by: Reimar Döffinger --- libavcodec/frame_thread_encoder.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 35a37c4..31a9fe9 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -199,6 +199,9 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){ goto fail; tmpv = thread_avctx->priv_data; *thread_avctx = *avctx; + int ret = av_opt_copy(thread_avctx, avctx); + if (ret < 0) + goto fail; thread_avctx->priv_data = tmpv; thread_avctx->internal = NULL; if (avctx->codec->priv_class) {