diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 000000000..fba03d32d
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,202 @@
+# This is a basic workflow to help you get started with Actions
+
+name: build
+
+# Controls when the workflow will run
+on:
+  push:
+    branches:
+      - master
+      - ytdl-ci
+  pull_request:
+    branches: [master]
+
+
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  vanilla:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install dependencies
+      run: |
+         sudo apt-get update
+         sudo apt-get install -y autoconf pkg-config libtool ninja-build python3-pip \
+         python3-setuptools unzip openssl ca-certificates nasm
+         sudo pip3 install meson
+    - name: set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: gradle 
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v2
+    - name: remove old ndk  
+      run: sdkmanager --uninstall "ndk;21.4.7075529"
+           rm -rf sdkmanager /usr/local/lib/android/sdk/ndk-bundle
+    - name: Install NDK
+      run: sdkmanager "ndk;24.0.8215888"
+    - name: download-deps
+      working-directory: ./buildscripts
+      run: |
+        export mpvarchoverride=armv7l
+        chmod +x github-prepare.sh
+        ./github-prepare.sh
+    - name: build-apk
+      working-directory: ./buildscripts
+      run:  |
+        ./buildall.sh -n
+    - name: relocate apks
+      run: |
+        mkdir -p app/build/outputs/apk/release
+        cp "./app/build/outputs/apk/default/release/app-default-release-unsigned.apk"  app/build/outputs/apk/release/mpv-default.apk
+        cp "./app/build/outputs/apk/api29/release/app-api29-release-unsigned.apk" app/build/outputs/apk/release/mpv-api29.apk
+        cp "./app/build/outputs/apk/api29/debug/app-api29-debug.apk" app/build/outputs/apk/release/mpv-api29-debug.apk
+        cp "./app/build/outputs/apk/default/debug/app-default-debug.apk" app/build/outputs/apk/release/mpv-default-debug.apk
+    - name: Sign APK
+      uses: r0adkll/sign-android-release@v1
+      # ID used to access action output
+      id: sign_app
+      with:
+        releaseDirectory: app/build/outputs/apk/release
+        signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+        alias: ${{ secrets.ALIAS }}
+        keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+      #  keyPassword: ${{ secrets.KEY_PASSWORD }}
+    - name : upload APKs
+      uses: actions/upload-artifact@v2
+      with:
+        name: Vanilla-Build
+        path: |
+                app/build/outputs/apk/release/mpv-default-signed.apk
+                app/build/outputs/apk/release/mpv-api29-signed.apk
+                app/build/outputs/apk/release/mpv-default-debug-signed.apk
+                app/build/outputs/apk/release/mpv-api29-debug-signed.apk
+
+
+  x86_64:
+      runs-on: ubuntu-20.04
+      steps:
+      - uses: actions/checkout@v3
+      - name: Install dependencies
+        run: |
+           sudo apt-get update
+           sudo apt-get install -y autoconf pkg-config libtool ninja-build python3-pip \
+           python3-setuptools unzip openssl ca-certificates nasm
+           sudo pip3 install meson
+      - name: set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: gradle 
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+      - name: remove old ndk  
+        run: sdkmanager --uninstall "ndk;21.4.7075529"
+             rm -rf sdkmanager /usr/local/lib/android/sdk/ndk-bundle
+      - name: Install NDK
+        run: sdkmanager "ndk;24.0.8215888"
+      - name: download-deps
+        working-directory: ./buildscripts
+        run: |
+          export mpvarchoverride=x86_64
+          chmod +x github-prepare.sh
+          ./github-prepare.sh x86_64
+      - name: build-apk
+        working-directory: ./buildscripts
+        run:  |
+          ./buildall.sh -n
+      - name: relocate apks
+        run: |
+          mkdir -p app/build/outputs/apk/release
+          cp "./app/build/outputs/apk/default/release/app-default-release-unsigned.apk"  app/build/outputs/apk/release/mpv-default.apk
+          cp "./app/build/outputs/apk/api29/release/app-api29-release-unsigned.apk" app/build/outputs/apk/release/mpv-api29.apk
+          cp "./app/build/outputs/apk/api29/debug/app-api29-debug.apk" app/build/outputs/apk/release/mpv-api29-debug.apk
+          cp "./app/build/outputs/apk/default/debug/app-default-debug.apk" app/build/outputs/apk/release/mpv-default-debug.apk
+      - name: Sign APK
+        uses: r0adkll/sign-android-release@v1
+        # ID used to access action output
+        id: sign_app
+        with:
+          releaseDirectory: app/build/outputs/apk/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+      - name : upload APKs
+        uses: actions/upload-artifact@v2
+        with:
+          name: x86_64-Build
+          path: |
+                app/build/outputs/apk/release/mpv-default-signed.apk
+                app/build/outputs/apk/release/mpv-api29-signed.apk
+                app/build/outputs/apk/release/mpv-default-debug-signed.apk
+                app/build/outputs/apk/release/mpv-api29-debug-signed.apk
+  Arm86:
+      runs-on: ubuntu-20.04
+      steps:
+      - uses: actions/checkout@v3
+      - name: Install dependencies
+        run: |
+           sudo apt-get update
+           sudo apt-get install -y autoconf pkg-config libtool ninja-build python3-pip \
+           python3-setuptools unzip openssl ca-certificates nasm
+           sudo pip3 install meson
+      - name: set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: gradle 
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+      - name: remove old ndk  
+        run: sdkmanager --uninstall "ndk;21.4.7075529"
+             rm -rf sdkmanager /usr/local/lib/android/sdk/ndk-bundle
+      - name: Install NDK
+        run: sdkmanager "ndk;24.0.8215888"
+      - name: download-deps
+        working-directory: ./buildscripts
+        run: |
+          export mpvarchoverride=arm64
+          chmod +x github-prepare.sh
+          ./github-prepare.sh arm64
+      - name: build-apk
+        working-directory: ./buildscripts
+        run:  |
+          ./buildall.sh -n
+      - name: relocate apks
+        run: |
+          mkdir -p app/build/outputs/apk/release
+          cp "./app/build/outputs/apk/default/release/app-default-release-unsigned.apk"  app/build/outputs/apk/release/mpv-default.apk
+          cp "./app/build/outputs/apk/api29/release/app-api29-release-unsigned.apk" app/build/outputs/apk/release/mpv-api29.apk
+          cp "./app/build/outputs/apk/api29/debug/app-api29-debug.apk" app/build/outputs/apk/release/mpv-api29-debug.apk
+          cp "./app/build/outputs/apk/default/debug/app-default-debug.apk" app/build/outputs/apk/release/mpv-default-debug.apk
+      - name: Sign APK
+        uses: r0adkll/sign-android-release@v1
+        # ID used to access action output
+        id: sign_app
+        with:
+          releaseDirectory: app/build/outputs/apk/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+      - name : upload APKs
+        uses: actions/upload-artifact@v2
+        with:
+          name: Arm-Build
+          path: |
+                app/build/outputs/apk/release/mpv-default-signed.apk
+                app/build/outputs/apk/release/mpv-api29-signed.apk
+                app/build/outputs/apk/release/mpv-default-debug-signed.apk
+                app/build/outputs/apk/release/mpv-api29-debug-signed.apk
diff --git a/.gitignore b/.gitignore
index ae4d27e96..d34101282 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ obj
 build
 local.properties
 *~
