mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-30 16:42:13 +02:00
Merge commit 'f4b59334bd898c47c9ac30999a346176548630a8'
* commit 'f4b59334bd898c47c9ac30999a346176548630a8': rtpdec: Remove the now unused .alloc field Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
64f58d20b2
@ -127,8 +127,6 @@ struct RTPDynamicProtocolHandler {
|
|||||||
/** Parse the a= line from the sdp field */
|
/** Parse the a= line from the sdp field */
|
||||||
int (*parse_sdp_a_line)(AVFormatContext *s, int st_index,
|
int (*parse_sdp_a_line)(AVFormatContext *s, int st_index,
|
||||||
PayloadContext *priv_data, const char *line);
|
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. */
|
/** Free any data needed by the rtp parsing for this dynamic data. */
|
||||||
void (*free)(PayloadContext *protocol_data);
|
void (*free)(PayloadContext *protocol_data);
|
||||||
/** Parse handler for this dynamic packet */
|
/** Parse handler for this dynamic packet */
|
||||||
|
@ -191,11 +191,7 @@ static void init_rtp_handler(RTPDynamicProtocolHandler *handler,
|
|||||||
rtsp_st->dynamic_handler = handler;
|
rtsp_st->dynamic_handler = handler;
|
||||||
if (st)
|
if (st)
|
||||||
st->need_parsing = handler->need_parsing;
|
st->need_parsing = handler->need_parsing;
|
||||||
if (handler->alloc) {
|
if (handler->priv_data_size) {
|
||||||
rtsp_st->dynamic_protocol_context = handler->alloc();
|
|
||||||
if (!rtsp_st->dynamic_protocol_context)
|
|
||||||
rtsp_st->dynamic_handler = NULL;
|
|
||||||
} else if (handler->priv_data_size) {
|
|
||||||
rtsp_st->dynamic_protocol_context = av_mallocz(handler->priv_data_size);
|
rtsp_st->dynamic_protocol_context = av_mallocz(handler->priv_data_size);
|
||||||
if (!rtsp_st->dynamic_protocol_context)
|
if (!rtsp_st->dynamic_protocol_context)
|
||||||
rtsp_st->dynamic_handler = NULL;
|
rtsp_st->dynamic_handler = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user