[vlc-commits] flac: simplify expression

Rémi Denis-Courmont git at videolan.org
Sun Dec 3 16:57:45 CET 2017


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec  3 17:06:44 2017 +0200| [9abc61b8b8c9e18414bafe93622162adb59c4ece] | committer: Rémi Denis-Courmont

flac: simplify expression

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

 modules/demux/flac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index 33de6aacbc..477fb923ff 100644
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -485,8 +485,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     if( i_query == DEMUX_GET_META )
     {
         vlc_meta_t *p_meta = va_arg( args, vlc_meta_t * );
-        if( p_demux->p_sys->p_meta )
-            vlc_meta_Merge( p_meta, p_demux->p_sys->p_meta );
+        if( p_sys->p_meta )
+            vlc_meta_Merge( p_meta, p_sys->p_meta );
         return VLC_SUCCESS;
     }
     else if( i_query == DEMUX_HAS_UNSUPPORTED_META )



More information about the vlc-commits mailing list