diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 00:17:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 00:17:48 +0100 |
| commit | 64f58d20b2008bd2c633beef3c21331dfff0d0e5 (patch) | |
| tree | 8197908f987545fc740c6fc34092e4c01d909fd3 /libavformat/rtsp.c | |
| parent | f966ac2b6e3f08c41f3c45ab5efff768db62ac5a (diff) | |
| parent | f4b59334bd898c47c9ac30999a346176548630a8 (diff) | |
| download | android_external_ffmpeg-64f58d20b2008bd2c633beef3c21331dfff0d0e5.tar.gz android_external_ffmpeg-64f58d20b2008bd2c633beef3c21331dfff0d0e5.tar.bz2 android_external_ffmpeg-64f58d20b2008bd2c633beef3c21331dfff0d0e5.zip | |
Merge commit 'f4b59334bd898c47c9ac30999a346176548630a8'
* commit 'f4b59334bd898c47c9ac30999a346176548630a8':
rtpdec: Remove the now unused .alloc field
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 6 |
1 files changed, 1 insertions, 5 deletions
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; |