summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-19 22:13:50 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-19 22:13:50 +0000
commitb1b0d86c7ec4c0dd9c26bd17e299a8583c3bdd45 (patch)
tree0e62494e1a44ced869aa136584a2fbb25cae3c88
parent021e87e9d94cf7c566fb781e7084e1fa59742029 (diff)
downloadmpv-b1b0d86c7ec4c0dd9c26bd17e299a8583c3bdd45.tar.bz2
mpv-b1b0d86c7ec4c0dd9c26bd17e299a8583c3bdd45.tar.xz
moved mpeg_packetizer helpers to libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19146 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpcodecs/Makefile1
-rw-r--r--libmpdemux/Makefile1
-rw-r--r--libmpdemux/mpeg_packetizer.c (renamed from libmpcodecs/mpeg_packetizer.c)0
-rw-r--r--libmpdemux/mpeg_packetizer.h (renamed from libmpcodecs/mpeg_packetizer.h)0
4 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index f595bdc40a..ceb9476f9f 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -310,7 +310,6 @@ SRCS=$(AUDIO_SRCS) \
$(VIDEO_SRCS) \
$(VFILTER_SRCS) \
$(NATIVE_SRCS) \
- mpeg_packetizer.c \
img_format.c \
OBJS=$(SRCS:.c=.o)
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 197f2cfeda..1bffbb48a1 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -26,6 +26,7 @@ SRCS += cdinfo.c \
cue_read.c \
parse_es.c \
parse_mp4.c \
+ mpeg_packetizer.c \
yuv4mpeg.c \
yuv4mpeg_ratio.c \
diff --git a/libmpcodecs/mpeg_packetizer.c b/libmpdemux/mpeg_packetizer.c
index 58491c981b..58491c981b 100644
--- a/libmpcodecs/mpeg_packetizer.c
+++ b/libmpdemux/mpeg_packetizer.c
diff --git a/libmpcodecs/mpeg_packetizer.h b/libmpdemux/mpeg_packetizer.h
index 4e8334eed0..4e8334eed0 100644
--- a/libmpcodecs/mpeg_packetizer.h
+++ b/libmpdemux/mpeg_packetizer.h