From 82068ec56cb45eca1f5b02d5e943ade27c919867 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 18 Nov 2013 18:46:44 +0100
Subject: demux: rename demux_packet.h to packet.h

This always bothered me.
---
 demux/demux.h            |  2 +-
 demux/demux_packet.h     | 40 ----------------------------------------
 demux/packet.h           | 40 ++++++++++++++++++++++++++++++++++++++++
 mpvcore/av_common.c      |  2 +-
 sub/sd.h                 |  2 +-
 video/decode/dec_video.c |  2 +-
 video/decode/vd_lavc.c   |  2 +-
 7 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 demux/demux_packet.h
 create mode 100644 demux/packet.h

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/demux_packet.h
deleted file mode 100644
index f12ffc9a00..0000000000
--- a/demux/demux_packet.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of mplayer2.
- *
- * mplayer2 is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * mplayer2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with mplayer2; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_DEMUX_PACKET_H
-#define MPLAYER_DEMUX_PACKET_H
-
-#include <stdbool.h>
-#include <sys/types.h>
-
-// Holds one packet/frame/whatever
-typedef struct demux_packet {
-    int len;
-    double pts;
-    double duration;
-    double stream_pts;
-    int64_t pos; // position in source file byte stream
-    unsigned char *buffer;
-    bool keyframe;
-    int stream; // source stream index
-    struct demux_packet *next;
-    void *allocation;
-    struct AVPacket *avpacket;   // original libavformat packet (demux_lavf)
-} demux_packet_t;
-
-#endif /* MPLAYER_DEMUX_PACKET_H */
diff --git a/demux/packet.h b/demux/packet.h
new file mode 100644
index 0000000000..96e3885761
--- /dev/null
+++ b/demux/packet.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of mplayer2.
+ *
+ * mplayer2 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * mplayer2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with mplayer2; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_DEMUX_PACKET_H
+#define MPLAYER_DEMUX_PACKET_H
+
+#include <stdbool.h>
+#include <inttypes.h>
+
+// Holds one packet/frame/whatever
+typedef struct demux_packet {
+    int len;
+    double pts;
+    double duration;
+    double stream_pts;
+    int64_t pos; // position in source file byte stream
+    unsigned char *buffer;
+    bool keyframe;
+    int stream; // source stream index
+    struct demux_packet *next;
+    void *allocation;
+    struct AVPacket *avpacket;   // original libavformat packet (demux_lavf)
+} demux_packet_t;
+
+#endif /* MPLAYER_DEMUX_PACKET_H */
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"
 
diff --git a/sub/sd.h b/sub/sd.h
index 3b83197989..0ec4bf273d 100644
--- a/sub/sd.h
+++ b/sub/sd.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"
 
-- 
cgit v1.2.3