Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
eb8ddf30 by Steve Lhomme at 2023-02-28T08:52:01+00:00
adaptive/mp4: don't force all included headers to be C files
Only functions exported from libmp4.h need to be in C.
- - - - -
2 changed files:
- modules/demux/adaptive/mp4/AtomsReader.hpp
- modules/demux/mp4/libmp4.h
Changes:
=====================================
modules/demux/adaptive/mp4/AtomsReader.hpp
=====================================
@@ -22,9 +22,7 @@
#include <vlc_common.h>
#include <vlc_stream.h>
-extern "C" {
#include "../../mp4/libmp4.h"
-}
namespace adaptive
{
=====================================
modules/demux/mp4/libmp4.h
=====================================
@@ -26,6 +26,10 @@
#include <vlc_codecs.h>
#include "coreaudio.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* Use alias for scaled time */
typedef int64_t stime_t;
@@ -1999,4 +2003,8 @@ int MP4_ReadBoxContainerRestricted( stream_t *p_stream,
MP4_Box_t *p_container,
int MP4_ReadBox_sample_vide( stream_t *p_stream, MP4_Box_t *p_box );
+#ifdef __cplusplus
+}
+#endif
+
#endif
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/eb8ddf30d554ba33663a8bf028122aaf91fd79a6
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/eb8ddf30d554ba33663a8bf028122aaf91fd79a6
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
