diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 18:04:22 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 18:04:29 +0100 |
commit | 1c896e865cfb5fdea82429a0506a1c5ad905a988 (patch) | |
tree | de08841098f271ff27fe486ea8e87019693bd5cc /libavformat/rtmppkt.h | |
parent | 39d76907c9fb8ac95bf0fe5ef95b50089ec564a9 (diff) | |
parent | e930b112d14d7acd050d5087d11b6dd4c56a8e4e (diff) | |
download | ffmpeg-1c896e865cfb5fdea82429a0506a1c5ad905a988.tar.gz |
Merge commit 'e930b112d14d7acd050d5087d11b6dd4c56a8e4e' into release/0.10
* commit 'e930b112d14d7acd050d5087d11b6dd4c56a8e4e':
oma: refactor seek function
8bps: Bound-check the input buffer
rtmp: Do not misuse memcmp
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmppkt.h')
-rw-r--r-- | libavformat/rtmppkt.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/rtmppkt.h b/libavformat/rtmppkt.h index c43c082ced..ed1a2c61fa 100644 --- a/libavformat/rtmppkt.h +++ b/libavformat/rtmppkt.h @@ -218,6 +218,13 @@ void ff_amf_write_field_name(uint8_t **dst, const char *str); */ void ff_amf_write_object_end(uint8_t **dst); +/** + * Match AMF string with a NULL-terminated string. + * + * @return 0 if the strings do not match. + */ +int ff_amf_match_string(const uint8_t *data, int size, const char *str); + /** @} */ // AMF funcs #endif /* AVFORMAT_RTMPPKT_H */ |