From patchwork Wed Jun 3 10:16:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 20134 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 EE33444B6F7 for ; Wed, 3 Jun 2020 13:16:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC16268AFBE; Wed, 3 Jun 2020 13:16:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from cp1.nerdvana.net.au (mail64.nerdvana.net.au [113.212.99.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0635687F68 for ; Wed, 3 Jun 2020 13:16:14 +0300 (EEST) Received: from ppp115-205.static.internode.on.net ([150.101.115.205]:51694 helo=minutae.fritz.box) by cp1.nerdvana.net.au with esmtpa (Exim 4.93) (envelope-from ) id 1jgQRQ-000081-NM; Wed, 03 Jun 2020 20:16:12 +1000 From: Brad Hards To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Jun 2020 20:16:10 +1000 Message-Id: <20200603101610.25977-1-bradh@frogmouth.net> X-Mailer: git-send-email 2.17.1 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cp1.nerdvana.net.au X-AntiAbuse: Original Domain - ffmpeg.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - frogmouth.net X-Get-Message-Sender-Via: cp1.nerdvana.net.au: authenticated_id: git@frogmouth.net X-Authenticated-Sender: cp1.nerdvana.net.au: git@frogmouth.net X-Source: X-Source-Args: X-Source-Dir: Subject: [FFmpeg-devel] [PATCH] libformat: Remove duplicate STREAM_TYPE constants from mpeg.h 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: Brad Hards MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" These definitions (and more STREAM_TYPEs) are already provided in mpegts.h Signed-off-by: Brad Hards --- libavformat/mpeg.c | 1 + libavformat/mpeg.h | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 265b2bd1ad..d9807d6d43 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -23,6 +23,7 @@ #include "avio_internal.h" #include "internal.h" #include "mpeg.h" +#include "mpegts.h" /*********************************************/ /* demux code */ diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h index b635295776..b1d80df31a 100644 --- a/libavformat/mpeg.h +++ b/libavformat/mpeg.h @@ -46,20 +46,6 @@ #define LPCM_ID 0xa0 #define SUB_ID 0x20 -#define STREAM_TYPE_VIDEO_MPEG1 0x01 -#define STREAM_TYPE_VIDEO_MPEG2 0x02 -#define STREAM_TYPE_AUDIO_MPEG1 0x03 -#define STREAM_TYPE_AUDIO_MPEG2 0x04 -#define STREAM_TYPE_PRIVATE_SECTION 0x05 -#define STREAM_TYPE_PRIVATE_DATA 0x06 -#define STREAM_TYPE_AUDIO_AAC 0x0f -#define STREAM_TYPE_VIDEO_MPEG4 0x10 -#define STREAM_TYPE_VIDEO_H264 0x1b -#define STREAM_TYPE_VIDEO_HEVC 0x24 -#define STREAM_TYPE_VIDEO_CAVS 0x42 - -#define STREAM_TYPE_AUDIO_AC3 0x81 - static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 }; /**