[vlc-commits] es_format: es_format_IsSimilar: compare number of channels

Francois Cartegnie git at videolan.org
Mon Feb 27 23:08:22 CET 2017


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Feb 27 15:48:18 2017 +0100| [b65b94bbdc1176deaa9ace57fe010d61762c5111] | committer: Francois Cartegnie

es_format: es_format_IsSimilar: compare number of channels

This is implied through original/physical channels,
but channels mapping is not always set.

refs #8393

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b65b94bbdc1176deaa9ace57fe010d61762c5111
---

 src/misc/es_format.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/misc/es_format.c b/src/misc/es_format.c
index c2f320d..ab27a32 100644
--- a/src/misc/es_format.c
+++ b/src/misc/es_format.c
@@ -582,6 +582,7 @@ bool es_format_IsSimilar( const es_format_t *p_fmt1, const es_format_t *p_fmt2 )
         if( a1.i_format && a2.i_format && a1.i_format != a2.i_format )
             return false;
         if( a1.i_rate != a2.i_rate ||
+            a1.i_channels != a2.i_channels ||
             a1.i_physical_channels != a2.i_physical_channels ||
             a1.i_original_channels != a2.i_original_channels )
             return false;



More information about the vlc-commits mailing list