AviSplitter: используем определения wFormatTag из Windows SDK.

Aleksoid1978 · Nov 30, 2024 · 669b382 · 669b382
1 parent b79c45e
commit 669b382
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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;
 			}