diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 17:42:49 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 17:42:49 +0400 |
commit | 18884f159b617208dd69fb35fa127f4fdedf5ba1 (patch) | |
tree | 2eae5d696ef3b8f8f03cb9c58ee88632ff9cc856 /libavformat/rtpdec_xiph.c | |
parent | c55bebe2cc7bd444f83a678babc1b287aa7a3da1 (diff) | |
parent | 0a7005bebd23ade7bb852bce0401af1a8fdbb723 (diff) |
Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'
* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
rtpdec_xiph: fix function return type
smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
mpegvideo: remove write-only variable
Use proper return values in case of missing features
fate: add avstring test
rangecoder-test: Set error message log level to error, instead of debug
Conflicts:
libavcodec/aacdec.c
libavcodec/amrnbdec.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_xiph.c')
-rw-r--r-- | libavformat/rtpdec_xiph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c index ae10c78304..773f4aa391 100644 --- a/libavformat/rtpdec_xiph.c +++ b/libavformat/rtpdec_xiph.c @@ -242,7 +242,7 @@ static int get_base128(const uint8_t ** buf, const uint8_t * buf_end) /** * Based off parse_packed_headers in Vorbis RTP */ -static unsigned int +static int parse_packed_headers(const uint8_t * packed_headers, const uint8_t * packed_headers_end, AVCodecContext * codec, PayloadContext * xiph_data) |