[vlc-commits] mp4: GET_PTS_DELAY: Fallback to demux_vaControlHelper when no LOAD box is present

Hugo Beauzée-Luyssen git at videolan.org
Wed Jan 24 08:46:29 CET 2018


vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Jan 22 15:42:13 2018 +0100| [571e46a70902798130c48434e1dd1b34ea7c7167] | committer: Jean-Baptiste Kempf

mp4: GET_PTS_DELAY: Fallback to demux_vaControlHelper when no LOAD box is present

Fix regression introduced by e82fce4409620daf7a7c293c0c2233afc4c1a123 /
dd6a06e2ee71a4fc06983984ea87d9e3d6c1f0ce

(cherry picked from commit 103c285eb7fe03b0fa0be45745712cdaeb9a17ff)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/mp4/mp4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index f3eff3e1b0..ef7513f5f3 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -2084,7 +2084,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                     return VLC_SUCCESS;
                 }
             }
-            return VLC_EGENERIC;
+            return demux_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args );
         }
         case DEMUX_SET_NEXT_DEMUX_TIME:
         case DEMUX_SET_GROUP:



More information about the vlc-commits mailing list