diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-01 13:54:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-01 13:54:22 +0100 |
| commit | c047a41bc5ff113bd9c7e010cf617c2589879720 (patch) | |
| tree | b406d548d4befa4817bca676da7d1a22a108d2b9 /libavformat/rtmppkt.h | |
| parent | d079d1d368a96e70ae76da7ad483b486fef2a8d2 (diff) | |
| parent | 33f28a3be3092f642778253d9529dd66fe2a014a (diff) | |
| download | ffmpeg-c047a41bc5ff113bd9c7e010cf617c2589879720.tar.gz | |
Merge commit '33f28a3be3092f642778253d9529dd66fe2a014a'
* commit '33f28a3be3092f642778253d9529dd66fe2a014a':
rtmp: Add a function for writing AMF strings based on two substrings
rtmp: Return a proper error code in handle_invoke_error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmppkt.h')
| -rw-r--r-- | libavformat/rtmppkt.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/rtmppkt.h b/libavformat/rtmppkt.h index 9b588031e7..a9422954f5 100644 --- a/libavformat/rtmppkt.h +++ b/libavformat/rtmppkt.h @@ -204,6 +204,15 @@ void ff_amf_write_number(uint8_t **dst, double num); void ff_amf_write_string(uint8_t **dst, const char *str); /** + * Write a string consisting of two parts in AMF format to a buffer. + * + * @param dst pointer to the input buffer (will be modified) + * @param str1 first string to write, may be null + * @param str2 second string to write, may be null + */ +void ff_amf_write_string2(uint8_t **dst, const char *str1, const char *str2); + +/** * Write AMF NULL value to buffer. * * @param dst pointer to the input buffer (will be modified) |