diff options
author | Gianluigi Tiesi <mplayer@netfarm.it> | 2014-09-19 04:49:36 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2016-11-16 08:21:05 +0100 |
commit | e17567a831dede1f24e3a1a4c305a93012d7a8ce (patch) | |
tree | e44c167cb9519e76f11699c5003afeb2b883772b /libavcodec/libilbc.c | |
parent | ffe89e1edb0281ff65d1bda88253784e9283b717 (diff) | |
download | ffmpeg-streaming-e17567a831dede1f24e3a1a4c305a93012d7a8ce.zip ffmpeg-streaming-e17567a831dede1f24e3a1a4c305a93012d7a8ce.tar.gz |
libilbc: support for latest git of libilbc
In the latest git commits of libilbc developers removed WebRtc_xxx typedefs.
This commit uses int types instead. It's safe to apply also for previous
versions since WebRtc_Word16 was always a typedef of int16_t and
WebRtc_UWord16 a typedef of uint16_t.
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec/libilbc.c')
-rw-r--r-- | libavcodec/libilbc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c index c5053f0..a5b2f3a 100644 --- a/libavcodec/libilbc.c +++ b/libavcodec/libilbc.c @@ -95,8 +95,7 @@ static int ilbc_decode_frame(AVCodecContext *avctx, void *data, return ret; } - WebRtcIlbcfix_DecodeImpl((WebRtc_Word16*) frame->data[0], - (const WebRtc_UWord16*) buf, &s->decoder, 1); + WebRtcIlbcfix_DecodeImpl((int16_t *) frame->data[0], (const uint16_t *) buf, &s->decoder, 1); *got_frame_ptr = 1; @@ -168,7 +167,7 @@ static int ilbc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, return ret; } - WebRtcIlbcfix_EncodeImpl((WebRtc_UWord16*) avpkt->data, (const WebRtc_Word16*) frame->data[0], &s->encoder); + WebRtcIlbcfix_EncodeImpl((uint16_t *) avpkt->data, (const int16_t *) frame->data[0], &s->encoder); avpkt->size = s->encoder.no_of_bytes; *got_packet_ptr = 1; |