Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f'

* commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f': lavu: Add a pixel format for new VDA hwaccel Conflicts: doc/APIchanges libavutil/pixfmt.h libavutil/version.h

Michael Niedermayer committed 12 years ago

Commit 14aef382 parents 2ec4586 66e6c8a4 files · +10 −1Browse files

Unified · Split

4 files

doc/APIchanges +3 −0
libavutil/pixdesc.c +4 −0
libavutil/pixfmt.h +2 −0
libavutil/version.h +1 −1

doc/APIchanges+3−0

@@ -15,6 +15,9 @@ libavutil: 2012-10-22 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2014-xx-xx - xxxxxxx - lavu 53.14.0 - pixfmt.h
		19	Add AV_PIX_FMT_VDA for new-style VDA acceleration.
		20
18	2014-05-xx - xxxxxxx - lavu 52.82.0 - fifo.h	21	2014-05-xx - xxxxxxx - lavu 52.82.0 - fifo.h
19	Add av_fifo_freep() function.	22	Add av_fifo_freep() function.
20		23

libavutil/pixdesc.c+4−0

         },
         .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE,
     },
+    [AV_PIX_FMT_VDA] = {
+        .name = "vda",
+        .flags = AV_PIX_FMT_FLAG_HWACCEL,
+    },
 };
 FF_DISABLE_DEPRECATION_WARNINGS

libavutil/pixfmt.h+2−0

@@ -230,6 +230,8 @@ enum AVPixelFormat { · 229 unmodified lines
230		230
231	AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb	231	AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb
232		232
		233	AV_PIX_FMT_VDA, ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef
		234
233	#ifndef AV_PIX_FMT_ABI_GIT_MASTER	235	#ifndef AV_PIX_FMT_ABI_GIT_MASTER
234	AV_PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian	236	AV_PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
235	AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian	237	AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian

libavutil/version.h+1−1

@@ -56,7 +56,7 @@ · 55 unmodified lines
56	*/	56	*/
57		57
58	#define LIBAVUTIL_VERSION_MAJOR 52	58	#define LIBAVUTIL_VERSION_MAJOR 52
59	#define LIBAVUTIL_VERSION_MINOR 82	59	#define LIBAVUTIL_VERSION_MINOR 83
60	#define LIBAVUTIL_VERSION_MICRO 100	60	#define LIBAVUTIL_VERSION_MICRO 100
61		61
62	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	62	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code