From patchwork Sat Feb 11 23:23:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 2511 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp281258vsb; Sat, 11 Feb 2017 15:23:46 -0800 (PST) X-Received: by 10.28.13.16 with SMTP id 16mr12518288wmn.101.1486855426370; Sat, 11 Feb 2017 15:23:46 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i201si6691207wmf.9.2017.02.11.15.23.45; Sat, 11 Feb 2017 15:23:46 -0800 (PST) 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=@itanimul.li; dkim=neutral (body hash did not verify) header.i=@messagingengine.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 3C387689D94; Sun, 12 Feb 2017 01:23:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4C59680CF2 for ; Sun, 12 Feb 2017 01:23:31 +0200 (EET) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 240CD2096C for ; Sat, 11 Feb 2017 18:23:34 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Sat, 11 Feb 2017 18:23:34 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=itanimul.li; h= date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc:x-sasl-enc; s=mesmtp; bh=Knga42fRnUSKo8yLYSKeepUS7C4 =; b=jTv5QmBgAYM1K0B+vvk+X5nInUTtw+EeczEHZBipp4u5XxjzJE8ANXf1mTZ b0GJUtWBbdAorRB93qVgguwvmxkMsd2SPDftmoJh8nLCGgGKIG2/uMhgDuP28iXD EJdLLP06Bv0T6czQbfthW1Q4gaw7lwgKRI4+PUY0EQxE0Tko= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=Kn ga42fRnUSKo8yLYSKeepUS7C4=; b=SbhFA47wUCxnAcEqC5o9b/CHpqGDdrRCBe r0s36e9LbDyjj5fXonAvansFVOOoCP3uE3J7FX6NzTrNbxCLsE7N6IRTBQ2HKadY GE6YwZaq/wqZvgiIVd/7+ZExARPlZSkTR+hpzNMUmSvrQE/oWv2CJvE59pYZwShM 3yXvypFGM= X-ME-Sender: X-Sasl-enc: B2UQIK9D0J/aHfAfjkgLrO6LwtfKzDxS6YIAs8L5nqG6 1486855413 Received: from localhost (cpc75394-sotn16-2-0-cust168.15-1.cable.virginm.net [82.22.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id B80237E5A8 for ; Sat, 11 Feb 2017 18:23:33 -0500 (EST) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Feb 2017 23:23:24 +0000 Message-Id: <20170211232324.70689-1-josh@itanimul.li> X-Mailer: git-send-email 2.10.1 (Apple Git-78) Subject: [FFmpeg-devel] [PATCH] lavc/libzvbi: remove deprecated API usage 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" Signed-off-by: Josh de Kock --- libavcodec/libzvbi-teletextdec.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index d1f0a9f..2ed4a82 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -395,7 +395,7 @@ static int teletext_decode_frame(AVCodecContext *avctx, void *data, int *data_si if (!ctx->vbi) { if (!(ctx->vbi = vbi_decoder_new())) return AVERROR(ENOMEM); - if (!vbi_event_handler_add(ctx->vbi, VBI_EVENT_TTX_PAGE, handler, ctx)) { + if (!vbi_event_handler_register(ctx->vbi, VBI_EVENT_TTX_PAGE, handler, ctx)) { vbi_decoder_delete(ctx->vbi); ctx->vbi = NULL; return AVERROR(ENOMEM); @@ -524,8 +524,12 @@ static int teletext_close_decoder(AVCodecContext *avctx) subtitle_rect_free(&ctx->pages[--ctx->nb_pages].sub_rect); av_freep(&ctx->pages); - vbi_decoder_delete(ctx->vbi); - ctx->vbi = NULL; + if (ctx->vbi) { + vbi_event_handler_unregister(ctx->vbi, handler, ctx); + vbi_decoder_delete(ctx->vbi); + ctx->vbi = NULL; + } + ctx->pts = AV_NOPTS_VALUE; if (!(avctx->flags2 & AV_CODEC_FLAG2_RO_FLUSH_NOOP)) ctx->readorder = 0;