From patchwork Tue Sep 20 11:13:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 655 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp345712vsd; Tue, 20 Sep 2016 04:13:45 -0700 (PDT) X-Received: by 10.194.169.194 with SMTP id ag2mr27590522wjc.164.1474370025696; Tue, 20 Sep 2016 04:13:45 -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 bi5si27339711wjc.78.2016.09.20.04.13.44; Tue, 20 Sep 2016 04:13:45 -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 6F5246898C2; Tue, 20 Sep 2016 14:13:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23ECC680CF8 for ; Tue, 20 Sep 2016 14:13:21 +0300 (EEST) Received: by mail-it0-f68.google.com with SMTP id 186so950760itf.1 for ; Tue, 20 Sep 2016 04:13:36 -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=NJEk2K7Ry2zZi45vp64OuVqQftXdcsBknGjSyPoGY4UP0udhgCE/iwFXa9ZHRAA84y 4m7Rb1ElATkm5IrkBKfPBbOM4aqny2woDKBpisEPAS5yLRsNnrFvffK9YZHdqyguhql6 M2lrkzmVzDfW4R1Y/j4TJbwB5swS/pToHJ+k/UONLW59M6SFdwW8APM5BXJcnxyqoCOF GIamaC8bDzQL2e2NkKjgv+SyPeicwn0QVB/ENHKJxM/Bllq5+XdOtJ0eqS5adDsXbFvq ndfTQcS1mTaCvep+fFVCx+jFl16Hul0IrmbQlZ8KsZVXO3Z03H26+VqZhg6x+q1zeh/R DQfg== 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=G5toQ4UL0oq0+WQjYF1dpGgp8kn0PtDRy0t3P9r7jQx1quKw7yqkE3HngJsQ67dE41 TZoLn22Ht+Ctr0BVpOyVudvlX0jpYdWvKZRWI721vOPfBUE+CKyILGLWbKlVcZXZCK4V gRx0MXt4Z8bzqms/9u8Hrk7c1BLl6K+3N8ZyLIX74mxd0/Orlbm7hntEtxg7s0U0Sl7G Bc0bjuKw33Z2jao2LUWNJqHeqTECNGF7+wUl/zqrIFQfFOh8Yzf0x9MwoUYXwTg8WonU pK0YBYcR0N9N+I0d425+wO3w2eq1wGTdUoI3tRTa2UzL69rkTONQ4T1GkXM/VNasIVYb aS9Q== X-Gm-Message-State: AE9vXwNP2v2XrdwriYt4ASwjjqYlvpTvkGBBewpgIPJP3zUHgBFdZKuuqkTbrknB8JhIVA== X-Received: by 10.36.54.197 with SMTP id l188mr3239342itl.15.1474370014768; Tue, 20 Sep 2016 04:13:34 -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 f201sm10665322ioe.28.2016.09.20.04.13.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 20 Sep 2016 04:13:33 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2016 06:13:25 -0500 Message-Id: <20160920111325.60492-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.10.0 Subject: [FFmpeg-devel] [PATCH] 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 */