libgsm installs headers in a subdirectory, use gsm.h from that subdirectory.

[ffmpeg] / libavformat / rtp_vorbis.c

diff --git a/libavformat/rtp_vorbis.c b/libavformat/rtp_vorbis.c
index d9bdf4909d03233e39d6f9328f9e303a9c5b022c..4f6286399e5c04c09aef30396f12906933a3a700 100644 (file)
--- a/libavformat/rtp_vorbis.c
+++ b/libavformat/rtp_vorbis.c
@@ -143,12 +143,12 @@ ff_vorbis_parse_fmtp_config(AVCodecContext * codec,
     return result;
 }
 
-static PayloadContext *vorbis_new_extradata(void)
+static PayloadContext *vorbis_new_context(void)
 {
     return av_mallocz(sizeof(PayloadContext));
 }
 
-static void vorbis_free_extradata(PayloadContext * data)
+static void vorbis_free_context(PayloadContext * data)
 {
     av_free(data);
 }
@@ -208,11 +208,11 @@ vorbis_handle_packet(AVFormatContext * ctx,
 }
 
 RTPDynamicProtocolHandler ff_vorbis_dynamic_handler = {
-    "vorbis",
-    CODEC_TYPE_AUDIO,
-    CODEC_ID_VORBIS,
-    NULL,
-    vorbis_new_extradata,
-    vorbis_free_extradata,
-    vorbis_handle_packet
+    .enc_name         = "vorbis",
+    .codec_type       = CODEC_TYPE_AUDIO,
+    .codec_id         = CODEC_ID_VORBIS,
+    .parse_sdp_a_line = NULL,
+    .open             = vorbis_new_context,
+    .close            = vorbis_free_context,
+    .parse_packet     = vorbis_handle_packet
 };