From f1d7b1a9f6e0e134012f0c1acad6c20ffc34774c Mon Sep 17 00:00:00 2001
From: vzamanillo <bellzebu@hotmail.com>
Date: Mon, 24 Oct 2016 17:42:38 +0200
Subject: [PATCH] Unified and sorted configuration options, removed msmpeg4vx

Unified and sorted configuration options for clarify.
With msmpeg4vx FFmpeg does not compile on windows.
---
 patch/linux/build_ffmpeg_proprietary_codecs.patch | 6 +++---
 patch/mac/build_ffmpeg_proprietary_codecs.patch   | 6 +++---
 patch/win/build_ffmpeg_proprietary_codecs.patch   | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/patch/linux/build_ffmpeg_proprietary_codecs.patch b/patch/linux/build_ffmpeg_proprietary_codecs.patch
index 516668d..bcbbf50 100644
--- a/patch/linux/build_ffmpeg_proprietary_codecs.patch
+++ b/patch/linux/build_ffmpeg_proprietary_codecs.patch
@@ -17,9 +17,9 @@ index cfbe54e..9432f56 100755
 -      '--enable-decoder=aac,h264,mp3',
 -      '--enable-demuxer=aac,mp3,mov',
 -      '--enable-parser=aac,h264,mpegaudio',
-+      '--enable-decoder=aac,h264,mp3,mpeg4,hevc,ac3,aac3,mpegvideo,msmpeg4v1,msmpeg4v2,msmpeg4v3,flv,dca,flac',
-+      '--enable-demuxer=aac,mp3,mov,avi,flv,mp4,mpegvideo,dts,dtshd,mpegts,flac',
-+      '--enable-parser=aac,h264,mpegaudio,h263,mpeg4video,ac3,aac3,dca,hevc,mepgvideo,flac',
++      '--enable-decoder=aac,ac3,aac3,h264,mp1,mp2,mp3,mpeg4,mpegvideo,msmpeg4v1,msmpeg4v2,msmpeg4v3,hevc,flv,dca,flac',
++      '--enable-demuxer=aac,h264,mp3,mp4,m4v,mpegvideo,mpegts,mov,avi,flv,dts,dtshd,vc1,flac',
++      '--enable-parser=aac,ac3,aac3,h261,h263,h264,mepgvideo,mpeg4video,mpegaudio,dca,hevc,vc1,flac',
    ])
 
    # ChromiumOS specific configuration.
diff --git a/patch/mac/build_ffmpeg_proprietary_codecs.patch b/patch/mac/build_ffmpeg_proprietary_codecs.patch
index 516668d..bcbbf50 100644
--- a/patch/mac/build_ffmpeg_proprietary_codecs.patch
+++ b/patch/mac/build_ffmpeg_proprietary_codecs.patch
@@ -17,9 +17,9 @@ index cfbe54e..9432f56 100755
 -      '--enable-decoder=aac,h264,mp3',
 -      '--enable-demuxer=aac,mp3,mov',
 -      '--enable-parser=aac,h264,mpegaudio',
-+      '--enable-decoder=aac,h264,mp3,mpeg4,hevc,ac3,aac3,mpegvideo,msmpeg4v1,msmpeg4v2,msmpeg4v3,flv,dca,flac',
-+      '--enable-demuxer=aac,mp3,mov,avi,flv,mp4,mpegvideo,dts,dtshd,mpegts,flac',
-+      '--enable-parser=aac,h264,mpegaudio,h263,mpeg4video,ac3,aac3,dca,hevc,mepgvideo,flac',
++      '--enable-decoder=aac,ac3,aac3,h264,mp1,mp2,mp3,mpeg4,mpegvideo,msmpeg4v1,msmpeg4v2,msmpeg4v3,hevc,flv,dca,flac',
++      '--enable-demuxer=aac,h264,mp3,mp4,m4v,mpegvideo,mpegts,mov,avi,flv,dts,dtshd,vc1,flac',
++      '--enable-parser=aac,ac3,aac3,h261,h263,h264,mepgvideo,mpeg4video,mpegaudio,dca,hevc,vc1,flac',
    ])
 
    # ChromiumOS specific configuration.
diff --git a/patch/win/build_ffmpeg_proprietary_codecs.patch b/patch/win/build_ffmpeg_proprietary_codecs.patch
index 39ca6fb..9d37d7f 100644
--- a/patch/win/build_ffmpeg_proprietary_codecs.patch
+++ b/patch/win/build_ffmpeg_proprietary_codecs.patch
@@ -17,9 +17,9 @@ index 5b478be..14c6f99 100755
 -      '--enable-decoder=aac,h264,mp3',
 -      '--enable-demuxer=aac,mp3,mov',
 -      '--enable-parser=aac,h264,mpegaudio',
-+    '--enable-decoder=aac,h264,mp3,mpeg4,hevc,ac3,eac3,mpegvideo,mp2,mp1,flac',
-+    '--enable-demuxer=aac,mp3,mov,dtshd,dts,avi,mpegvideo,m4v,h264,vc1,flac',
-+    '--enable-parser=aac,h264,mpegaudio,h263,mpeg4video,mpegvideo,ac3,aac3,h261,vc1,flac',
++    '--enable-decoder=aac,ac3,eac3,h264,mp1,mp2,mp3,mpeg4,mpegvideo,hevc,flv,dca,flac',
++    '--enable-demuxer=aac,h264,mp3,mp4,m4v,mpegvideo,mpegts,mov,avi,flv,dts,dtshd,vc1,flac',
++    '--enable-parser=aac,ac3,aac3,h261,h263,h264,mepgvideo,mpeg4video,mpegaudio,dca,hevc,vc1,flac',
    ])
 
    # ChromiumOS specific configuration.