virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

libvorbisdec: Remove AVFrame from context

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-13 15:54:47 +01:00
parent fe84577273
commit 324d96644b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/libvorbisdec.c
View File

@ -25,7 +25,6 @@
#include "internal.h"
typedef struct OggVorbisDecContext {
AVFrame frame;
vorbis_info vi; /**< vorbis_info used during init */
vorbis_dsp_state vd; /**< DSP state used for analysis */
vorbis_block vb; /**< vorbis_block used for analysis */
@ -131,6 +130,7 @@ static int oggvorbis_decode_frame(AVCodecContext *avccontext, void *data,
int *got_frame_ptr, AVPacket *avpkt)
{
OggVorbisDecContext *context = avccontext->priv_data ;
AVFrame *frame = data;
float **pcm ;
ogg_packet *op= &context->op;
int samples, total_samples, total_bytes;
@ -142,12 +142,12 @@ static int oggvorbis_decode_frame(AVCodecContext *avccontext, void *data,
return 0;
}
context->frame.nb_samples = 8192*4;
if ((ret = ff_get_buffer(avccontext, &context->frame)) < 0) {
frame->nb_samples = 8192*4;
if ((ret = ff_get_buffer(avccontext, frame)) < 0) {
av_log(avccontext, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
output = (int16_t *)context->frame.data[0];
output = (int16_t *)frame->data[0];
op->packet = avpkt->data;
@ -172,9 +172,8 @@ static int oggvorbis_decode_frame(AVCodecContext *avccontext, void *data,
vorbis_synthesis_read(&context->vd, samples) ;
}
context->frame.nb_samples = total_samples;
frame->nb_samples = total_samples;
*got_frame_ptr = 1;
*(AVFrame *)data = context->frame;
return avpkt->size;
}