Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
authorJosh Allmann <joshua.allmann@gmail.com>
Thu, 1 Apr 2010 21:40:56 +0000 (21:40 +0000)
committerRonald S. Bultje <rsbultje@gmail.com>
Thu, 1 Apr 2010 21:40:56 +0000 (21:40 +0000)
the Vorbis / theora depacketizers.

Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.

Originally committed as revision 22765 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/Makefile
libavformat/rtpdec.c
libavformat/rtpdec_xiph.c [moved from libavformat/rtpdec_theora.c with 99% similarity]
libavformat/rtpdec_xiph.h [moved from libavformat/rtpdec_theora.h with 100% similarity]

index bcdf3f5..538883d 100644 (file)
@@ -225,8 +225,8 @@ OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.o        \
                                             rtpdec_asf.o  \
                                             rtpdec_h263.o \
                                             rtpdec_h264.o \
-                                            rtpdec_theora.o \
-                                            rtpdec_vorbis.o
+                                            rtpdec_vorbis.o \
+                                            rtpdec_xiph.o
 OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
 OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o id3v2.o
 OBJS-$(CONFIG_SIFF_DEMUXER)              += siff.o
index e329ad2..01822a8 100644 (file)
@@ -34,8 +34,7 @@
 #include "rtpdec_asf.h"
 #include "rtpdec_h263.h"
 #include "rtpdec_h264.h"
-#include "rtpdec_vorbis.h"
-#include "rtpdec_theora.h"
+#include "rtpdec_xiph.h"
 
 //#define DEBUG
 
similarity index 99%
rename from libavformat/rtpdec_theora.c
rename to libavformat/rtpdec_xiph.c
index 56a59e4..11d3c92 100644 (file)
@@ -32,7 +32,7 @@
 #include <assert.h>
 
 #include "rtpdec.h"
-#include "rtpdec_theora.h"
+#include "rtpdec_xiph.h"
 
 /**
  * RTP/Theora specific private data.