From f0f83ff36600abc8715f3a11c31b2eeeda6c8c92 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 21 Oct 2014 13:16:48 +0200
Subject: player: add stream selection by ffmpeg index

Apparently using the stream index is the best way to refer to the same
streams across multiple FFmpeg-using programs, even if the stream index
itself is rarely meaningful in any way.

For Matroska, there are some possible problems, depending how FFmpeg
actually adds streams. Normally they seem to match though.
---
 options/options.c | 6 ++++++
 options/options.h | 3 +++
 2 files changed, 9 insertions(+)

(limited to 'options')

diff --git a/options/options.c b/options/options.c
index 4621df9b7e..0c2eb6a289 100644
--- a/options/options.c
+++ b/options/options.c
@@ -190,6 +190,9 @@ const m_option_t mp_opts[] = {
     OPT_TRACKCHOICE("vid", video_id),
     OPT_TRACKCHOICE("sid", sub_id),
     OPT_TRACKCHOICE("secondary-sid", sub2_id),
+    OPT_TRACKCHOICE("ff-aid", audio_id_ff),
+    OPT_TRACKCHOICE("ff-vid", video_id_ff),
+    OPT_TRACKCHOICE("ff-sid", sub_id_ff),
     OPT_FLAG_STORE("no-sub", sub_id, 0, -2),
     OPT_FLAG_STORE("no-video", video_id, 0, -2),
     OPT_FLAG_STORE("no-audio", audio_id, 0, -2),
@@ -635,6 +638,9 @@ const struct MPOpts mp_default_opts = {
     .audio_id = -1,
     .video_id = -1,
     .sub_id = -1,
+    .audio_id_ff = -1,
+    .video_id_ff = -1,
+    .sub_id_ff = -1,
     .sub2_id = -2,
     .audio_display = 1,
     .sub_visibility = 1,
diff --git a/options/options.h b/options/options.h
index adbb70e420..c535cce86c 100644
--- a/options/options.h
+++ b/options/options.h
@@ -165,6 +165,9 @@ typedef struct MPOpts {
     int video_id;
     int sub_id;
     int sub2_id;
+    int audio_id_ff;
+    int video_id_ff;
+    int sub_id_ff;
     char **audio_lang;
     char **sub_lang;
     int audio_display;
-- 
cgit v1.2.3