[vlc-devel] [PATCH 14/39] decoder: store the decoder order of the decoder vout next to it

[Steve Lhomme]

---
 src/input/decoder.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 5985a4cde7b..f64c87cbadc 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -122,6 +122,7 @@ struct decoder_owner
     audio_output_t *p_aout;
 
     vout_thread_t   *p_vout;
+    enum vlc_vout_order vout_order;
     vlc_decoder_device *p_dec_dev; // TEMPORARY
 
     /* -- Theses variables need locking on read *and* write -- */
@@ -570,6 +571,7 @@ static int CreateVoutIfNeeded(struct decoder_owner *p_owner)
 
     vlc_mutex_lock( &p_owner->lock );
     p_owner->p_vout = p_vout;
+    p_owner->vout_order = order;
     if ( p_owner->p_dec_dev != NULL )
         vlc_decoder_device_Release( p_owner->p_dec_dev );
     p_owner->p_dec_dev = dec_dev;
@@ -708,6 +710,7 @@ static subpicture_t *ModuleThread_NewSpuBuffer( decoder_t *p_dec,
         }
 
         p_owner->p_vout = p_vout;
+        p_owner->vout_order = channel_order;
         vlc_mutex_unlock(&p_owner->lock);
 
         assert(channel_order != VLC_VOUT_ORDER_NONE);
-- 
2.17.1