[FFmpeg-cvslog] r19134 - branches/0.5/libavcodec/libopencore-amr.c
diego
subversion
Mon Jun 8 00:41:11 CEST 2009
Author: diego
Date: Mon Jun 8 00:41:11 2009
New Revision: 19134
Log:
Fix OpenCORE build: Do not use new AVPacket infrastructure from trunk.
Modified:
branches/0.5/libavcodec/libopencore-amr.c
Modified: branches/0.5/libavcodec/libopencore-amr.c
==============================================================================
--- branches/0.5/libavcodec/libopencore-amr.c Sun Jun 7 22:14:56 2009 (r19133)
+++ branches/0.5/libavcodec/libopencore-amr.c Mon Jun 8 00:41:11 2009 (r19134)
@@ -107,10 +107,9 @@ static av_cold int amr_nb_decode_close(A
}
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(AV
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;
More information about the ffmpeg-cvslog
mailing list