diff options
| author | Josh Allmann <joshua.allmann@gmail.com> | 2010-04-01 21:40:56 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-04-01 21:40:56 +0000 |
| commit | 06a36faf4c111d621a742eb1116dabc20f5593a8 (patch) | |
| tree | e54c53d6a3fd54416e3394a8891e615243de055c | |
| parent | d834d63b0e99b9b088fba06fb2cdf7370d653d78 (diff) | |
| download | ffmpeg-06a36faf4c111d621a742eb1116dabc20f5593a8.tar.gz | |
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
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
| -rw-r--r-- | libavformat/Makefile | 4 | ||||
| -rw-r--r-- | libavformat/rtpdec.c | 3 | ||||
| -rw-r--r-- | libavformat/rtpdec_xiph.c (renamed from libavformat/rtpdec_theora.c) | 2 | ||||
| -rw-r--r-- | libavformat/rtpdec_xiph.h (renamed from libavformat/rtpdec_theora.h) | 0 |
4 files changed, 4 insertions, 5 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index bcdf3f5c8b..538883d75b 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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 diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index e329ad291d..01822a8b4d 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -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 diff --git a/libavformat/rtpdec_theora.c b/libavformat/rtpdec_xiph.c index 56a59e4e16..11d3c92abf 100644 --- a/libavformat/rtpdec_theora.c +++ b/libavformat/rtpdec_xiph.c @@ -32,7 +32,7 @@ #include <assert.h> #include "rtpdec.h" -#include "rtpdec_theora.h" +#include "rtpdec_xiph.h" /** * RTP/Theora specific private data. diff --git a/libavformat/rtpdec_theora.h b/libavformat/rtpdec_xiph.h index e94c0f1a8e..e94c0f1a8e 100644 --- a/libavformat/rtpdec_theora.h +++ b/libavformat/rtpdec_xiph.h |