comparison oggvorbis.c @ 925:7fccaa0d699d libavcodec

AVVideoFrame -> AVFrame

924:3814e9115672

    vorbis_comment vc ;
} OggVorbisContext ;


int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) {
    if(avccontext->quality) /* VBR requested */
	return vorbis_encode_init_vbr(vi, avccontext->channels,
		  avccontext->sample_rate, (float)avccontext->quality / 1000) ;

    return vorbis_encode_init(vi, avccontext->channels,
	          avccontext->sample_rate, -1, avccontext->bit_rate, -1) ;
}

    }
    vorbis_analysis_init(&context->vd, &context->vi) ;
    vorbis_block_init(&context->vd, &context->vb) ;

    avccontext->frame_size = OGGVORBIS_FRAME_SIZE ;
    
    return 0 ;
}

*/

    vorbis_block_clear(&context->vb);
    vorbis_dsp_clear(&context->vd);
    vorbis_info_clear(&context->vi);
  
    return 0 ;
}

925:7fccaa0d699d

    vorbis_comment vc ;
} OggVorbisContext ;


int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) {
    if(avccontext->coded_frame->quality) /* VBR requested */
	return vorbis_encode_init_vbr(vi, avccontext->channels,
		  avccontext->sample_rate, (float)avccontext->coded_frame->quality / 1000) ;

    return vorbis_encode_init(vi, avccontext->channels,
	          avccontext->sample_rate, -1, avccontext->bit_rate, -1) ;
}

    }
    vorbis_analysis_init(&context->vd, &context->vi) ;
    vorbis_block_init(&context->vd, &context->vb) ;

    avccontext->frame_size = OGGVORBIS_FRAME_SIZE ;
 
    avccontext->coded_frame= avcodec_alloc_frame();
    avccontext->coded_frame->key_frame= 1;
    
    return 0 ;
}

*/

    vorbis_block_clear(&context->vb);
    vorbis_dsp_clear(&context->vd);
    vorbis_info_clear(&context->vi);

    av_freep(&avccontext->coded_frame);
  
    return 0 ;
}