OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cdd8930
)
Fix second amr_nb_decode_frame() to also use the new AVPacket argument
author
Robert Swain
<robert.swain@gmail.com>
Tue, 7 Apr 2009 19:29:00 +0000
(19:29 +0000)
committer
Robert Swain
<robert.swain@gmail.com>
Tue, 7 Apr 2009 19:29:00 +0000
(19:29 +0000)
Originally committed as revision 18354 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/libamr.c
patch
|
blob
|
history
diff --git
a/libavcodec/libamr.c
b/libavcodec/libamr.c
index
29325c9
..
e487a73
100644
(file)
--- a/
libavcodec/libamr.c
+++ b/
libavcodec/libamr.c
@@
-443,8
+443,10
@@
static av_cold int amr_nb_encode_close(AVCodecContext * avctx)
static int amr_nb_decode_frame(AVCodecContext * avctx,
void *data, int *data_size,
-
const uint8_t * buf, int buf_size
)
+
AVPacket *avpkt
)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
AMRContext *s = avctx->priv_data;
const uint8_t*amrData=buf;
static const uint8_t block_size[16]={ 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };