diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 02:21:44 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 02:21:44 +0400 |
commit | 2ec4586d77c18eff38c128936a67b7d7a2e7f9a0 (patch) | |
tree | 376a5dc29dc6421c52dc395aef14ee6429f1eb68 /libavcodec/avcodec.h | |
parent | c4fe50b954a0490c54efca19682cfae00eba3145 (diff) | |
parent | dd2d3b766b20196d0b65a82e3d897ccecbf7adb8 (diff) |
Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'
* commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8':
lavc: Add hwaccel private data and init/uninit callbacks
Conflicts:
libavcodec/avcodec.h
libavcodec/internal.h
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 431e0eab56..d35ce94850 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3307,6 +3307,29 @@ typedef struct AVHWAccel { * @param s the mpeg context */ void (*decode_mb)(struct MpegEncContext *s); + + /** + * Initialize the hwaccel private data. + * + * This will be called from ff_get_format(), after hwaccel and + * hwaccel_context are set and the hwaccel private data in AVCodecInternal + * is allocated. + */ + int (*init)(AVCodecContext *avctx); + + /** + * Uninitialize the hwaccel private data. + * + * This will be called from get_format() or avcodec_close(), after hwaccel + * and hwaccel_context are already uninitialized. + */ + int (*uninit)(AVCodecContext *avctx); + + /** + * Size of the private data to allocate in + * AVCodecInternal.hwaccel_priv_data. + */ + int priv_data_size; } AVHWAccel; /** |