aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Swain <robert.swain@gmail.com>2009-04-07 19:29:00 +0000
committerRobert Swain <robert.swain@gmail.com>2009-04-07 19:29:00 +0000
commitf0ed92df60e47c9bcc68f001006ec11ccd87cd58 (patch)
treed1140fb55761d6a16d01edf341c1403b51a0f491
parentcdd8930e6ae40e67bd5ac4a855122a7babc81226 (diff)
downloadffmpeg-f0ed92df60e47c9bcc68f001006ec11ccd87cd58.tar.gz
Fix second amr_nb_decode_frame() to also use the new AVPacket argument
Originally committed as revision 18354 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/libamr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/libamr.c b/libavcodec/libamr.c
index 29325c9140..e487a737f1 100644
--- 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 };