encode: add options --ovfirst and --oafirst

This allows to define which stream is to be used as first output stream.
This is useful because dvdauthor refuses VOB files where the audio
stream is the first stream.

1 files changed, 7 insertions, 7 deletions

diff --git a/mplayer.c b/mplayer.c
index d17be7c357..b62cb524ee 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3961,6 +3961,13 @@ goto_enable_cache:
 
     preselect_demux_streams(mpctx);
 
+#ifdef CONFIG_ENCODING
+    if (mpctx->encode_lavc_ctx && mpctx->current_track[STREAM_VIDEO])
+        encode_lavc_expect_stream(mpctx->encode_lavc_ctx, AVMEDIA_TYPE_VIDEO);
+    if (mpctx->encode_lavc_ctx && mpctx->current_track[STREAM_AUDIO])
+        encode_lavc_expect_stream(mpctx->encode_lavc_ctx, AVMEDIA_TYPE_AUDIO);
+#endif
+
     reinit_video_chain(mpctx);
     reinit_audio_chain(mpctx);
     reinit_subs(mpctx);
@@ -3988,13 +3995,6 @@ goto_enable_cache:
         goto terminate_playback;
     }
 
-#ifdef CONFIG_ENCODING
-    if (mpctx->encode_lavc_ctx && mpctx->sh_video)
-        encode_lavc_expect_stream(mpctx->encode_lavc_ctx, AVMEDIA_TYPE_VIDEO);
-    if (mpctx->encode_lavc_ctx && mpctx->sh_audio)
-        encode_lavc_expect_stream(mpctx->encode_lavc_ctx, AVMEDIA_TYPE_AUDIO);
-#endif
-
     if (opts->playing_msg) {
         char *msg = property_expand_string(mpctx, opts->playing_msg);
         mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s", msg);