summaryrefslogtreecommitdiff
path: root/libavcodec/mace.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-12-23 19:22:07 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2013-02-12 12:21:23 -0500
commit86bfcfcf2364bc837b7bb582c66a8a15a332414f (patch)
tree76a411de66783b0b7d0a8de8c86a2a7cc1e606cc /libavcodec/mace.c
parentbed957bb1116b4f11890087059c597b00c57f0be (diff)
downloadffmpeg-86bfcfcf2364bc837b7bb582c66a8a15a332414f.tar.gz
mace: decode directly to the user-provided AVFrame
Diffstat (limited to 'libavcodec/mace.c')
-rw-r--r--libavcodec/mace.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/libavcodec/mace.c b/libavcodec/mace.c
index c78a207a09..368e5d7986 100644
--- a/libavcodec/mace.c
+++ b/libavcodec/mace.c
@@ -155,7 +155,6 @@ typedef struct ChannelData {
} ChannelData;
typedef struct MACEContext {
- AVFrame frame;
ChannelData chd[2];
} MACEContext;
@@ -227,21 +226,17 @@ static void chomp6(ChannelData *chd, int16_t *output, uint8_t val, int tab_idx)
static av_cold int mace_decode_init(AVCodecContext * avctx)
{
- MACEContext *ctx = avctx->priv_data;
-
if (avctx->channels > 2)
return -1;
avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
- avcodec_get_frame_defaults(&ctx->frame);
- avctx->coded_frame = &ctx->frame;
-
return 0;
}
static int mace_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt)
{
+ AVFrame *frame = data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
int16_t **samples;
@@ -250,12 +245,12 @@ static int mace_decode_frame(AVCodecContext *avctx, void *data,
int is_mace3 = (avctx->codec_id == AV_CODEC_ID_MACE3);
/* get output buffer */
- ctx->frame.nb_samples = 3 * (buf_size << (1 - is_mace3)) / avctx->channels;
- if ((ret = ff_get_buffer(avctx, &ctx->frame)) < 0) {
+ frame->nb_samples = 3 * (buf_size << (1 - is_mace3)) / avctx->channels;
+ if ((ret = ff_get_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
- samples = (int16_t **)ctx->frame.extended_data;
+ samples = (int16_t **)frame->extended_data;
for(i = 0; i < avctx->channels; i++) {
int16_t *output = samples[i];
@@ -279,8 +274,7 @@ static int mace_decode_frame(AVCodecContext *avctx, void *data,
}
}
- *got_frame_ptr = 1;
- *(AVFrame *)data = ctx->frame;
+ *got_frame_ptr = 1;
return buf_size;
}