vlc | branch: master | Francois Cartegnie <[email protected]> | Fri Mar 25 15:54:11 2016 +0100| [dec77333661e4d2d63c592bfb527f9c7ab565d8d] | committer: Francois Cartegnie
packetizer: hxxx: fix include order > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dec77333661e4d2d63c592bfb527f9c7ab565d8d --- modules/packetizer/h264_nal.c | 3 +++ modules/packetizer/h264_nal.h | 5 ----- modules/packetizer/hevc_nal.c | 3 +++ modules/packetizer/hevc_nal.h | 5 ----- modules/packetizer/hxxx_common.c | 4 ++++ modules/packetizer/hxxx_common.h | 4 ---- modules/packetizer/hxxx_nal.c | 3 +++ modules/packetizer/hxxx_nal.h | 4 ---- 8 files changed, 13 insertions(+), 18 deletions(-) diff --git a/modules/packetizer/h264_nal.c b/modules/packetizer/h264_nal.c index 3563cfa..b4f56c6 100644 --- a/modules/packetizer/h264_nal.c +++ b/modules/packetizer/h264_nal.c @@ -17,6 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "h264_nal.h" #include "hxxx_nal.h" diff --git a/modules/packetizer/h264_nal.h b/modules/packetizer/h264_nal.h index 0c9f619..f59148a 100644 --- a/modules/packetizer/h264_nal.h +++ b/modules/packetizer/h264_nal.h @@ -17,14 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ - #ifndef H264_NAL_H # define H264_NAL_H -# ifdef HAVE_CONFIG_H -# include "config.h" -# endif - # include <vlc_common.h> #define PROFILE_H264_BASELINE 66 diff --git a/modules/packetizer/hevc_nal.c b/modules/packetizer/hevc_nal.c index 2eb896c..5ea2055 100644 --- a/modules/packetizer/hevc_nal.c +++ b/modules/packetizer/hevc_nal.c @@ -17,6 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "hevc_nal.h" #include "hxxx_nal.h" diff --git a/modules/packetizer/hevc_nal.h b/modules/packetizer/hevc_nal.h index 3e857c0..2e785c2 100644 --- a/modules/packetizer/hevc_nal.h +++ b/modules/packetizer/hevc_nal.h @@ -17,14 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ - #ifndef HEVC_NAL_H # define HEVC_NAL_H -# ifdef HAVE_CONFIG_H -# include "config.h" -# endif - # include <vlc_common.h> #define HEVC_VPS_MAX 16 diff --git a/modules/packetizer/hxxx_common.c b/modules/packetizer/hxxx_common.c index 3d6fa67..5c35c43 100644 --- a/modules/packetizer/hxxx_common.c +++ b/modules/packetizer/hxxx_common.c @@ -17,6 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "hxxx_common.h" #include <vlc_block.h> diff --git a/modules/packetizer/hxxx_common.h b/modules/packetizer/hxxx_common.h index c4b7ba9..3e5830e 100644 --- a/modules/packetizer/hxxx_common.h +++ b/modules/packetizer/hxxx_common.h @@ -20,10 +20,6 @@ #ifndef HXXX_COMMON_H #define HXXX_COMMON_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <vlc_common.h> typedef block_t * (*pf_annexb_nal_packetizer)(decoder_t *, bool *, block_t *); diff --git a/modules/packetizer/hxxx_nal.c b/modules/packetizer/hxxx_nal.c index e01c05b..22c856c 100644 --- a/modules/packetizer/hxxx_nal.c +++ b/modules/packetizer/hxxx_nal.c @@ -15,6 +15,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "hxxx_nal.h" diff --git a/modules/packetizer/hxxx_nal.h b/modules/packetizer/hxxx_nal.h index 70d2eae..4aee8ad 100644 --- a/modules/packetizer/hxxx_nal.h +++ b/modules/packetizer/hxxx_nal.h @@ -20,10 +20,6 @@ #ifndef HXXX_NAL_H #define HXXX_NAL_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <vlc_common.h> static const uint8_t annexb_startcode4[] = { 0x00, 0x00, 0x00, 0x01 }; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
