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/internal.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/internal.h')
-rw-r--r-- | libavcodec/internal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 8e6ed291f2..603ffcf8f6 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -122,6 +122,11 @@ typedef struct AVCodecInternal { * Number of audio samples to skip at the start of the next decoded frame */ int skip_samples; + + /** + * hwaccel-specific private data + */ + void *hwaccel_priv_data; } AVCodecInternal; struct AVCodecDefault { |