From 669b3821e4415c09d8ccb8c469e7291a4c1dd4a7 Mon Sep 17 00:00:00 2001
From: v0lt <mpc-be@mail.ru>
Date: Sat, 30 Nov 2024 21:56:14 +0300
Subject: [PATCH] =?UTF-8?q?AviSplitter:=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=B7=D1=83=D0=B5=D0=BC=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20wFormatTag=20=D0=B8?=
 =?UTF-8?q?=D0=B7=20Windows=20SDK.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/mplayerc/PlayerCaptureDialog.h        | 4 ++--
 src/filters/parser/AviSplitter/AviFile.cpp     | 4 ++--
 src/filters/parser/AviSplitter/AviSplitter.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/apps/mplayerc/PlayerCaptureDialog.h b/src/apps/mplayerc/PlayerCaptureDialog.h
index 29c8b6dd73..f47f709294 100644
--- a/src/apps/mplayerc/PlayerCaptureDialog.h
+++ b/src/apps/mplayerc/PlayerCaptureDialog.h
@@ -1,6 +1,6 @@
 /*
  * (C) 2003-2006 Gabest
- * (C) 2006-2023 see Authors.txt
+ * (C) 2006-2024 see Authors.txt
  *
  * This file is part of MPC-BE.
  *
@@ -269,7 +269,7 @@ class CAudFormatArray : public CFormatArray<AUDIO_STREAM_CONFIG_CAPS>
 		}
 
 		switch (wfe->wFormatTag) {
-			case 1:
+			case WAVE_FORMAT_PCM:
 				str = L"PCM";
 				break;
 			default:
diff --git a/src/filters/parser/AviSplitter/AviFile.cpp b/src/filters/parser/AviSplitter/AviFile.cpp
index 15fe3fe9df..d4174ff20a 100644
--- a/src/filters/parser/AviSplitter/AviFile.cpp
+++ b/src/filters/parser/AviSplitter/AviFile.cpp
@@ -1,6 +1,6 @@
 /*
  * (C) 2003-2006 Gabest
- * (C) 2006-2023 see Authors.txt
+ * (C) 2006-2024 see Authors.txt
  *
  * This file is part of MPC-BE.
  *
@@ -69,7 +69,7 @@ HRESULT CAviFile::Init()
 			continue;
 		}
 		WAVEFORMATEX* wfe = (WAVEFORMATEX*)s->strf.data();
-		if (wfe->wFormatTag == 0x55 && wfe->nBlockAlign == 1152
+		if (wfe->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && wfe->nBlockAlign == 1152
 				&& s->strh.dwScale == 1 && s->strh.dwRate != wfe->nSamplesPerSec) {
 			// correcting encoder bugs...
 			s->strh.dwScale = 1152;
diff --git a/src/filters/parser/AviSplitter/AviSplitter.cpp b/src/filters/parser/AviSplitter/AviSplitter.cpp
index 3611d0da80..e8cb42def7 100644
--- a/src/filters/parser/AviSplitter/AviSplitter.cpp
+++ b/src/filters/parser/AviSplitter/AviSplitter.cpp
@@ -474,7 +474,7 @@ HRESULT CAviSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 				continue;
 			}
 
-			if (pwfe->wFormatTag == 0x706D) {
+			if (pwfe->wFormatTag == WAVE_FORMAT_FAAD_AAC) {
 				pwfe->wFormatTag = WAVE_FORMAT_RAW_AAC1;
 			}