+app/src/main/assets/ytdl/python*
diff --git a/app/build.gradle b/app/build.gradle
index 25b3d6bcc..a8af5cbf0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 28
         versionCode 28
         versionName "2022-03-23-release"
         vectorDrawables.useSupportLibrary = true
@@ -26,6 +26,10 @@ android {
     buildFeatures {
         viewBinding = true
     }
+
+    lintOptions {
+        disable 'ExpiredTargetSdkVersion'
+    }
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3da8357be..c733bceaf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -166,6 +166,81 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="text/plain" />
             </intent-filter>
+            <!-- various URL intent filters for popular youtube-dl extractors -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="*.youtube.com" />
+                <data android:pathPattern="/watch.*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtube.com" />
+                <data android:pathPattern="/watch.*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtu.be" />
+                <data android:pathPattern=".*" />
+            </intent-filter>
+
+            <intent-filter> <!-- FIXME: all following patterns are suboptimal because they also match the homepages -->
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="www.vimeo.com" />
+                <data android:pathPattern=".*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="vimeo.com" />
+                <data android:pathPattern=".*" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="twitch.tv" />
+                <data android:pathPattern=".*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="m.twitch.tv" />
+                <data android:pathPattern=".*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="clips.twitch.tv" />
+                <data android:pathPattern=".*" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".MainActivity"
diff --git a/app/src/main/assets/ytdl/setup.py b/app/src/main/assets/ytdl/setup.py
new file mode 100644
index 000000000..884445aba
--- /dev/null
+++ b/app/src/main/assets/ytdl/setup.py
@@ -0,0 +1,36 @@
+import sys, os, urllib.request
+
+scriptdest = "../youtube-dl"
+targets = {
+	"youtube-dl": "https://youtube-dl.org/downloads/latest/youtube-dl",
+	"yt-dlp": "https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp",
+}
+
+# Clean up old files first
+try:
+	os.unlink(scriptdest)
+except:
+	pass
+for name in targets.keys():
+	try:
+		os.unlink(name)
+	except:
+		pass
+
+name = sys.argv[1].lower()
+url = targets[name]
+print("Downloading '%s'..." % url)
+try:
+	urllib.request.urlretrieve(url, name)
+except urllib.error.HTTPError as e:
+	print(e)
+	exit(1)
+except urllib.error.ContentTooShortError as e:
+	print("Download interrupted!")
+	exit(1)
+print("OK.")
+
+# Write wrapper script
+with open(scriptdest, "w") as f:
+	f.write("""#!/system/bin/sh\nexec "$(dirname "$0")/ytdl/wrapper" %s "$@"\n""" % name)
+os.chmod(scriptdest, 0o700)
diff --git a/app/src/main/assets/ytdl/wrapper b/app/src/main/assets/ytdl/wrapper
new file mode 100644
index 000000000..241293a77
--- /dev/null
+++ b/app/src/main/assets/ytdl/wrapper
@@ -0,0 +1,5 @@
+#!/system/bin/sh
+cd $(dirname "$0")
+export PYTHONHOME=.
+export SSL_CERT_FILE=$PWD/../cacert.pem
+exec ./python3 "$@"
diff --git a/app/src/main/java/is/xyz/mpv/MPVActivity.kt b/app/src/main/java/is/xyz/mpv/MPVActivity.kt
index 4503f236e..d686eeff9 100644
--- a/app/src/main/java/is/xyz/mpv/MPVActivity.kt
+++ b/app/src/main/java/is/xyz/mpv/MPVActivity.kt
@@ -251,6 +251,16 @@ class MPVActivity : AppCompatActivity(), MPVLib.EventObserver, TouchGesturesObse
             return
         }
 
