[SCM] libav/experimental: Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging the Vorbis / theora depacketizers.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:05:36 UTC 2013
The following commit has been merged in the experimental branch:
commit 06a36faf4c111d621a742eb1116dabc20f5593a8
Author: Josh Allmann <joshua.allmann at gmail.com>
Date: Thu Apr 1 21:40:56 2010 +0000
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
diff --git a/libavformat/Makefile b/libavformat/Makefile
index bcdf3f5..538883d 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 e329ad2..01822a8 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
similarity index 99%
rename from libavformat/rtpdec_theora.c
rename to libavformat/rtpdec_xiph.c
index 56a59e4..11d3c92 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
similarity index 100%
rename from libavformat/rtpdec_theora.h
rename to libavformat/rtpdec_xiph.h
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list