Merge commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 23:00:55 +0000 (00:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 23:01:23 +0000 (00:01 +0100)
* commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d':
  lavc: deprecate avcodec_alloc_frame().

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

Simple merge
@@@ -1067,12 -813,12 +1067,13 @@@ void avcodec_get_frame_defaults(AVFram
      frame->sample_aspect_ratio = (AVRational) {0, 1 };
      frame->format              = -1; /* unknown */
      frame->extended_data       = frame->data;
 +    av_frame_set_colorspace(frame, AVCOL_SPC_UNSPECIFIED);
  }
  
+ #if FF_API_AVFRAME_LAVC
  AVFrame *avcodec_alloc_frame(void)
  {
 -    AVFrame *frame = av_mallocz(sizeof(AVFrame));
 +    AVFrame *frame = av_malloc(sizeof(AVFrame));
  
      if (frame == NULL)
          return NULL;