diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:19:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:19:33 +0100 |
| commit | 8c6651a14db2f8d8ff53b6fb17f55a4d8ae8c379 (patch) | |
| tree | 1b28d71073a2a0cbf00a339255167dcced1136fb /libavformat | |
| parent | a4f50ec9ddaa160c6c545635523a2e91abc741c5 (diff) | |
| parent | 353b492d0f2a21ae8eb829db1ac01b54b2a4d202 (diff) | |
Merge commit '353b492d0f2a21ae8eb829db1ac01b54b2a4d202'
* commit '353b492d0f2a21ae8eb829db1ac01b54b2a4d202':
rtpdec: Change enc_name to a pointer instead of a fixed-size buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtpdec.c | 3 | ||||
| -rw-r--r-- | libavformat/rtpdec.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index b3511d1ba4..5875905c54 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -121,7 +121,8 @@ RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name, RTPDynamicProtocolHandler *handler; for (handler = rtp_first_dynamic_payload_handler; 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) return handler; return NULL; diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index 7b41cc4b5a..384f7e6fe6 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -113,7 +113,7 @@ typedef int (*DynamicPayloadPacketHandlerProc)(AVFormatContext *ctx, int len, uint16_t seq, int flags); struct RTPDynamicProtocolHandler { - const char enc_name[50]; + const char *enc_name; enum AVMediaType codec_type; enum AVCodecID codec_id; int static_payload_id; /* 0 means no payload id is set. 0 is a valid |