videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit 'f4b59334bd898c47c9ac30999a346176548630a8' 

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-25 00:17:44 +01:00
parent f966ac2b6e f4b59334bd
commit 64f58d20b2
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rtpdec.h
View File

@ -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 */

6
libavformat/rtsp.c
View File

@ -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;