From 339f5f39573dcdcb16f2dba563f784340a61b189 Mon Sep 17 00:00:00 2001
From: Josh Allmann <joshua.allmann@gmail.com>
Date: Thu, 1 Apr 2010 21:43:22 +0000
Subject: Merge Vorbis / Theora depayloaders.

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

Originally committed as revision 22768 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/rtpdec_xiph.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'libavformat/rtpdec_xiph.c')

diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c
index b828c933c0..1567b6131b 100644
--- a/libavformat/rtpdec_xiph.c
+++ b/libavformat/rtpdec_xiph.c
@@ -1,5 +1,6 @@
 /*
  * Xiph RTP Protocols
+ * Copyright (c) 2009 Colin McQuillian
  * Copyright (c) 2010 Josh Allmann
  *
  * This file is part of FFmpeg.
@@ -22,6 +23,7 @@
 /**
  * @file libavformat/rtpdec_xiph.c
  * @brief Xiph / RTP Code
+ * @author Colin McQuillan <m.niloc@gmail.com>
  * @author Josh Allmann <joshua.allmann@gmail.com>
  */
 
@@ -385,3 +387,13 @@ RTPDynamicProtocolHandler ff_theora_dynamic_handler = {
     .close            = xiph_free_context,
     .parse_packet     = xiph_handle_packet
 };
+
+RTPDynamicProtocolHandler ff_vorbis_dynamic_handler = {
+    .enc_name         = "vorbis",
+    .codec_type       = CODEC_TYPE_AUDIO,
+    .codec_id         = CODEC_ID_VORBIS,
+    .parse_sdp_a_line = xiph_parse_sdp_line,
+    .open             = xiph_new_context,
+    .close            = xiph_free_context,
+    .parse_packet     = xiph_handle_packet
+};
-- 
cgit v1.2.3