summaryrefslogtreecommitdiff
path: root/libavformat/rtsp.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-02-24 12:45:15 +0200
committerMartin Storsjö <martin@martin.st>2015-02-24 23:07:32 +0200
commitf4b59334bd898c47c9ac30999a346176548630a8 (patch)
tree587e6fea182761e77996c2bf3a47fd87b0d580e1 /libavformat/rtsp.c
parent78791c086bcaf9eb084c27555b31fea8bbb7624a (diff)
rtpdec: Remove the now unused .alloc field
Always use the .priv_data_size field instead. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtsp.c')
-rw-r--r--libavformat/rtsp.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index a4527d2c3a..3180d5bb94 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -186,11 +186,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;