+        // Remind user if they forgot to set up youtube-dl
+        if (!filepath.startsWith("/") && !filepath.substringAfterLast('/').contains('.')) {
+            if (!File("${filesDir.path}/youtube-dl").exists()) {
+                with (Toast.makeText(this, R.string.toast_need_ytdl, Toast.LENGTH_LONG)) {
+                    setGravity(toast.gravity, 0, 0)
+                    show()
+                }
+            }
+        }
+
         player.initialize(applicationContext.filesDir.path)
         player.addObserver(this)
         player.playFile(filepath)
diff --git a/app/src/main/java/is/xyz/mpv/MPVView.kt b/app/src/main/java/is/xyz/mpv/MPVView.kt
index cb02a668d..2c09f3f2a 100644
--- a/app/src/main/java/is/xyz/mpv/MPVView.kt
+++ b/app/src/main/java/is/xyz/mpv/MPVView.kt
@@ -100,6 +100,14 @@ internal class MPVView(context: Context, attrs: AttributeSet) : SurfaceView(cont
             MPVLib.setOptionString("vd-lavc-skiploopfilter", "nonkey")
         }
 
+        MPVLib.setOptionString("ytdl", "yes")
+        sharedPreferences.getString("video_ytdl_format", "")?.also {
+            if (it.isNotEmpty())
+                MPVLib.setOptionString("ytdl-format", it)
+        }
+
+        // set basic options
+
         MPVLib.setOptionString("vo", "gpu")
         MPVLib.setOptionString("gpu-context", "android")
         MPVLib.setOptionString("hwdec", hwdec)
