summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2010-12-28 09:03:33 +0000
committerAnton Khirnov <wyskas@gmail.com>2010-12-28 09:03:33 +0000
commit645439c3c3ce39114e4f46a9198cd8b9a11c3e66 (patch)
tree15eafcd3aa715fe281f5a8938576d9a692bf446e /libavformat
parentb5670209438481f21addc8b7c4891627dd5ddac7 (diff)
lavf: rename meta{dec,enc}.c -> ffmeta{dec,enc}.c
Originally committed as revision 26113 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/Makefile4
-rw-r--r--libavformat/ffmetadec.c (renamed from libavformat/metadec.c)0
-rw-r--r--libavformat/ffmetaenc.c (renamed from libavformat/metaenc.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 4b031f4493..013f6bead4 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -71,8 +71,8 @@ OBJS-$(CONFIG_EAC3_DEMUXER) += ac3dec.o rawdec.o
OBJS-$(CONFIG_EAC3_MUXER) += rawenc.o
OBJS-$(CONFIG_FFM_DEMUXER) += ffmdec.o
OBJS-$(CONFIG_FFM_MUXER) += ffmenc.o
-OBJS-$(CONFIG_FFMETADATA_DEMUXER) += metadec.o
-OBJS-$(CONFIG_FFMETADATA_MUXER) += metaenc.o
+OBJS-$(CONFIG_FFMETADATA_DEMUXER) += ffmetadec.o
+OBJS-$(CONFIG_FFMETADATA_MUXER) += ffmetaenc.o
OBJS-$(CONFIG_FILMSTRIP_DEMUXER) += filmstripdec.o
OBJS-$(CONFIG_FILMSTRIP_MUXER) += filmstripenc.o
OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o rawdec.o \
diff --git a/libavformat/metadec.c b/libavformat/ffmetadec.c
index 0269ac5a0b..0269ac5a0b 100644
--- a/libavformat/metadec.c
+++ b/libavformat/ffmetadec.c
diff --git a/libavformat/metaenc.c b/libavformat/ffmetaenc.c
index 65ab363a1b..65ab363a1b 100644
--- a/libavformat/metaenc.c
+++ b/libavformat/ffmetaenc.c