summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-06-07 22:41:11 +0000
committerDiego Biurrun <diego@biurrun.de>2009-06-07 22:41:11 +0000
commit44b20d1d7419ae26a4166ae123ce1dc09e6bf796 (patch)
tree0f9f221d9b109385894547412ae97e1fae4d6961 /libavcodec
parent9ad437eafbb34cedbc9c07f24f9143d9d53e839f (diff)
Fix OpenCORE build: Do not use new AVPacket infrastructure from trunk.
Originally committed as revision 19134 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/libopencore-amr.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index 1544db7bed..6ff8c3eada 100644
--- a/libavcodec/libopencore-amr.c
+++ b/libavcodec/libopencore-amr.c
@@ -107,10 +107,9 @@ static av_cold int amr_nb_decode_close(AVCodecContext *avctx)
}
static int amr_nb_decode_frame(AVCodecContext *avctx, void *data,
- int *data_size, AVPacket *avpkt)
+ int *data_size,
+ const uint8_t *buf, int buf_size)
{
- 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 };
@@ -272,11 +271,10 @@ static av_cold int amr_wb_decode_init(AVCodecContext *avctx)
return 0;
}
-static int amr_wb_decode_frame(AVCodecContext *avctx, void *data,
- int *data_size, AVPacket *avpkt)
+static int amr_wb_decode_frame(AVCodecContext *avctx,
+ void *data, int *data_size,
+ const uint8_t *buf, int buf_size)
{
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
AMRWBContext *s = avctx->priv_data;
const uint8_t *amrData = buf;
int mode;