diff options
| author | Gianluigi Tiesi <mplayer@netfarm.it> | 2014-09-19 04:49:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-21 17:04:19 +0200 |
| commit | e28c27e25f30e9eb7bbc123cf4dc8d057e2e2ae2 (patch) | |
| tree | 2395a0c3b7892b93fbd063fc511de609245f950c | |
| parent | 9b9048a3ddfe97e33a26c87f8c4b029032d49ad8 (diff) | |
| download | ffmpeg-e28c27e25f30e9eb7bbc123cf4dc8d057e2e2ae2.tar.gz | |
avcodec/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: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 59af5383c18c8cf3fe2a4b5cc1ebf2f3300bdfe5)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 98053484b1..3e77fbff60 100644 --- a/libavcodec/libilbc.c +++ b/libavcodec/libilbc.c @@ -98,8 +98,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; @@ -185,7 +184,7 @@ static int ilbc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if ((ret = ff_alloc_packet2(avctx, avpkt, 50)) < 0) 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; |