← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic

« back to all changes in this revision

Viewing changes to libavcodec/mpc7.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-12-21 15:32:13 UTC
  • mto: (1.2.18)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: package-import@ubuntu.com-20121221153213-fudzrugjzivtv0wp
Tags: upstream-9~beta3
Import upstream version 9~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/mpc7.c
25
25
 * divided into 32 subbands.
26
26
 */
27
27
 
 
28
#include "libavutil/channel_layout.h"
28
29
#include "libavutil/lfg.h"
29
30
#include "avcodec.h"
30
31
#include "get_bits.h"
31
32
#include "dsputil.h"
 
33
#include "internal.h"
32
34
#include "mpegaudiodsp.h"
33
 
#include "libavutil/audioconvert.h"
34
35
 
35
36
#include "mpc.h"
36
37
#include "mpc7data.h"
229
230
 
230
231
    /* get output buffer */
231
232
    c->frame.nb_samples = last_frame ? c->lastframelen : MPC_FRAME_SIZE;
232
 
    if ((ret = avctx->get_buffer(avctx, &c->frame)) < 0) {
 
233
    if ((ret = ff_get_buffer(avctx, &c->frame)) < 0) {
233
234
        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
234
235
        return ret;
235
236
    }