| @@ -465,49 +465,49 @@ enum Motion_Est_ID { | |||
| enum AVDiscard{ | |||
| /* We leave some space between them for extensions (drop some | |||
| * keyframes for intra-only or drop just some bidir frames). */ | |||
| AVDISCARD_NONE =-16, ///< discard nothing | |||
| AVDISCARD_DEFAULT= 0, ///< discard useless packets like 0 size packets in avi | |||
| AVDISCARD_NONREF = 8, ///< discard all non reference | |||
| AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames | |||
| AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes | |||
| AVDISCARD_ALL = 48, ///< discard all | |||
| AVDISCARD_NONE =-16, ///< discard nothing | |||
| AVDISCARD_DEFAULT = 0, ///< discard useless packets like 0 size packets in avi | |||
| AVDISCARD_NONREF = 8, ///< discard all non reference | |||
| AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames | |||
| AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes | |||
| AVDISCARD_ALL = 48, ///< discard all | |||
| }; | |||
| enum AVColorPrimaries{ | |||
| AVCOL_PRI_BT709 =1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B | |||
| AVCOL_PRI_UNSPECIFIED=2, | |||
| AVCOL_PRI_BT470M =4, | |||
| AVCOL_PRI_BT470BG =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM | |||
| AVCOL_PRI_SMPTE170M =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC | |||
| AVCOL_PRI_SMPTE240M =7, ///< functionally identical to above | |||
| AVCOL_PRI_FILM =8, | |||
| AVCOL_PRI_NB , ///< Not part of ABI | |||
| AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B | |||
| AVCOL_PRI_UNSPECIFIED = 2, | |||
| AVCOL_PRI_BT470M = 4, | |||
| AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM | |||
| AVCOL_PRI_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC | |||
| AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above | |||
| AVCOL_PRI_FILM = 8, | |||
| AVCOL_PRI_NB , ///< Not part of ABI | |||
| }; | |||
| enum AVColorTransferCharacteristic{ | |||
| AVCOL_TRC_BT709 =1, ///< also ITU-R BT1361 | |||
| AVCOL_TRC_UNSPECIFIED=2, | |||
| AVCOL_TRC_GAMMA22 =4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM | |||
| AVCOL_TRC_GAMMA28 =5, ///< also ITU-R BT470BG | |||
| AVCOL_TRC_NB , ///< Not part of ABI | |||
| AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361 | |||
| AVCOL_TRC_UNSPECIFIED = 2, | |||
| AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM | |||
| AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG | |||
| AVCOL_TRC_NB , ///< Not part of ABI | |||
| }; | |||
| 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_NB , ///< Not part of ABI | |||
| 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_NB , ///< Not part of ABI | |||
| }; | |||
| 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 | |||
| 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 | |||
| }; | |||
| /** | |||
| @@ -516,14 +516,14 @@ enum AVColorRange{ | |||
| * X X 5 6 X 0 is undefined/unknown position | |||
| */ | |||
| enum AVChromaLocation{ | |||
| AVCHROMA_LOC_UNSPECIFIED=0, | |||
| AVCHROMA_LOC_LEFT =1, ///< mpeg2/4, h264 default | |||
| AVCHROMA_LOC_CENTER =2, ///< mpeg1, jpeg, h263 | |||
| AVCHROMA_LOC_TOPLEFT =3, ///< DV | |||
| AVCHROMA_LOC_TOP =4, | |||
| AVCHROMA_LOC_BOTTOMLEFT =5, | |||
| AVCHROMA_LOC_BOTTOM =6, | |||
| AVCHROMA_LOC_NB , ///< Not part of ABI | |||
| AVCHROMA_LOC_UNSPECIFIED = 0, | |||
| AVCHROMA_LOC_LEFT = 1, ///< mpeg2/4, h264 default | |||
| AVCHROMA_LOC_CENTER = 2, ///< mpeg1, jpeg, h263 | |||
| AVCHROMA_LOC_TOPLEFT = 3, ///< DV | |||
| AVCHROMA_LOC_TOP = 4, | |||
| AVCHROMA_LOC_BOTTOMLEFT = 5, | |||
| AVCHROMA_LOC_BOTTOM = 6, | |||
| AVCHROMA_LOC_NB , ///< Not part of ABI | |||
| }; | |||
| enum AVAudioServiceType { | |||