diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 22:20:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 22:38:53 +0100 |
| commit | a048bd44b2563dc453e0c97bdca60cf028feaf50 (patch) | |
| tree | 9160697af0c020fe8841326e81eff6e08670cd11 /libavcodec/internal.h | |
| parent | 79f013a206394bfc90bbb72995f5cf8965181f51 (diff) | |
| parent | 117b432748ca87de4cd0f09d9b1495545e264733 (diff) | |
| download | ffmpeg-a048bd44b2563dc453e0c97bdca60cf028feaf50.tar.gz | |
Merge commit '117b432748ca87de4cd0f09d9b1495545e264733'
* commit '117b432748ca87de4cd0f09d9b1495545e264733':
lavc: Introduce AVCodec internal capabilities
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index f4e12e8084..3d0cd5b582 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -33,6 +33,16 @@ #include "avcodec.h" #include "config.h" +/** + * Codec is thread safe. + */ +#define FF_CODEC_CAP_INIT_THREADSAFE (1 << 0) +/** + * Codec cleans up memory on init failure. + */ +#define FF_CODEC_CAP_INIT_CLEANUP (1 << 1) + + #define FF_SANE_NB_CHANNELS 63U #define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1) @@ -157,7 +167,7 @@ int ff_init_buffer_info(AVCodecContext *s, AVFrame *frame); void avpriv_color_frame(AVFrame *frame, const int color[4]); extern volatile int ff_avcodec_locked; -int ff_lock_avcodec(AVCodecContext *log_ctx); +int ff_lock_avcodec(AVCodecContext *log_ctx, AVCodec *codec); int ff_unlock_avcodec(void); int avpriv_lock_avformat(void); |