Merge commit 'f4b59334bd898c47c9ac30999a346176548630a8'

* commit 'f4b59334bd898c47c9ac30999a346176548630a8':
  rtpdec: Remove the now unused .alloc field

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2 files changed, 1 insertions, 7 deletions

diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h
index 0fb88c795c..b54e258412 100644
--- a/libavformat/rtpdec.h
+++ b/libavformat/rtpdec.h
@@ -127,8 +127,6 @@ struct RTPDynamicProtocolHandler {
     /** Parse the a= line from the sdp field */
     int (*parse_sdp_a_line)(AVFormatContext *s, int st_index,
                             PayloadContext *priv_data, const char *line);
-    /** Allocate any data needed by the rtp parsing for this dynamic data. */
-    PayloadContext *(*alloc)(void);
     /** Free any data needed by the rtp parsing for this dynamic data. */
     void (*free)(PayloadContext *protocol_data);
     /** Parse handler for this dynamic packet */
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 54bbf26c8c..79212c0af5 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -191,11 +191,7 @@ static void init_rtp_handler(RTPDynamicProtocolHandler *handler,
     rtsp_st->dynamic_handler = handler;
     if (st)
         st->need_parsing = handler->need_parsing;
-    if (handler->alloc) {
-        rtsp_st->dynamic_protocol_context = handler->alloc();
-        if (!rtsp_st->dynamic_protocol_context)
-            rtsp_st->dynamic_handler = NULL;
-    } else if (handler->priv_data_size) {
+    if (handler->priv_data_size) {
         rtsp_st->dynamic_protocol_context = av_mallocz(handler->priv_data_size);
         if (!rtsp_st->dynamic_protocol_context)
             rtsp_st->dynamic_handler = NULL;