diff --git a/app/src/main/java/is/xyz/mpv/Utils.kt b/app/src/main/java/is/xyz/mpv/Utils.kt
index 89cb39cc2..a7a378447 100644
--- a/app/src/main/java/is/xyz/mpv/Utils.kt
+++ b/app/src/main/java/is/xyz/mpv/Utils.kt
@@ -23,8 +23,12 @@ import kotlin.math.abs
 object Utils {
     fun copyAssets(context: Context) {
         val assetManager = context.assets
-        val files = arrayOf("subfont.ttf", "cacert.pem")
+        val files = arrayOf(
+            "subfont.ttf", "cacert.pem",
+            "ytdl/python3", "ytdl/python39.zip", "ytdl/setup.py", "ytdl/wrapper"
+        )
         val configDir = context.filesDir.path
+        File("$configDir/ytdl").mkdir()
         for (filename in files) {
             var ins: InputStream? = null
             var out: OutputStream? = null
@@ -47,6 +51,13 @@ object Utils {
                 out?.close()
             }
         }
+
+        val execFiles = arrayOf("ytdl/python3", "ytdl/wrapper")
+        for (filename in execFiles) {
+            try {
+                File("$configDir/$filename").setExecutable(true)
+            } catch (e: IOException) {}
+        }
     }
 
     fun hasSoftwareKeys(activity: Activity): Boolean {
diff --git a/app/src/main/java/is/xyz/mpv/config/YtdlFormatPreference.kt b/app/src/main/java/is/xyz/mpv/config/YtdlFormatPreference.kt
new file mode 100644
index 000000000..382dcacb0
--- /dev/null
+++ b/app/src/main/java/is/xyz/mpv/config/YtdlFormatPreference.kt
@@ -0,0 +1,74 @@
+package `is`.xyz.mpv.config
+
+import `is`.xyz.mpv.R
+import `is`.xyz.mpv.databinding.YtdlFormatPrefBinding
+import android.content.Context
+import android.preference.DialogPreference
+import android.util.AttributeSet
+import android.view.View
+import android.widget.ArrayAdapter
+
+class YtdlFormatPreference @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = android.R.attr.dialogPreferenceStyle,
+    defStyleRes: Int = 0
+): DialogPreference(context, attrs, defStyleAttr, defStyleRes) {
+    init {
+        isPersistent = false
+        dialogLayoutResource = R.layout.ytdl_format_pref
+    }
+
+    private lateinit var binding: YtdlFormatPrefBinding
+
+    override fun onBindDialogView(view: View) {
+        super.onBindDialogView(view)
+        binding = YtdlFormatPrefBinding.bind(view)
+
+        // parse current states from the string, a bit ugly but whatever
+        val qstr = sharedPreferences.getString(key, "")!!
+        val selectedQuality = qstr.substringAfter("[height<=?").substringBefore("]").toIntOrNull() ?: -1
+        val preferH264 = qstr.contains("[vcodec^=?avc]")
+
+        // populate elements
+        binding.switch1.isChecked = preferH264
+
+        val qualityStrings = qualityLevels.map {
+            if (it == -1) context.getString(R.string.quality_any) else "${it}p"
+        }
+        binding.spinner1.adapter = ArrayAdapter(context, R.layout.scaler_pref_textview, qualityStrings)
+        val idx = qualityLevels.indexOf(selectedQuality)
+        if (idx != -1)
+            binding.spinner1.setSelection(idx, false)
+    }
+
+    override fun onDialogClosed(positiveResult: Boolean) {
+        super.onDialogClosed(positiveResult)
+        if (!positiveResult)
+            return
+
+        val selectedQuality = qualityLevels[binding.spinner1.selectedItemPosition]
+        val preferH264 = binding.switch1.isChecked
+
+        var qstr = ""
+        if (selectedQuality != -1 && preferH264) {
+            qstr = "(bestvideo[vcodec^=?avc]/bestvideo[vcodec^=?mp4])[height<=?${selectedQuality}]+bestaudio/" +
+                    "([vcodec^=?avc]/[vcodec^=?mp4])[height<=?${selectedQuality}]"
+        } else if (selectedQuality != -1) {
+            qstr = "bestvideo[height<=?${selectedQuality}]+bestaudio/[height<=?${selectedQuality}]"
+        } else if (preferH264) {
+            qstr = "(bestvideo[vcodec^=?avc]/bestvideo[vcodec^=?mp4])+bestaudio/([vcodec^=?avc]/[vcodec^=?mp4])"
+        }
+        if (qstr.isNotEmpty())
+            qstr += "/bestvideo+bestaudio/best"
+
+        with (editor) {
+            putString(key, qstr)
+            commit()
+        }
+    }
+
+    companion object {
+        private val qualityLevels = arrayOf(-1, 1440, 1080, 720, 480)
+    }
+}
diff --git a/app/src/main/java/is/xyz/mpv/config/YtdlUpdateDialog.kt b/app/src/main/java/is/xyz/mpv/config/YtdlUpdateDialog.kt
new file mode 100644
index 000000000..fb0aabf17
--- /dev/null
+++ b/app/src/main/java/is/xyz/mpv/config/YtdlUpdateDialog.kt
@@ -0,0 +1,96 @@
+package `is`.xyz.mpv.config
+
+import `is`.xyz.mpv.R
+import `is`.xyz.mpv.Utils
+import `is`.xyz.mpv.databinding.YtdlUpdatePrefBinding
+import android.content.Context
+import android.preference.DialogPreference
+import android.text.method.ScrollingMovementMethod
+import android.util.AttributeSet
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import java.io.File
+import java.io.IOException
+import kotlin.concurrent.thread
+
+class YtdlUpdateDialog @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = android.R.attr.dialogPreferenceStyle,
+    defStyleRes: Int = 0
+): DialogPreference(context, attrs, defStyleAttr, defStyleRes) {
+    init {
+        isPersistent = false
+        dialogLayoutResource = R.layout.ytdl_update_pref
+    }
+
+    private lateinit var binding: YtdlUpdatePrefBinding
+    private var proc: Process? = null
+
+    override fun onBindDialogView(view: View) {
+        super.onBindDialogView(view)
+        binding = YtdlUpdatePrefBinding.bind(view)
+
+        Utils.copyAssets(context)
+
+        binding.info.movementMethod = ScrollingMovementMethod()
+        binding.installBtn.setOnClickListener {
+            with (AlertDialog.Builder(context, R.style.FilePickerAlertDialogTheme)) {
+                setSingleChoiceItems(setupChoices, -1) { dialog, item ->
+                    val choice = setupChoices[item]
+                    dialog.dismiss()
+                    runProcess("Setting up $choice:", mutableListOf("ytdl/wrapper", "setup.py", choice))
+                }
+                show()
+            }
+        }
+        binding.updateBtn.setOnClickListener {
+            runProcess("Running youtube-dl --update:", mutableListOf("youtube-dl", "--update"))
+        }
+        binding.updateBtn.isEnabled = File("${context.filesDir.path}/youtube-dl").exists()
+    }
+
+    private fun runProcess(initText: String, command: MutableList<String>)
+    {
+        if (proc != null)
+            return
+
+        var text = initText + "\n"
+        binding.info.text = text
+
+        command[0] = "${context.filesDir.path}/${command[0]}"
+        try {
+            with (ProcessBuilder(command)) {
+                redirectErrorStream(true)
+                proc = start()
+            }
+        } catch (e: Exception) {
+            text += e.message
+            binding.info.text = text
+            return
+        }
+
+        thread {
+            val buf = ByteArray(1024)
+            try {
+                do {
+                    val n = proc!!.inputStream.read(buf)
+                    if (n > 0) {
+                        text += String(buf.copyOfRange(0, n))
+                        binding.info.post { binding.info.text = text }
+                    }
+                } while (n != -1)
+            } catch (e: IOException) {}
+            proc = null
+        }
+    }
+
+    override fun onDialogClosed(positiveResult: Boolean) {
+        super.onDialogClosed(positiveResult)
+        proc?.destroy()
+    }
+
+    companion object {
+        private val setupChoices = arrayOf("youtube-dl", "yt-dlp")
+    }
+}
diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index 102dd35e0..f71dd65ba 100644
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -1,5 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
-
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+PREFIX = $(PREFIX32)
+endif
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
 PREFIX = $(PREFIX64)
 endif
diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk
index fa5b0e51b..fcfa92c9d 100644
--- a/app/src/main/jni/Application.mk
+++ b/app/src/main/jni/Application.mk
@@ -1,4 +1,6 @@
+ifneq ($(PREFIX32),)
 APP_ABI := armeabi-v7a
+endif
 ifneq ($(PREFIX64),)
 APP_ABI += arm64-v8a
 endif
diff --git a/app/src/main/res/layout/ytdl_format_pref.xml b/app/src/main/res/layout/ytdl_format_pref.xml
new file mode 100644
index 000000000..edca76f00
--- /dev/null
+++ b/app/src/main/res/layout/ytdl_format_pref.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@android:id/message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp" />
+
+    <TableRow
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/max_quality"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+        <Spinner
+            android:id="@+id/spinner1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </TableRow>
+
+    <Switch
+        android:id="@+id/switch1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:switchPadding="8dp"
+        android:text="@string/prefer_h264_switch" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/ytdl_update_pref.xml b/app/src/main/res/layout/ytdl_update_pref.xml
new file mode 100644
index 000000000..1ab423731
--- /dev/null
+++ b/app/src/main/res/layout/ytdl_update_pref.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" android:layout_height="match_parent"
+    android:orientation="vertical" android:padding="16dp">
+
+    <TableRow
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <Button
+            android:id="@+id/installBtn"
+            style="@style/Widget.AppCompat.Button.Colored"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/action_install" />
+
+        <Button
+            android:id="@+id/updateBtn"
+            style="@style/Widget.AppCompat.Button.Colored"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/action_update" />
+
+    </TableRow>
+
+    <HorizontalScrollView
+        android:layout_width="match_parent" android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="monospace"
+            android:scrollbars="vertical"
+            android:scrollHorizontally="true"
+            android:text="@string/option_instructions"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+    </HorizontalScrollView>
+
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5e5d55439..652e01d04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
     <string name="sub_delay">Subtitle delay</string>
     <string name="notice_show_all_files">Showing all files</string>
     <string name="notice_show_media_files">Showing media files only</string>
+    <string name="toast_need_ytdl">To play content from video platforms youtube-dl needs to be set up first.\nGo to Settings > Advanced and install youtube-dl there.</string>
 
     <!-- Action buttons -->
     <string name="switch_orientation">Switch Orientation</string>
@@ -104,6 +105,9 @@
     <string name="pref_no_ui_pause_summary">Select if playback should continue while popups are open (e.g. playlist dialog)</string>
     <string name="pref_no_ui_pause_default" translatable="false">audio-only</string>
 
+    <string name="pref_ytdl_format_title">Youtube-dl format</string>
+    <string name="pref_ytdl_format_message">The settings here influence the format/quality chosen by youtube-dl.</string>
+
     <string name="pref_seek_gesture_smooth_title">Smoother seeking</string>
 
     <string name="pref_gesture_horiz_title">Horizontal drag</string>
@@ -160,11 +164,19 @@
     <string name="pref_edit_input_conf">Edit input.conf</string>
     <string name="pref_edit_input_conf_message">You can edit input.conf here, this is mainly useful for TV remotes and keyboards.\n\nImportant: mpv-android has some hardcoded keys which can\'t be redefined here, e.g. \'j\' to cycle subtitles.</string>
 
+    <string name="pref_ytdl_update">Install/Update youtube-dl</string>
+
     <!-- Strings used in Settings dialog preferences -->
     <string name="scaler_param1">Param 1:</string>
     <string name="scaler_param2">Param 2:</string>
     <string name="interpolation_switch">Enable Interpolation</string>
     <string name="interpolation_video_sync">Video sync:</string>
+    <string name="action_install">Install</string>
+    <string name="action_update">Update</string>
+    <string name="option_instructions">Select an option above.</string>
+    <string name="prefer_h264_switch">Prefer H.264</string>
+    <string name="max_quality">Max. Quality:</string>
+    <string name="quality_any">Any</string>
 
     <!-- File picker -->
     <string name="nnf_name">Name</string>
diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index 3b90feeb4..8f4b75ec2 100644
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -17,6 +17,11 @@
         android:positiveButtonText="@string/dialog_save"
         android:negativeButtonText="@string/dialog_cancel" />
 
+    <is.xyz.mpv.config.YtdlUpdateDialog
+        android:key=""
+        android:title="@string/pref_ytdl_update"
+        android:negativeButtonText="@null" />
+
     <is.xyz.mpv.config.VersionInfoDialog
         android:key=""
         android:title="@string/pref_version_info"
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 8d7b4dc67..40f55b8ec 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -47,4 +47,9 @@
         android:summary=""
         android:title="@string/pref_display_in_cutout_title" />
 
+    <is.xyz.mpv.config.YtdlFormatPreference
+        android:key="video_ytdl_format"
+        android:dialogMessage="@string/pref_ytdl_format_message"
+        android:title="@string/pref_ytdl_format_title" />
+
 </PreferenceScreen>
diff --git a/buildscripts/buildall.sh b/buildscripts/buildall.sh
index 8f34cde3f..48b7fdcad 100755
--- a/buildscripts/buildall.sh
+++ b/buildscripts/buildall.sh
@@ -7,7 +7,13 @@ cleanbuild=0
 nodeps=0
 clang=1
 target=mpv-android
+
+if [ -z $mpvarchoverride ]
+then
 arch=armv7l
