Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: do not use avcodec header in frame.h

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

diff --cc libavutil/frame.h
index 1222d3c,07d87e3..5e113fa
--- 1/libavutil/frame.h
--- 2/libavutil/frame.h
+++ b/libavutil/frame.h
@@@ -29,30 -27,8 +27,31 @@@
  #include "dict.h"
  #include "rational.h"
  #include "samplefmt.h"
+ #include "version.h"
  
 +enum AVColorSpace{
 +    AVCOL_SPC_RGB         =  0,
 +    AVCOL_SPC_BT709       =  1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
 +    AVCOL_SPC_UNSPECIFIED =  2,
 +    AVCOL_SPC_FCC         =  4,
 +    AVCOL_SPC_BT470BG     =  5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
 +    AVCOL_SPC_SMPTE170M   =  6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
 +    AVCOL_SPC_SMPTE240M   =  7,
 +    AVCOL_SPC_YCOCG       =  8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
 +    AVCOL_SPC_BT2020_NCL  =  9, ///< ITU-R BT2020 non-constant luminance system
 +    AVCOL_SPC_BT2020_CL   = 10, ///< ITU-R BT2020 constant luminance system
 +    AVCOL_SPC_NB              , ///< Not part of ABI
 +};
 +#define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG
 +
 +enum AVColorRange{
 +    AVCOL_RANGE_UNSPECIFIED = 0,
 +    AVCOL_RANGE_MPEG        = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
 +    AVCOL_RANGE_JPEG        = 2, ///< the normal     2^n-1   "JPEG" YUV ranges
 +    AVCOL_RANGE_NB             , ///< Not part of ABI
 +};
 +
 +
  enum AVFrameSideDataType {
      /**
       * The data is the AVPanScan struct defined in libavcodec.