mirror of
https://github.com/mpv-player/mpv
synced 2025-03-22 19:34:14 +00:00
cleanup: move MP_NOPTS_VALUE definition to mpcommon.h
This commit is contained in:
parent
adedee4285
commit
e9022ec470
@ -20,6 +20,7 @@
|
|||||||
#define MPLAYER_VF_H
|
#define MPLAYER_VF_H
|
||||||
|
|
||||||
#include "mp_image.h"
|
#include "mp_image.h"
|
||||||
|
#include "mpcommon.h"
|
||||||
|
|
||||||
struct MPOpts;
|
struct MPOpts;
|
||||||
struct vf_instance;
|
struct vf_instance;
|
||||||
@ -116,10 +117,6 @@ typedef struct vf_seteq_s
|
|||||||
|
|
||||||
#include "vfcap.h"
|
#include "vfcap.h"
|
||||||
|
|
||||||
//FIXME this should be in a common header, but i dunno which
|
|
||||||
#define MP_NOPTS_VALUE (-1LL<<63) //both int64_t and double should be able to represent this exactly
|
|
||||||
|
|
||||||
|
|
||||||
// functions:
|
// functions:
|
||||||
void vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h);
|
void vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h);
|
||||||
mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype, int mp_imgflag, int w, int h);
|
mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype, int mp_imgflag, int w, int h);
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
|
|
||||||
#include "stream/stream.h"
|
#include "stream/stream.h"
|
||||||
#include "bstr.h"
|
#include "bstr.h"
|
||||||
|
#include "mpcommon.h"
|
||||||
|
|
||||||
struct MPOpts;
|
struct MPOpts;
|
||||||
|
|
||||||
@ -96,9 +97,6 @@ struct MPOpts;
|
|||||||
// A virtual demuxer type for the network code
|
// A virtual demuxer type for the network code
|
||||||
#define DEMUXER_TYPE_PLAYLIST (2<<16)
|
#define DEMUXER_TYPE_PLAYLIST (2<<16)
|
||||||
|
|
||||||
|
|
||||||
#define MP_NOPTS_VALUE (-1LL<<63) //both int64_t and double should be able to represent this exactly
|
|
||||||
|
|
||||||
enum timestamp_type {
|
enum timestamp_type {
|
||||||
TIMESTAMP_TYPE_PTS,
|
TIMESTAMP_TYPE_PTS,
|
||||||
TIMESTAMP_TYPE_SORT,
|
TIMESTAMP_TYPE_SORT,
|
||||||
|
@ -26,11 +26,8 @@
|
|||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
//#include "font_load.h"
|
|
||||||
#include "libmpcodecs/img_format.h"
|
#include "libmpcodecs/img_format.h"
|
||||||
//#include "vidix/vidix.h"
|
#include "mpcommon.h"
|
||||||
|
|
||||||
#define MP_NOPTS_VALUE (-1LL<<63)
|
|
||||||
|
|
||||||
#define VO_EVENT_EXPOSE 1
|
#define VO_EVENT_EXPOSE 1
|
||||||
#define VO_EVENT_RESIZE 2
|
#define VO_EVENT_RESIZE 2
|
||||||
|
@ -19,6 +19,9 @@
|
|||||||
#ifndef MPLAYER_MPCOMMON_H
|
#ifndef MPLAYER_MPCOMMON_H
|
||||||
#define MPLAYER_MPCOMMON_H
|
#define MPLAYER_MPCOMMON_H
|
||||||
|
|
||||||
|
// both int64_t and double should be able to represent this exactly
|
||||||
|
#define MP_NOPTS_VALUE (-1LL<<63)
|
||||||
|
|
||||||
extern const char *mplayer_version;
|
extern const char *mplayer_version;
|
||||||
|
|
||||||
#endif /* MPLAYER_MPCOMMON_H */
|
#endif /* MPLAYER_MPCOMMON_H */
|
||||||
|
3
spudec.c
3
spudec.c
@ -43,6 +43,7 @@
|
|||||||
#include "libavutil/avutil.h"
|
#include "libavutil/avutil.h"
|
||||||
#include "ffmpeg_files/intreadwrite.h"
|
#include "ffmpeg_files/intreadwrite.h"
|
||||||
#include "libswscale/swscale.h"
|
#include "libswscale/swscale.h"
|
||||||
|
#include "mpcommon.h"
|
||||||
|
|
||||||
/* Valid values for spu_aamode:
|
/* Valid values for spu_aamode:
|
||||||
0: none (fastest, most ugly)
|
0: none (fastest, most ugly)
|
||||||
@ -1336,8 +1337,6 @@ void spudec_set_hw_spu(void *this, struct vo *hw_spu)
|
|||||||
vo_control(hw_spu, VOCTRL_SET_SPU_PALETTE, spu->global_palette);
|
vo_control(hw_spu, VOCTRL_SET_SPU_PALETTE, spu->global_palette);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MP_NOPTS_VALUE (-1LL<<63) //both int64_t and double should be able to represent this exactly
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* palette must contain at least 256 32-bit entries, otherwise crashes
|
* palette must contain at least 256 32-bit entries, otherwise crashes
|
||||||
* are possible
|
* are possible
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "mp_msg.h"
|
#include "mp_msg.h"
|
||||||
#include "subreader.h"
|
#include "subreader.h"
|
||||||
|
#include "mpcommon.h"
|
||||||
#include "stream/stream.h"
|
#include "stream/stream.h"
|
||||||
#include "libavutil/common.h"
|
#include "libavutil/common.h"
|
||||||
#include "libavutil/avstring.h"
|
#include "libavutil/avstring.h"
|
||||||
@ -2359,7 +2360,6 @@ void sub_add_text(subtitle *sub, const char *txt, int len, double endpts) {
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MP_NOPTS_VALUE (-1LL<<63)
|
|
||||||
/**
|
/**
|
||||||
* \brief remove outdated subtitle lines.
|
* \brief remove outdated subtitle lines.
|
||||||
* \param sub subtitle struct to modify
|
* \param sub subtitle struct to modify
|
||||||
|
Loading…
Reference in New Issue
Block a user