Commit 8c6651a1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '353b492d'

* commit '353b492d':
  rtpdec: Change enc_name to a pointer instead of a fixed-size buffer
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a4f50ec9 353b492d
...@@ -121,7 +121,8 @@ RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name, ...@@ -121,7 +121,8 @@ RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,
RTPDynamicProtocolHandler *handler; RTPDynamicProtocolHandler *handler;
for (handler = rtp_first_dynamic_payload_handler; for (handler = rtp_first_dynamic_payload_handler;
handler; handler = handler->next) handler; handler = handler->next)
if (!av_strcasecmp(name, handler->enc_name) && if (handler->enc_name &&
!av_strcasecmp(name, handler->enc_name) &&
codec_type == handler->codec_type) codec_type == handler->codec_type)
return handler; return handler;
return NULL; return NULL;
......
...@@ -113,7 +113,7 @@ typedef int (*DynamicPayloadPacketHandlerProc)(AVFormatContext *ctx, ...@@ -113,7 +113,7 @@ typedef int (*DynamicPayloadPacketHandlerProc)(AVFormatContext *ctx,
int len, uint16_t seq, int flags); int len, uint16_t seq, int flags);
struct RTPDynamicProtocolHandler { struct RTPDynamicProtocolHandler {
const char enc_name[50]; const char *enc_name;
enum AVMediaType codec_type; enum AVMediaType codec_type;
enum AVCodecID codec_id; enum AVCodecID codec_id;
int static_payload_id; /* 0 means no payload id is set. 0 is a valid int static_payload_id; /* 0 means no payload id is set. 0 is a valid
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment