Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Aug 2013 08:13:56 +0000 (10:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Aug 2013 08:13:56 +0000 (10:13 +0200)
* qatar/master:
  wmall: use AVFrame API properly

Conflicts:
libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/wmalosslessdec.c

@@@ -1014,9 -1017,11 +1017,9 @@@ static int decode_frame(WmallDecodeCtx 
      GetBitContext* gb = &s->gb;
      int more_frames = 0, len = 0, i, ret;
  
-     s->frame.nb_samples = s->samples_per_frame;
-     if ((ret = ff_get_buffer(s->avctx, &s->frame, 0)) < 0) {
+     s->frame->nb_samples = s->samples_per_frame;
+     if ((ret = ff_get_buffer(s->avctx, s->frame, 0)) < 0) {
          /* return an error if no frame could be decoded at all */
 -        av_log(s->avctx, AV_LOG_ERROR,
 -               "not enough space for the output samples\n");
          s->packet_loss = 1;
          return ret;
      }