+else
+arch=$mpvarchoverride
+fi
 
 getdeps () {
 	varname="dep_${1//-/_}[*]"
@@ -114,6 +120,8 @@ build () {
 usage () {
 	echo "Usage: buildall.sh [options] [target]"
 	echo "Builds the specified target (default: $target)"
+	echo "Setting the enviroment variable 'mpvarchoverride=[target]' will override default architecture"
+	echo "Running buildall.sh after setting mpvarchoverride=arm64 will build only arm64. Accepts same arguments as --arch" 
 	echo "-n             Do not build dependencies"
 	echo "--clean        Clean build dirs before compiling"
 	echo "--gcc          Use gcc compiler (unsupported!)"
diff --git a/buildscripts/github-prepare.sh b/buildscripts/github-prepare.sh
new file mode 100644
index 000000000..3e44a84dc
--- /dev/null
+++ b/buildscripts/github-prepare.sh
@@ -0,0 +1,36 @@
+#!/bin/bash -e
+
+. ./include/depinfo.sh
+export WGET="wget"
+
+echo "==> Fetching mpv"
+mkdir -p deps/mpv
+$WGET https://github.com/mpv-player/mpv/archive/master.tar.gz -O master.tgz
+tar -xzf master.tgz -C deps/mpv --strip-components=1 && rm master.tgz
+
+echo "==> Trying to fetch existing prefix"
+mkdir -p build_prefix
+
+echo "==> Fetching deps"
+./include/download-deps.sh
+
+
+if [ "$1" == "arm64" ]; then
+./buildall.sh --arch arm64 mpv
+elif [ "$1" == "x86_64" ]; then
+./buildall.sh --arch x86_64 mpv
+fi
+
+# build everything mpv depends on (but not mpv itself)
+for x in ${dep_mpv[@]}; do
+	echo "==> Building $x"
+	./buildall.sh $x
+done
+	
+echo "==> Building mpv"
+./buildall.sh -n mpv || {
+	# show logfile if configure failed
+	[ ! -f deps/mpv/_build/config.h ] && cat deps/mpv/_build/config.log
+	exit 1
+}
+exit 0
diff --git a/buildscripts/include/depinfo.sh b/buildscripts/include/depinfo.sh
index 6e6b349b6..304d3109d 100755
--- a/buildscripts/include/depinfo.sh
+++ b/buildscripts/include/depinfo.sh
@@ -11,6 +11,8 @@ v_harfbuzz=4.0.1
 v_fribidi=1.0.11
 v_freetype=2-11-1
 v_mbedtls=2.28.0
+v_openssl=1.1.1n
+v_python=3.9.12
 
 
 ## Dependency tree
@@ -25,7 +27,9 @@ dep_harfbuzz=()
 dep_libass=(freetype2 fribidi harfbuzz)
 dep_lua=()
 dep_mpv=(ffmpeg libass lua)
-dep_mpv_android=(mpv)
+dep_openssl=()
+dep_python=(openssl)
+dep_mpv_android=(mpv python)
 
 
 ## Travis-related
diff --git a/buildscripts/include/download-deps.sh b/buildscripts/include/download-deps.sh
index dafe8ae55..357745a80 100755
--- a/buildscripts/include/download-deps.sh
+++ b/buildscripts/include/download-deps.sh
@@ -53,4 +53,37 @@ fi
 # mpv
 [ ! -d mpv ] && git clone https://github.com/mpv-player/mpv
 
+# openssl
+if [ ! -d openssl ]; then
+	mkdir openssl
+	$WGET https://www.openssl.org/source/openssl-$v_openssl.tar.gz -O - | \
+		tar -xz -C openssl --strip-components=1
+fi
+
+# python
+if [ ! -d python ]; then
+	mkdir python
+	$WGET https://www.python.org/ftp/python/$v_python/Python-$v_python.tar.xz -O- | \
+		tar -xJ -C python --strip-components=1
+
+	cd python
+	for name in inplace static_modules; do
+		patch -p0 --verbose <../../include/py/$name.patch
+	done
+	# Enables all modules *except* these
+	python3 ../../include/py/uncomment.py Modules/Setup \
+		'readline|_test|spwd|grp|_crypt|nis|termios|resource|audio|_md5|_sha[125]|_tkinter|syslog|_curses|_g?dbm|_(multibyte)?codec'
+	# SSL path is not used
+	sed 's|^SSL=.*|SSL=/var/empty|' -i Modules/Setup
+	# hashlib via openssl
+	echo '_hashlib _hashopenssl.c -lcrypto' >>Modules/Setup
+	cd ..
+fi
+
 cd ..
+
+# youtube-dl
+$WGET https://kitsunemimi.pw/ytdl/dist.zip
+unzip dist.zip -d ../app/src/main/assets/ytdl
+rm -f ../app/src/main/assets/ytdl/youtube-dl # don't need it
+rm dist.zip
diff --git a/buildscripts/include/path.sh b/buildscripts/include/path.sh
index feb63ddb4..8cd72cce1 100755
--- a/buildscripts/include/path.sh
+++ b/buildscripts/include/path.sh
@@ -23,6 +23,7 @@ if [ -n "$ndk_triple" ]; then
 	unset PKG_CONFIG_PATH
 fi
 
-toolchain=$(echo "$DIR/sdk/android-ndk-r24/toolchains/llvm/prebuilt/"*)
-export PATH="$toolchain/bin:$DIR/sdk/android-ndk-r24:$DIR/sdk/bin:$PATH"
-export ANDROID_HOME="$DIR/sdk/android-sdk-$os"
+SDK=/usr/local/lib/android/sdk
+NDK=$SDK/ndk/24.0.8215888
+toolchain=$(echo "$NDK/toolchains/llvm/prebuilt/"*)
+export PATH="$toolchain/bin:$NDK:$SDK/bin:$PATH"
diff --git a/buildscripts/include/py/inplace.patch b/buildscripts/include/py/inplace.patch
new file mode 100644
index 000000000..679a4a956
--- /dev/null
+++ b/buildscripts/include/py/inplace.patch
@@ -0,0 +1,11 @@
+--- Modules/getpath.c.orig	2021-03-11 11:47:42.769657798 +0100
++++ Modules/getpath.c	2021-03-11 11:52:26.920159439 +0100
+@@ -1293,7 +1293,7 @@
+     PyStatus res;
+ 
+     /* Path: <platlibdir> / "pythonXY.zip" */
+-    wchar_t *path = joinpath2(calculate->platlibdir,
++    wchar_t *path = _PyMem_RawWcsdup(
+                               L"python" Py_STRINGIFY(PY_MAJOR_VERSION) Py_STRINGIFY(PY_MINOR_VERSION)
+                               L".zip");
+     if (path == NULL) {
diff --git a/buildscripts/include/py/static_modules.patch b/buildscripts/include/py/static_modules.patch
new file mode 100644
index 000000000..1097aa1fb
--- /dev/null
+++ b/buildscripts/include/py/static_modules.patch
@@ -0,0 +1,10 @@
+--- setup.py	2019-03-25 21:21:05.000000000 +0100
++++ setup.py	2019-06-21 16:52:23.151217709 +0200
+@@ -379,6 +379,7 @@
+             print()
+ 
+     def build_extension(self, ext):
++        return print('WARNING: not building extension "%s"' % ext.name)
+ 
+         if ext.name == '_ctypes':
+             if not self.configure_ctypes(ext):
diff --git a/buildscripts/include/py/uncomment.py b/buildscripts/include/py/uncomment.py
new file mode 100644
index 000000000..d12802d8f
--- /dev/null
+++ b/buildscripts/include/py/uncomment.py
@@ -0,0 +1,13 @@
+import sys, re
+with open(sys.argv[1], "r") as f:
+	lines = f.readlines()
+for i, l in enumerate(lines):
+	if not l.startswith("#") or l[1] in " \t\n" or re.match(sys.argv[2], l[1:]): continue
+	elif l.startswith("#*shared*"): continue
+	elif l.startswith("#*disabled*"): break
+	lines[i] = l.lstrip("#")
+	while lines[i].strip().endswith("\\"):
+		i += 1
+		lines[i] = lines[i].lstrip("#")
+with open(sys.argv[1], "w") as f:
+	f.writelines(lines)
diff --git a/buildscripts/scripts/mpv-android.sh b/buildscripts/scripts/mpv-android.sh
index e7f849d79..a2ae4c3fb 100755
--- a/buildscripts/scripts/mpv-android.sh
+++ b/buildscripts/scripts/mpv-android.sh
@@ -24,11 +24,12 @@ nativeprefix () {
 	fi
 }
 
+prefix32=$(nativeprefix "armv7l")
 prefix64=$(nativeprefix "arm64")
 prefix_x64=$(nativeprefix "x86_64")
 prefix_x86=$(nativeprefix "x86")
 
-PREFIX=$BUILD/prefix/armv7l PREFIX64=$prefix64 PREFIX_X64=$prefix_x64 PREFIX_X86=$prefix_x86 \
+PREFIX=$BUILD/prefix/armv7l PREFIX64=$prefix64 PREFIX32=$prefix32 PREFIX_X64=$prefix_x64 PREFIX_X86=$prefix_x86 \
 ndk-build -C app/src/main -j$cores
 ./gradlew assembleDebug assembleRelease
 
diff --git a/buildscripts/scripts/openssl.sh b/buildscripts/scripts/openssl.sh
new file mode 100755
index 000000000..79ba6fcf8
--- /dev/null
+++ b/buildscripts/scripts/openssl.sh
@@ -0,0 +1,36 @@
+#!/bin/bash -e
+
+. ../../include/path.sh
+
+if [ "$1" == "build" ]; then
+	true
+elif [ "$1" == "clean" ]; then
+	rm -rf _build$ndk_suffix
+	exit 0
+else
+	exit 255
+fi
+
+export CFLAGS="-Os"
+
+mkdir -p _build$ndk_suffix
+cd _build$ndk_suffix
+
+case "$ndk_triple" in
+	arm*)
+	target=linux-armv4
+	;;
+	aarch64*)
+	target=linux-aarch64
+	;;
+	i686*)
+	target=linux-x86-clang
+	;;
+	x86_64*)
+	target=linux-x86_64-clang
+	;;
+esac
+
+../Configure $target no-shared
+make -j$cores
+make DESTDIR="$prefix_dir" install_sw
diff --git a/buildscripts/scripts/python.sh b/buildscripts/scripts/python.sh
new file mode 100755
index 000000000..1968930ba
--- /dev/null
+++ b/buildscripts/scripts/python.sh
@@ -0,0 +1,83 @@
+#!/bin/bash -e
+
+. ../../include/path.sh
+. ../../include/depinfo.sh
+
+if [ "$1" == "build" ]; then
+	true
+elif [ "$1" == "clean" ]; then
+	rm -rf _build$ndk_suffix
+	exit 0
+else
+	exit 255
+fi
+
+# TODO figure this out
+if [[ -z "$mpvarchoverride" && "$ndk_triple" != "arm"* ]]; then
+	echo "Skipping build for $ndk_triple, only supposed to run on ARM (for now)"
+	echo "To build anyway set DOIT=1 env variable"
+	exit 0
+fi
+#
+
+hostpy=python${v_python:0:3}
+if ! command -v $hostpy; then
+	echo "compatible Python ($hostpy) is required to build"
+	exit 1
+fi
+
+# the NDK no longer ships binutils but python requires it...
+export READELF=$(command -v readelf)
+if ! command -v $READELF; then
+	echo "binutils ($READELF) is required to build"
+	exit 1
+fi
+
+function recompile_py () {
+	find . -name '*.pyc' -delete
+	$hostpy -OO -m compileall -b -j4 .
+	# leave only the legacy locations (*.pyc next to *.py)
+	find . -name "__pycache__" -print0 | xargs -0 -- rm -rf
+}
+
+function stub_ctypes () {
+	rm -rf ctypes && mkdir -p ctypes
+	cat >ctypes/__init__.py <<"FILE"
+class cdll():
+  @staticmethod
+  def LoadLibrary(lib):
+    raise OSError
+FILE
+}
+
+export CFLAGS="-Os -I$prefix_dir/include"
+export LDFLAGS="-L$prefix_dir/lib"
+
+mkdir -p _build$ndk_suffix
+cd _build$ndk_suffix
+
+ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no \
+../configure --host=$ndk_triple --build=${ndk_triple%%-*} \
+	--enable-ipv6 --disable-shared --without-ensurepip
+make -j$cores
+rm -rf dest
+make DESTDIR="$PWD/dest" install
+inst=$PWD/dest/usr/local
+
+out=$(realpath ../../../../app/src/main/assets/ytdl)
+rm -f $out/python*
+# copy & strip executable
+cp -v python $out/python3
+llvm-strip -s $out/python3
+# clean stdlib to save space
+pushd $inst/lib/python3.*
+rm -r pydoc_data turtledemo # docs
+rm -r test unittest/test # unittests
+rm -r tkinter sqlite3 venv ensurepip # non-functional anyway
+stub_ctypes # not compiled but needed by youtube-dl
+rm -r lib2to3 idlelib distutils multiprocessing # not used by youtube-dl
+# package stdlib into .zip file
+recompile_py
+zip -9 $out/python3${v_python:2:1}.zip -R '*.pyc'
+popd
+cd ..