Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 11:44:34 +0000 (13:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 11:44:34 +0000 (13:44 +0200)
* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
  Add missing deprecation attributes

Conflicts:
libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/avcodec.h
libavfilter/avfilter.h
libavutil/pixdesc.h

Simple merge
   * @{
   */
  
 +#include <stddef.h>
 +
+ #include "libavutil/attributes.h"
  #include "libavutil/avutil.h"
 +#include "libavutil/dict.h"
  #include "libavutil/frame.h"
  #include "libavutil/log.h"
  #include "libavutil/samplefmt.h"
Simple merge