[vlc-commits] [Git][videolan/vlc][master] 9 commits: demux: adaptive: use C++ stdint, drop inttypes

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
b7d9a26f by Johannes Kauffmann at 2022-07-19T10:00:56+00:00
demux: adaptive: use C++ stdint, drop inttypes

The format specifiers provided by inttypes are not needed here.

- - - - -
c9ef23c0 by Johannes Kauffmann at 2022-07-19T10:00:56+00:00
access: dshow: add missing vector include

- - - - -
95eb7629 by Johannes Kauffmann at 2022-07-19T10:00:56+00:00
access: dshow: include C++ inttypes

PRId64 is still used in commented out code, so stdint is not enough.

- - - - -
3c5823e1 by Johannes Kauffmann at 2022-07-19T10:00:56+00:00
access: dshow: include C++ assert

- - - - -
8b4c9542 by Johannes Kauffmann at 2022-07-19T10:00:56+00:00
access: dshow: reorder includes

- - - - -
7408c8dd by Johannes Kauffmann at 2022-07-19T10:00:56+00:00
access: live555: use C++ stdint, drop inttypes

The format specifiers of inttypes are not needed here.

- - - - -
265bf2be by Johannes Kauffmann at 2022-07-19T10:00:56+00:00
access: live555: include C++ limits

- - - - -
e8a2a63d by Johannes Kauffmann at 2022-07-19T10:00:56+00:00
access: live555: include C++ assert

- - - - -
e21ba24d by Johannes Kauffmann at 2022-07-19T10:00:56+00:00
access: live555: reorder includes

- - - - -


3 changed files:

- modules/access/dshow/dshow.cpp
- modules/access/live555.cpp
- modules/demux/adaptive/ID.hpp


Changes:

=====================================
modules/access/dshow/dshow.cpp
=====================================
@@ -29,11 +29,12 @@
 # include "config.h"
 #endif
 
-#include <inttypes.h>
+#include <cassert>
+#include <cinttypes>         /* PRId64 */
 #include <list>
-#include <string>
-#include <assert.h>
 #include <stdexcept>
+#include <string>
+#include <vector>
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>


=====================================
modules/access/live555.cpp
=====================================
@@ -31,8 +31,11 @@
 # include "config.h"
 #endif
 
-#include <inttypes.h>
 #include <algorithm>
+#include <cassert>
+#include <climits>
+#include <cstdint>
+#include <new>
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
@@ -46,11 +49,6 @@
 #include <vlc_threads.h>
 #include <vlc_cxx_helpers.hpp>
 
-#include <limits.h>
-#include <assert.h>
-
-#include <new>
-
 #if defined( _WIN32 )
 #   include <winsock2.h>
 #endif


=====================================
modules/demux/adaptive/ID.hpp
=====================================
@@ -20,8 +20,8 @@
 #ifndef ID_HPP
 #define ID_HPP
 
+#include <cstdint>
 #include <string>
-#include <inttypes.h>
 
 namespace adaptive
 {



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fa32d2b043a8ddf48b61c3db444897fc0b56e99f...e21ba24dfd90016fe2c91f861e5498ebc019253a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fa32d2b043a8ddf48b61c3db444897fc0b56e99f...e21ba24dfd90016fe2c91f861e5498ebc019253a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance