* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909': vdpau: deprecate old codec-specific pixel formats Conflicts: libavutil/version.h
Unified · Split
| @@ -15,6 +15,9 @@ libavutil: 2012-10-22 · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | API changes, most recent first: |
| 17 | 17 | |
| 18 | +2013-08-xx - xxxxxxx - lavu 52.14.0 - pixfmt.h | |
| 19 | + Deprecate AV_PIX_FMT_VDPAU_*. Use AV_PIX_FMT_VDPAU instead. | |
| 20 | + | |
| 18 | 21 | 2013-08-xx - xxxxxxx - lavc 55.11.0 - avcodec.h |
| 19 | 22 | Add output_picture_number to AVCodecParserContext. |
| 20 | 23 | |
| @@ -67,11 +67,13 @@ · 66 unmodified lines | ||
| 67 | 67 | PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples) |
| 68 | 68 | PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range |
| 69 | 69 | PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples) |
| 70 | +#if FF_API_VDPAU | |
| 70 | 71 | PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers |
| 71 | 72 | PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers |
| 72 | 73 | PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers |
| 73 | 74 | PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers |
| 74 | 75 | PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers |
| 76 | +#endif | |
| 75 | 77 | PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian |
| 76 | 78 | PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian |
| 77 | 79 | |
| @@ -95,7 +97,9 @@ · 17 unmodified lines | ||
| 95 | 97 | PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian |
| 96 | 98 | PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian |
| 97 | 99 | PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian |
| 100 | +#if FF_API_VDPAU | |
| 98 | 101 | PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers |
| 102 | +#endif | |
| 99 | 103 | PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer |
| 100 | 104 | |
| 101 | 105 | PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0 |
| @@ -855,6 +855,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 854 unmodified lines | ||
| 855 | 855 | }, |
| 856 | 856 | .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, |
| 857 | 857 | }, |
| 858 | +#if FF_API_VDPAU | |
| 858 | 859 | [AV_PIX_FMT_VDPAU_H264] = { |
| 859 | 860 | .name = "vdpau_h264", |
| 860 | 861 | .log2_chroma_w = 1, |
| @@ -891,6 +892,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 30 unmodified lines | ||
| 891 | 892 | .log2_chroma_h = 1, |
| 892 | 893 | .flags = AV_PIX_FMT_FLAG_HWACCEL, |
| 893 | 894 | }, |
| 895 | +#endif | |
| 894 | 896 | [AV_PIX_FMT_RGB48BE] = { |
| 895 | 897 | .name = "rgb48be", |
| 896 | 898 | .nb_components = 3, |
| @@ -103,11 +103,13 @@ enum AVPixelFormat { · 102 unmodified lines | ||
| 103 | 103 | AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples) |
| 104 | 104 | AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range |
| 105 | 105 | AV_PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples) |
| 106 | +#if FF_API_VDPAU | |
| 106 | 107 | AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers |
| 107 | 108 | AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers |
| 108 | 109 | AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers |
| 109 | 110 | AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers |
| 110 | 111 | AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers |
| 112 | +#endif | |
| 111 | 113 | AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian |
| 112 | 114 | AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian |
| 113 | 115 | |
| @@ -131,7 +133,9 @@ enum AVPixelFormat { · 17 unmodified lines | ||
| 131 | 133 | AV_PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian |
| 132 | 134 | AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian |
| 133 | 135 | AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian |
| 136 | +#if FF_API_VDPAU | |
| 134 | 137 | AV_PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers |
| 138 | +#endif | |
| 135 | 139 | AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer |
| 136 | 140 | |
| 137 | 141 | AV_PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0 |
| @@ -75,7 +75,7 @@ · 74 unmodified lines | ||
| 75 | 75 | */ |
| 76 | 76 | |
| 77 | 77 | #define LIBAVUTIL_VERSION_MAJOR 52 |
| 78 | −#define LIBAVUTIL_VERSION_MINOR 40 | |
| 78 | +#define LIBAVUTIL_VERSION_MINOR 41 | |
| 79 | 79 | #define LIBAVUTIL_VERSION_MICRO 100 |
| 80 | 80 | |
| 81 | 81 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
| @@ -135,6 +135,9 @@ · 53 unmodified lines | ||
| 135 | 135 | #ifndef FF_API_AVFRAME_LAVC |
| 136 | 136 | #define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 53) |
| 137 | 137 | #endif |
| 138 | +#ifndef FF_API_VDPAU | |
| 139 | +#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 53) | |
| 140 | +#endif | |
| 138 | 141 | |
| 139 | 142 | /** |
| 140 | 143 | * @} |