Merge commit 'f3aff31e5f66a4f1c4e34ce4944f4a402aca61ed'

* commit 'f3aff31e5f66a4f1c4e34ce4944f4a402aca61ed':
  avpicture: Deprecate the single fields

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/avcodec.h
index 3a91cfd,e368d6b..3551e3a
--- 1/libavcodec/avcodec.h
--- 2/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -3585,14 -3179,14 +3585,16 @@@ typedef struct AVHWAccel 
   */
  
  /**
 - * four components are given, that's all.
 - * the last component is alpha
 - * @deprecated Use the imgutils functions
 + * Picture data structure.
 + *
 + * Up to four components can be stored into it, the last component is
 + * alpha.
 + * @deprecated use AVFrame or imgutils functions instead
   */
  typedef struct AVPicture {
 -    uint8_t *data[AV_NUM_DATA_POINTERS];
+     attribute_deprecated
 +    uint8_t *data[AV_NUM_DATA_POINTERS];    ///< pointers to the image data planes
+     attribute_deprecated
      int linesize[AV_NUM_DATA_POINTERS];     ///< number of bytes per line
  } AVPicture;