← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/atrac3.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/atrac3.c
42
42
#include "fft.h"
43
43
#include "fmtconvert.h"
44
44
#include "get_bits.h"
 
45
#include "internal.h"
45
46
 
46
47
#include "atrac.h"
47
48
#include "atrac3data.h"
811
812
 
812
813
    /* get output buffer */
813
814
    q->frame.nb_samples = SAMPLES_PER_FRAME;
814
 
    if ((ret = avctx->get_buffer(avctx, &q->frame)) < 0) {
 
815
    if ((ret = ff_get_buffer(avctx, &q->frame)) < 0) {
815
816
        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
816
817
        return ret;
817
818
    }
912
913
    } else {
913
914
        av_log(NULL, AV_LOG_ERROR, "Unknown extradata size %d.\n",
914
915
               avctx->extradata_size);
 
916
        return AVERROR(EINVAL);
915
917
    }
916
918
 
917
919
    /* Check the extradata */