Browse Source

packetizer: hxxx: fix include order

pull/43/head
Francois Cartegnie 11 years ago
parent
commit
dec7733366
  1. 3
      modules/packetizer/h264_nal.c
  2. 5
      modules/packetizer/h264_nal.h
  3. 3
      modules/packetizer/hevc_nal.c
  4. 5
      modules/packetizer/hevc_nal.h
  5. 4
      modules/packetizer/hxxx_common.c
  6. 4
      modules/packetizer/hxxx_common.h
  7. 3
      modules/packetizer/hxxx_nal.c
  8. 4
      modules/packetizer/hxxx_nal.h

3
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"

5
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

3
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"

5
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

4
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>

4
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 *);

3
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"

4
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 };

Loading…
Cancel
Save