[FFmpeg-cvslog] r22765 - in trunk/libavformat: Makefile rtpdec.c rtpdec_theora.c rtpdec_theora.h rtpdec_xiph.c rtpdec_xiph.h

[rbultje]

Author: rbultje
Date: Thu Apr  1 23:40:56 2010
New Revision: 22765

Log:
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>.

Added:
   trunk/libavformat/rtpdec_xiph.c
      - copied, changed from r22749, trunk/libavformat/rtpdec_theora.c
   trunk/libavformat/rtpdec_xiph.h
      - copied unchanged from r22749, trunk/libavformat/rtpdec_theora.h
Deleted:
   trunk/libavformat/rtpdec_theora.c
   trunk/libavformat/rtpdec_theora.h
Modified:
   trunk/libavformat/Makefile
   trunk/libavformat/rtpdec.c

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	Thu Apr  1 22:56:23 2010	(r22764)
+++ trunk/libavformat/Makefile	Thu Apr  1 23:40:56 2010	(r22765)
@@ -225,8 +225,8 @@ OBJS-$(CONFIG_SDP_DEMUXER)              
                                             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

Modified: trunk/libavformat/rtpdec.c
==============================================================================
--- trunk/libavformat/rtpdec.c	Thu Apr  1 22:56:23 2010	(r22764)
+++ trunk/libavformat/rtpdec.c	Thu Apr  1 23:40:56 2010	(r22765)
@@ -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
 

Copied and modified: trunk/libavformat/rtpdec_xiph.c (from r22749, trunk/libavformat/rtpdec_theora.c)
==============================================================================
--- trunk/libavformat/rtpdec_theora.c	Wed Mar 31 21:06:02 2010	(r22749, copy source)
+++ trunk/libavformat/rtpdec_xiph.c	Thu Apr  1 23:40:56 2010	(r22765)
@@ -32,7 +32,7 @@
 #include <assert.h>
 
 #include "rtpdec.h"
-#include "rtpdec_theora.h"
+#include "rtpdec_xiph.h"
 
 /**
  * RTP/Theora specific private data.