diff options
| author | wm4 <wm4@nowhere> | 2013-11-18 18:46:44 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-18 18:46:44 +0100 |
| commit | 82068ec56cb45eca1f5b02d5e943ade27c919867 (patch) | |
| tree | cf10be0580cfb249b126c232a3c4639cce38b3d6 | |
| parent | d5bc4ee79864404423ddf2786d8e8089fc46eeca (diff) | |
| download | mpv-82068ec56cb45eca1f5b02d5e943ade27c919867.tar.bz2 mpv-82068ec56cb45eca1f5b02d5e943ade27c919867.tar.xz | |
demux: rename demux_packet.h to packet.h
This always bothered me.
| -rw-r--r-- | demux/demux.h | 2 | ||||
| -rw-r--r-- | demux/packet.h (renamed from demux/demux_packet.h) | 2 | ||||
| -rw-r--r-- | mpvcore/av_common.c | 2 | ||||
| -rw-r--r-- | sub/sd.h | 2 | ||||
| -rw-r--r-- | video/decode/dec_video.c | 2 | ||||
| -rw-r--r-- | video/decode/vd_lavc.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/demux/demux.h b/demux/demux.h index 487a4a94c1..e025862bb2 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -27,7 +27,7 @@ #include "mpvcore/bstr.h" #include "mpvcore/mp_common.h" -#include "demux_packet.h" +#include "packet.h" #include "stheader.h" struct MPOpts; diff --git a/demux/demux_packet.h b/demux/packet.h index f12ffc9a00..96e3885761 100644 --- a/demux/demux_packet.h +++ b/demux/packet.h @@ -20,7 +20,7 @@ #define MPLAYER_DEMUX_PACKET_H #include <stdbool.h> -#include <sys/types.h> +#include <inttypes.h> // Holds one packet/frame/whatever typedef struct demux_packet { diff --git a/mpvcore/av_common.c b/mpvcore/av_common.c index ebf871c544..11d1090146 100644 --- a/mpvcore/av_common.c +++ b/mpvcore/av_common.c @@ -21,7 +21,7 @@ #include <libavcodec/avcodec.h> #include "mpvcore/mp_talloc.h" -#include "demux/demux_packet.h" +#include "demux/packet.h" #include "av_common.h" #include "codecs.h" @@ -2,7 +2,7 @@ #define MPLAYER_SD_H #include "dec_sub.h" -#include "demux/demux_packet.h" +#include "demux/packet.h" struct sd { struct MPOpts *opts; diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index c16dc57eda..6ab67b9dad 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -29,7 +29,7 @@ #include "osdep/timer.h" #include "stream/stream.h" -#include "demux/demux_packet.h" +#include "demux/packet.h" #include "mpvcore/codecs.h" diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index aebda8dd70..e6ed8e5602 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -48,7 +48,7 @@ #include "video/filter/vf.h" #include "video/decode/dec_video.h" #include "demux/stheader.h" -#include "demux/demux_packet.h" +#include "demux/packet.h" #include "osdep/numcores.h" #include "video/csputils.h" |