From patchwork Tue Apr 9 22:14:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baptiste Coudurier X-Patchwork-Id: 12677 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 60C90448F9D for ; Wed, 10 Apr 2019 01:20:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4117068AE18; Wed, 10 Apr 2019 01:20:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87F6768AE17 for ; Wed, 10 Apr 2019 01:20:42 +0300 (EEST) Received: by mail-pl1-f195.google.com with SMTP id ck15so73198plb.3 for ; Tue, 09 Apr 2019 15:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ldhk2IMMwOwsaAFSalEA6YQhMzg1ccTKxckfidK6PGM=; b=VIUB9XVmvp8kqr02DjBQiknYBCjmspAVbbmoEXIXsJ8szj0qs1VNyTPY69LCIQf9oy bvHKmE4SL30TCLlsAvkKdJ2LNM94Xl16qFAb0LQKR08T4NJK7K0HX3T1UarCwaUG0uQL qAcHrbBTCzV8oT1xDKJ+GUhXW/9CT9PFex6rfa1qBSTpbFc7uaomcmkPSoM9L2NRYt+H XLdCI9d3cL4ELfw86z+gno5jgkb3l00O7bkCbsDL0kqlYae5NyGT44DwFSi1RISGmLWF 4hY9Vm8Suu4spGKB+IXvCXDzSdSpACtQabMb1NYDL1AwLRbz95qy+9XCiT+2hA0iVG2d o8Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ldhk2IMMwOwsaAFSalEA6YQhMzg1ccTKxckfidK6PGM=; b=fLHzYjQ0J52M0uTPOJ07eoo9gzndHADnMR8Mca1slVONN5EgkjaAeBN1wxQJ/HwzMu wenTxDdoa489jdduC9KWLSUB6D+tpzioF7P9SVU41b+a7ge1ILhLJjSOuAcvrmI0R+PE kkMRZykimbOxB30I+3MR2PKoRsiJDc0Mg4ikGgnt8ryR8lMW3lrJR+G4qqvaAyvBJwdm UhLkIPU078j8OfCWQXSKcqFZiJZ/6fRmkXoBC3v5seZ8InDk4GvdjtAmqUv0UVUibHyG PN9sSHM9LuMYERFHHlJyJyBHybtJKCQREVV3b/wFD8gnrbkDczGEMn8PUkYD3nGSXYDN b1Fg== X-Gm-Message-State: APjAAAUjieDxIDq3W2suwKoAaPZa8iw6EisbmHgaaL4FH3XKkKd4zjaE 3YpX62MFXOT3y5IlRv3YzViN6dFY X-Google-Smtp-Source: APXvYqygQ7oDE43L0+hHdjHuiaf0M7aRuUigUiaiSgx5xjSbQ27lvpTjpY8oDW27vzC2OUzS0QskUw== X-Received: by 2002:a17:902:4501:: with SMTP id m1mr11134523pld.290.1554848064567; Tue, 09 Apr 2019 15:14:24 -0700 (PDT) Received: from localhost.localdomain ([64.124.32.234]) by smtp.gmail.com with ESMTPSA id y12sm96630223pgq.64.2019.04.09.15.14.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 15:14:23 -0700 (PDT) From: Baptiste Coudurier To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Apr 2019 15:14:02 -0700 Message-Id: <20190409221403.41981-1-baptiste.coudurier@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/h264_parse: change prefix to avpriv for usage in avformat mxf muxer 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 Cc: Baptiste Coudurier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/h264_parse.c | 2 +- libavcodec/h264_parser.c | 2 +- libavcodec/h264_ps.c | 4 ++-- libavcodec/h264_ps.h | 4 ++-- libavcodec/h264dec.c | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index a075443d17..0f008c29f3 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -374,7 +374,7 @@ static int decode_extradata_ps(const uint8_t *data, int size, H264ParamSets *ps, H2645NAL *nal = &pkt.nals[i]; switch (nal->type) { case H264_NAL_SPS: - ret = ff_h264_decode_seq_parameter_set(&nal->gb, logctx, ps, 0); + ret = avpriv_h264_decode_seq_parameter_set(&nal->gb, logctx, ps, 0); if (ret < 0) goto fail; break; diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 5f9a9c46ef..814584cc82 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -323,7 +323,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, switch (nal.type) { case H264_NAL_SPS: - ff_h264_decode_seq_parameter_set(&nal.gb, avctx, &p->ps, 0); + avpriv_h264_decode_seq_parameter_set(&nal.gb, avctx, &p->ps, 0); break; case H264_NAL_PPS: ff_h264_decode_picture_parameter_set(&nal.gb, avctx, &p->ps, diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 17bfa780ce..980b1e189d 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -330,8 +330,8 @@ void ff_h264_ps_uninit(H264ParamSets *ps) ps->sps = NULL; } -int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, - H264ParamSets *ps, int ignore_truncation) +int avpriv_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, + H264ParamSets *ps, int ignore_truncation) { AVBufferRef *sps_buf; int profile_idc, level_idc, constraint_set_flags = 0; diff --git a/libavcodec/h264_ps.h b/libavcodec/h264_ps.h index e967b9cbcf..d422ce122e 100644 --- a/libavcodec/h264_ps.h +++ b/libavcodec/h264_ps.h @@ -149,8 +149,8 @@ typedef struct H264ParamSets { /** * Decode SPS */ -int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, - H264ParamSets *ps, int ignore_truncation); +int avpriv_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, + H264ParamSets *ps, int ignore_truncation); /** * Decode PPS diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 837c3b7538..2e82e118b7 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -716,14 +716,14 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) if (ret < 0) goto end; } - if (ff_h264_decode_seq_parameter_set(&tmp_gb, avctx, &h->ps, 0) >= 0) + if (avpriv_h264_decode_seq_parameter_set(&tmp_gb, avctx, &h->ps, 0) >= 0) break; av_log(h->avctx, AV_LOG_DEBUG, "SPS decoding failure, trying again with the complete NAL\n"); init_get_bits8(&tmp_gb, nal->raw_data + 1, nal->raw_size - 1); - if (ff_h264_decode_seq_parameter_set(&tmp_gb, avctx, &h->ps, 0) >= 0) + if (avpriv_h264_decode_seq_parameter_set(&tmp_gb, avctx, &h->ps, 0) >= 0) break; - ff_h264_decode_seq_parameter_set(&nal->gb, avctx, &h->ps, 1); + avpriv_h264_decode_seq_parameter_set(&nal->gb, avctx, &h->ps, 1); break; } case H264_NAL_PPS: