diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-03 00:25:07 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-03 01:34:01 +0400 |
commit | 9c6e23f5d2f9fa58d54adf35b4cde4e351fb7d64 (patch) | |
tree | 51e742dd00ad34c80a40e60e8fa4ff7a05adef8f /libavformat/rtmppkt.h | |
parent | 9f14cd91b5195e2beba7213e855c0d36b787ab85 (diff) | |
parent | c728518b3cbb0daf0d0a65ba7adfcb48c5629b93 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fft: fix imdct_half() for AVX
rtmppkt: Add missing libavcodec/bytestream.h include.
rtmp: add functions for reading AMF values
vc1dec: remove useless #include simple_idct.h
dct-test: always link with aandcttab.o
vp8: pack struct VP8ThreadData more efficiently
x86: remove libmpeg2 mmx(ext) idct functions
eamad: Use dsputils instead of a custom bswap16_buf
Canopus Lossless decoder
Conflicts:
Changelog
LICENSE
libavcodec/avcodec.h
libavcodec/cllc.c
libavcodec/eamad.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmppkt.h')
-rw-r--r-- | libavformat/rtmppkt.h | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/libavformat/rtmppkt.h b/libavformat/rtmppkt.h index 7291397345..7ed31133c0 100644 --- a/libavformat/rtmppkt.h +++ b/libavformat/rtmppkt.h @@ -22,6 +22,7 @@ #ifndef AVFORMAT_RTMPPKT_H #define AVFORMAT_RTMPPKT_H +#include "libavcodec/bytestream.h" #include "avformat.h" #include "url.h" @@ -231,6 +232,48 @@ void ff_amf_write_field_name(uint8_t **dst, const char *str); */ void ff_amf_write_object_end(uint8_t **dst); +/** + * Read AMF boolean value. + * + *@param[in,out] gbc GetByteContext initialized with AMF-formatted data + *@param[out] val 0 or 1 + *@return 0 on success or an AVERROR code on failure +*/ +int ff_amf_read_bool(GetByteContext *gbc, int *val); + +/** + * Read AMF number value. + * + *@param[in,out] gbc GetByteContext initialized with AMF-formatted data + *@param[out] val read value + *@return 0 on success or an AVERROR code on failure +*/ +int ff_amf_read_number(GetByteContext *gbc, double *val); + +/** + * Read AMF string value. + * + * Appends a trailing \0 to output string in order to + * ease later parsing. + * + *@param[in,out] gbc GetByteContext initialized with AMF-formatted data + *@param[out] str read string + *@param[in] strsize buffer size available to store the read string + *@param[out] length read string length + *@return 0 on success or an AVERROR code on failure +*/ +int ff_amf_read_string(GetByteContext *gbc, uint8_t *str, + int strsize, int *length); + +/** + * Read AMF NULL value. + * + *@param[in,out] gbc GetByteContext initialized with AMF-formatted data + *@return 0 on success or an AVERROR code on failure +*/ +int ff_amf_read_null(GetByteContext *gbc); + + /** @} */ // AMF funcs #endif /* AVFORMAT_RTMPPKT_H */ |