summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-08-29 16:37:33 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-08-29 16:37:33 +0000
commit2aa751d2c867e0bf1ffd3725818ef2bbca03ce58 (patch)
treef6bfc0069beb8ef39feda0ad1b90b866a554bd39
parent54a73bb57f27ea5572f021cfa3bd045797703fe3 (diff)
rename idroq.c to idroqdec.c
Originally committed as revision 24969 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--MAINTAINERS2
-rw-r--r--libavformat/Makefile2
-rw-r--r--libavformat/idroqdec.c (renamed from libavformat/idroq.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 8f7a9eefaf..75770251fa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -274,7 +274,7 @@ Muxers/Demuxers:
gxf.c Reimar Doeffinger
gxfenc.c Baptiste Coudurier
idcin.c Mike Melanson
- idroq.c Mike Melanson
+ idroqdec.c Mike Melanson
iff.c Jaikrishnan Menon
ipmovie.c Mike Melanson
img2.c Michael Niedermayer
diff --git a/libavformat/Makefile b/libavformat/Makefile
index a1a2cd827b..7138575e28 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -209,7 +209,7 @@ OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.o
OBJS-$(CONFIG_RL2_DEMUXER) += rl2.o
OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o rm.o
OBJS-$(CONFIG_RM_MUXER) += rmenc.o rm.o
-OBJS-$(CONFIG_ROQ_DEMUXER) += idroq.o
+OBJS-$(CONFIG_ROQ_DEMUXER) += idroqdec.o
OBJS-$(CONFIG_ROQ_MUXER) += idroqenc.o
OBJS-$(CONFIG_RSO_DEMUXER) += rsodec.o rso.o raw.o
OBJS-$(CONFIG_RSO_MUXER) += rsoenc.o rso.o
diff --git a/libavformat/idroq.c b/libavformat/idroqdec.c
index 6b036d9c07..6b036d9c07 100644
--- a/libavformat/idroq.c
+++ b/libavformat/idroqdec.c