Merge commit '799f57ac96f9891d1a0f7d6c4b218ed536e8aca5'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Jun 2013 07:23:11 +0000 (09:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Jun 2013 07:27:04 +0000 (09:27 +0200)
* commit '799f57ac96f9891d1a0f7d6c4b218ed536e8aca5':
  lavc: use AVFrame API properly in pad_last_frame().

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

@@@ -1452,21 -1123,18 +1451,19 @@@ static int pad_last_frame(AVCodecContex
  
      if (!(frame = avcodec_alloc_frame()))
          return AVERROR(ENOMEM);
-     *frame = *src;
  
-     if ((ret = av_samples_get_buffer_size(&frame->linesize[0], s->channels,
-                                           s->frame_size, s->sample_fmt, 0)) < 0)
+     frame->format         = src->format;
+     frame->channel_layout = src->channel_layout;
++    av_frame_set_channels(frame, av_frame_get_channels(src));
+     frame->nb_samples     = s->frame_size;
+     ret = av_frame_get_buffer(frame, 32);
+     if (ret < 0)
          goto fail;
  
-     if (!(buf = av_malloc(ret))) {
-         ret = AVERROR(ENOMEM);
+     ret = av_frame_copy_props(frame, src);
+     if (ret < 0)
          goto fail;
-     }
  
-     frame->nb_samples = s->frame_size;
-     if ((ret = avcodec_fill_audio_frame(frame, s->channels, s->sample_fmt,
-                                         buf, ret, 0)) < 0)
-         goto fail;
      if ((ret = av_samples_copy(frame->extended_data, src->extended_data, 0, 0,
                                 src->nb_samples, s->channels, s->sample_fmt)) < 0)
          goto fail;