From patchwork Fri Sep 13 22:48:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 15064 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 9CB5B4498C9 for ; Sat, 14 Sep 2019 01:56:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 777E46881F3; Sat, 14 Sep 2019 01:56:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f195.google.com (mail-oi1-f195.google.com [209.85.167.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 611E66881DD for ; Sat, 14 Sep 2019 01:56:15 +0300 (EEST) Received: by mail-oi1-f195.google.com with SMTP id z6so3964219oix.9 for ; Fri, 13 Sep 2019 15:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UsUzdruHXK16FqylFoyF4+SQCDLmqqx6sdB5WmPeUxc=; b=qxLCuJ7iaPjbcmMMEUcjrco+ys4YDoGuquBvy+BiJXdGUH1l+5sCdN2YlzsKRKu6va ST4BOp7sJLmClBfNkEMhZhKwnM4bZWEYIszF67J+b2xIm6f6Ddt1IAXQvc6kFnx6JtPX KmFHFhC+7oeQ30lZDRIDlhLYmXPgwzxnfbdDJ1+SmVem4mtq/qBYQjAwE5YblkqUlrUu 2KArtOubH4H3FhLbJzfLz6oow8aXxhqHWZdVPwwDwSX7IaDIx9aYA8HItiI3IsEukPfB jX+cdYsFg+aetRkUiTMIZnzHnNvfriIbwdMX6XFdCYDgOfBf8c/7+TrJy4rKSawp2LIZ R7rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UsUzdruHXK16FqylFoyF4+SQCDLmqqx6sdB5WmPeUxc=; b=sKL9rvrm9AU5pj1+j4Tev5KmwMP2O1zsXlg7zUg+kVtW4x7cRWEA17+JcYOdPTZiAE +TARrOeEKyG+OjVLuSfXSkGoxAiOOZc7Xxgv/dQAtthD5owiB/uWxbyfjotN7fA0VTlm MX0eoMOfFY9K/h/3GUS74mBwGPAcSl7ZACp25dJw7iHfw+gfEBtXFJKueWXohDFIS34T iCRcH/tBfhvbxlFvWedMQA+Wjpk9BC2gzvHEMCpFyuVupDMEXPKQyIC0x5NHLn/utPre F9TH8w986yi+oH6BrPM/1Fv2xm+nEBgjM/U2USdUxtBeV0ADI/0IJZTd4wqnZ8yrb7PU eLxw== X-Gm-Message-State: APjAAAUSoD1vqeWIALg6Exe/6fN+jCm/PjiNBiy2+g2NIUFhihJ5Q04l /w4xJLjuBNT7nOEud8D6L1AeD4EkMkHp3g== X-Google-Smtp-Source: APXvYqxvrEylYfzLR2TpHmcXUIqtMfKCSHt5dxyyl00mbJUEMuk5BKuDbe5eKQWGCm4IKRQeQRR48w== X-Received: by 2002:aca:b8c2:: with SMTP id i185mr5269000oif.112.1568414896908; Fri, 13 Sep 2019 15:48:16 -0700 (PDT) Received: from tmm1-imac.lan (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id k25sm1193786oiw.25.2019.09.13.15.48.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Sep 2019 15:48:15 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Sep 2019 15:48:09 -0700 Message-Id: <20190913224809.25816-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_misc: remove anonymous union for gcc4.4 compat 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: michael@niedermayer.cc, sw@jkqxz.net, ceffmpeg@gmail.com, Aman Gupta , andreas.rheinhardt@gmail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Signed-off-by: Aman Gupta --- libavcodec/cbs_misc.c | 14 +++++++------- libavcodec/cbs_misc.h | 4 ++-- libavcodec/cbs_misc_syntax_template.c | 8 ++++---- libavcodec/h264_metadata_bsf.c | 4 ++-- libavcodec/mpeg2_metadata_bsf.c | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libavcodec/cbs_misc.c b/libavcodec/cbs_misc.c index d0ced562f5..09324949f6 100644 --- a/libavcodec/cbs_misc.c +++ b/libavcodec/cbs_misc.c @@ -150,10 +150,10 @@ int ff_cbs_read_a53_cc_side_data(CodedBitstreamContext *ctx, *data = (A53UserData) { .user_identifier = A53_USER_IDENTIFIER_ATSC, - .atsc = { + .u = { .atsc = { .user_data_type_code = A53_USER_DATA_TYPE_CODE_CC_DATA, - .cc_data = { + .u = { .cc_data = { .process_em_data_flag = 0, .process_cc_data_flag = 1, .additional_data_flag = 0, @@ -161,10 +161,10 @@ int ff_cbs_read_a53_cc_side_data(CodedBitstreamContext *ctx, .em_data = 0, .cc_count = cc_count, - }, - }, + } }, + } }, }; - cc = &data->atsc.cc_data; + cc = &data->u.atsc.u.cc_data; err = init_get_bits(&gbc, side_data, 8 * side_data_size); if (err < 0) @@ -190,10 +190,10 @@ int ff_cbs_write_a53_cc_side_data(CodedBitstreamContext *ctx, int err, i; if (data->user_identifier != A53_USER_IDENTIFIER_ATSC || - data->atsc.user_data_type_code != A53_USER_DATA_TYPE_CODE_CC_DATA) + data->u.atsc.user_data_type_code != A53_USER_DATA_TYPE_CODE_CC_DATA) return AVERROR(EINVAL); - cc = &data->atsc.cc_data; + cc = &data->u.atsc.u.cc_data; err = av_reallocp(side_data, *side_data_size + 3 * cc->cc_count); if (err < 0) diff --git a/libavcodec/cbs_misc.h b/libavcodec/cbs_misc.h index 0d7ab2c8e7..b434ab86cc 100644 --- a/libavcodec/cbs_misc.h +++ b/libavcodec/cbs_misc.h @@ -70,7 +70,7 @@ typedef struct A53ATSCUserData { union { CEA708CCData cc_data; A53BarData bar_data; - }; + } u; } A53ATSCUserData; typedef struct A53AFDData { @@ -83,7 +83,7 @@ typedef struct A53UserData { union { A53ATSCUserData atsc; A53AFDData afd; - }; + } u; } A53UserData; diff --git a/libavcodec/cbs_misc_syntax_template.c b/libavcodec/cbs_misc_syntax_template.c index 7b98c7cc85..60ece42aef 100644 --- a/libavcodec/cbs_misc_syntax_template.c +++ b/libavcodec/cbs_misc_syntax_template.c @@ -99,9 +99,9 @@ static int FUNC(a53_atsc_user_data)(CodedBitstreamContext *ctx, RWContext *rw, switch (current->user_data_type_code) { case A53_USER_DATA_TYPE_CODE_CC_DATA: - return FUNC(cea708_cc_data)(ctx, rw, ¤t->cc_data); + return FUNC(cea708_cc_data)(ctx, rw, ¤t->u.cc_data); case A53_USER_DATA_TYPE_CODE_BAR_DATA: - return FUNC(a53_bar_data)(ctx, rw, ¤t->bar_data); + return FUNC(a53_bar_data)(ctx, rw, ¤t->u.bar_data); default: av_log(ctx->log_ctx, AV_LOG_WARNING, "Unknown ATSC user data found: type code %#02x.\n", @@ -137,9 +137,9 @@ static int FUNC(a53_user_data)(CodedBitstreamContext *ctx, RWContext *rw, switch (current->user_identifier) { case A53_USER_IDENTIFIER_ATSC: - return FUNC(a53_atsc_user_data)(ctx, rw, ¤t->atsc); + return FUNC(a53_atsc_user_data)(ctx, rw, ¤t->u.atsc); case A53_USER_IDENTIFIER_AFD: - return FUNC(a53_afd_data)(ctx, rw, ¤t->afd); + return FUNC(a53_afd_data)(ctx, rw, ¤t->u.afd); default: av_log(ctx->log_ctx, AV_LOG_WARNING, "Unknown registered user data found: identifier %#08x.\n", diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index 65c7b7b55e..7c890508dd 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -579,7 +579,7 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) }; H264RawSEIUserDataRegistered *udr = &payload.payload.user_data_registered; - size_t size = 9 + 3 * a53_ud.atsc.cc_data.cc_count; + size_t size = 9 + 3 * a53_ud.u.atsc.u.cc_data.cc_count; udr->data_ref = av_buffer_alloc(2 + size); if (!udr->data_ref) { @@ -639,7 +639,7 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) continue; } if (a53_ud.user_identifier != A53_USER_IDENTIFIER_ATSC || - a53_ud.atsc.user_data_type_code != + a53_ud.u.atsc.user_data_type_code != A53_USER_DATA_TYPE_CODE_CC_DATA) { // Valid but something else (e.g. AFD). continue; diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/mpeg2_metadata_bsf.c index e82758d2eb..92db608c4a 100644 --- a/libavcodec/mpeg2_metadata_bsf.c +++ b/libavcodec/mpeg2_metadata_bsf.c @@ -219,7 +219,7 @@ static int mpeg2_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) continue; } if (a53_ud.user_identifier != A53_USER_IDENTIFIER_ATSC || - a53_ud.atsc.user_data_type_code != + a53_ud.u.atsc.user_data_type_code != A53_USER_DATA_TYPE_CODE_CC_DATA) { // Valid but something else (e.g. AFD). continue;