diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2013-08-11 11:21:50 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2013-08-11 19:31:46 +0200 |
| commit | af05edc658f3af284a1af39c00a36aeff0adaa0d (patch) | |
| tree | ec0b9967a6235ac2e50e1132c99c506dada6bff9 | |
| parent | d87f9da53c93eca0cb0fe2f7c41bb56b461a8c93 (diff) | |
| download | ffmpeg-af05edc658f3af284a1af39c00a36aeff0adaa0d.tar.gz | |
vdpau: Add an allocation function for AVVDPAUContext.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavcodec/vdpau.c | 5 | ||||
| -rw-r--r-- | libavcodec/vdpau.h | 10 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
4 files changed, 19 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index e3a64a020e..147b3c722f 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-08-xx - xxxxxxx - lavc 55.26.100 - vdpau.h + Add allocation function for AVVDPAUContext, allowing + to extend it in the future without breaking ABI/API. + 2013-08-xx - xxxxxxx - lavc 55.16.0 - avcodec.h Extend AVPacket API with av_packet_unref, av_packet_ref, av_packet_move_ref, av_packet_copy_props, av_packet_free_side_data. diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index cf564a5982..63ea75527d 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -38,6 +38,11 @@ * @{ */ +AVVDPAUContext *av_alloc_vdpaucontext(void) +{ + return av_mallocz(sizeof(AVVDPAUContext)); +} + int ff_vdpau_common_start_frame(Picture *pic, av_unused const uint8_t *buffer, av_unused uint32_t size) diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 08116bf637..210d517d83 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -73,7 +73,8 @@ union AVVDPAUPictureInfo { /** * This structure is used to share data between the libavcodec library and * the client video application. - * The user shall zero-allocate the structure and make it available as + * The user shall allocate the structure via the av_alloc_vdpau_hwaccel + * function and make it available as * AVCodecContext.hwaccel_context. Members can be set by the user once * during initialization or through each AVCodecContext.get_buffer() * function call. In any case, they must be valid prior to calling @@ -130,6 +131,13 @@ typedef struct AVVDPAUContext { #endif } AVVDPAUContext; +/** + * @brief allocation function for AVVDPAUContext + * + * Allows extending the struct without breaking API/ABI + */ +AVVDPAUContext *av_alloc_vdpaucontext(void); + #if FF_API_CAP_VDPAU /** @brief The videoSurface is used for rendering. */ #define FF_VDPAU_STATE_USED_FOR_RENDER 1 diff --git a/libavcodec/version.h b/libavcodec/version.h index ad8af90c51..2be90c450c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 25 +#define LIBAVCODEC_VERSION_MINOR 26 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |