From patchwork Tue Oct 23 12:50:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 10758 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6614B44A75F for ; Tue, 23 Oct 2018 15:50:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B9AC68A643; Tue, 23 Oct 2018 15:49:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from kyoto.xs4all.nl (kyoto.xs4all.nl [83.161.153.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAAE8689B9E for ; Tue, 23 Oct 2018 15:49:52 +0300 (EEST) Received: from [10.1.48.93] ([87.215.30.74]) (authenticated bits=0) by kyoto.xs4all.nl (8.14.7/8.14.7) with ESMTP id w9NCoHVo003765 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO) for ; Tue, 23 Oct 2018 14:50:19 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1540299019; bh=BLbIBABLNVRQUqe6mFCsk9BxrY/CJQO9gN5EBw5gkKY=; h=To:From:Subject:Date; b=IttZs2TWXZXdo7mzegVTfP7o+cswPcjukEdOInjqX1jngm5s9ewRRjd1bLZJvZXIj tn6ns2mDYglhrTctQcSFhS2LDiLVqITcexgsLsLGofjLcBSY2UBavj+u+AD1AtmZiX byIiUi7QoWs/rXhiK0nxvIMY5aoL25lF4ZzM31kaEF7HmzLFybUG1XeDmo+/mvSOs1 6iQRK+MoPSzbVG9BYPrE63q4Dp0H7Tnqz2bdYQsqq6nzuZKIxqN8l1zsd68XaQZ6sQ irJtjr9btl18l1BDDTkzS+HQPPIkjlIamdZanjanB8e5Qe9g5f6PR2MBHD5dJT9d0L ug7D1Ji2Jm6vA== To: FFmpeg development discussions and patches From: Jerome Borsboom Message-ID: <3d23ea94-ad5e-e447-f368-7f451b4ddc6a@carpalis.nl> Date: Tue, 23 Oct 2018 14:50:17 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 Content-Language: nl Subject: [FFmpeg-devel] [PATCH] avcodec/vc1: set ticks_per_frame irrespective of FRAMERATE_FLAG 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" vc1_decode_frame assumes that ticks_per_frame is set to two when RFF or RPTFRM is set. When FRAMERATE_FLAG is zero, this may not be the case as the setting of ticks_per_frame is guarded by FRAMERATE_FLAG. Signed-off-by: Jerome Borsboom --- libavcodec/vc1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 3581d87b57..09433ad3e9 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -422,6 +422,9 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) v->max_coded_width = (get_bits(gb, 12) + 1) << 1; v->max_coded_height = (get_bits(gb, 12) + 1) << 1; v->broadcast = get_bits1(gb); + if (v->broadcast) // Pulldown may be present + v->s.avctx->ticks_per_frame = 2; + v->interlace = get_bits1(gb); v->tfcntrflag = get_bits1(gb); v->finterpflag = get_bits1(gb); @@ -480,9 +483,6 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) v->s.avctx->framerate.num = ff_vc1_fps_nr[nr - 1] * 1000; } } - if (v->broadcast) { // Pulldown may be present - v->s.avctx->ticks_per_frame = 2; - } } if (get_bits1(gb)) {