Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'

* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
  Add missing deprecation attributes

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavfilter/avfilter.h
index 6a93436,e741721..6de0f66
--- 1/libavfilter/avfilter.h
--- 2/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@@ -33,10 -33,8 +33,11 @@@
   * @{
   */
  
 +#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"

diff --cc libavutil/pixdesc.h
Simple merge