From patchwork Tue Oct 4 04:49:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 869 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1955566vsd; Mon, 3 Oct 2016 22:04:34 -0700 (PDT) X-Received: by 10.194.17.197 with SMTP id q5mr1147013wjd.115.1475557474045; Mon, 03 Oct 2016 22:04:34 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d76si2854526wme.126.2016.10.03.22.04.32; Mon, 03 Oct 2016 22:04:34 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3362D680457; Tue, 4 Oct 2016 08:04:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5C8D689A8A for ; Tue, 4 Oct 2016 08:04:09 +0300 (EEST) Received: by mail-it0-f67.google.com with SMTP id o19so6894924ito.3 for ; Mon, 03 Oct 2016 22:04:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=nal4TCbIP2frIP+o3vXqXQpRzuZPL8DcGyK6Byl2K14=; b=m5NbYgLSM1hgnm5hi3RkInidIrzHGINUies5SPna7PI47BiNkqdlLMDXk/kmE4t/jy gx6kaX7Kcfezik7Gqss7RqQ0J6QDcRcqmf6oKsRoMSi+vQ6WSgV5kZSwSp48J2hSfRUI to9J+licSXHntxlHx3koA6jtxT58S0fzru/7sLvxzjKIUEfGtfp2rOIchn7HR/QR4wnQ p3+BmWNd28kmsSsr+oFOKRnIL0hT0ZxRHAdADpPdVOK/xibrnBobvJZLhAOB3VxhEJLB Xo4t4CEsHurWRpRDjlaD67ogPsg+7Ek9fZx7wZ68HM2a4RkEcFaI5ywBujalgx/ihR+t 2uHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=nal4TCbIP2frIP+o3vXqXQpRzuZPL8DcGyK6Byl2K14=; b=Kx5LfF2fONC5yT+4TG2EOxaqu47fYjRl8CEdYuPURx95Ur2+Sn/z1Uo8VcFhKImsYT tsy8ZDwksjGDLCgi4cy+BkyuwMTpuXsdskVtXYVRvsQx7gJGNB+U+1g39rrpyt2DQLqh 66kyTIDKU2mMekefqIjVlP7YNFc7jGDr5BxnsLddTBWu55JSDv/z9BZ8jQmKaVtqNhEk s4Y2VZpmnlS/lS0iw/mzHA6QPgF2Jp5VvKg/GeeT2OGFhDemJO+urb30nqZE3qV15AI2 eFCL4RH32SmMR2xVn9QwaiwlMcc5Ivqlm97n/njW8J85s+ADMdn1Gs3VhRI+0L3TFzcO vjbw== X-Gm-Message-State: AA6/9RmIJ2G6erVIPrlVVLgybOR4IRopQtKCunbSZJiJ3ATHfUf5CA8G1SnKTwmdf5KQ7A== X-Received: by 10.36.135.138 with SMTP id f132mr2312806ite.101.1475556585253; Mon, 03 Oct 2016 21:49:45 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-209-137-129.hsd1.il.comcast.net. [73.209.137.129]) by smtp.gmail.com with ESMTPSA id k2sm972795ith.11.2016.10.03.21.49.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 03 Oct 2016 21:49:44 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Oct 2016 23:49:36 -0500 Message-Id: <20161004044939.22351-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.10.0 Subject: [FFmpeg-devel] [PATCH 1/4] lavc/parser: export field order if not already set 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Some codecs set this in the parser, but not the decoder --- libavcodec/parser.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 2c8fc69..30cfc55 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -182,6 +182,11 @@ int av_parser_parse2(AVCodecParserContext *s, AVCodecContext *avctx, index = s->parser->parser_parse(s, avctx, (const uint8_t **) poutbuf, poutbuf_size, buf, buf_size); av_assert0(index > -0x20000000); // The API does not allow returning AVERROR codes +#define FILL(name) if(s->name > 0 && avctx->name <= 0) avctx->name = s->name + if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { + FILL(field_order); + } + /* update the file pointer */ if (*poutbuf_size) { /* fill the data for the current frame */