diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 22:35:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 22:35:19 +0200 |
| commit | be920e4820efe310956627074c4d04f963a327aa (patch) | |
| tree | d814802049d84181da8664022249a9da105d73f1 /libavcodec/internal.h | |
| parent | db4ac46fed9b12e3597903c5e99cce146bb05c7e (diff) | |
| parent | 5637ff01218a44fcc1fff9b4382a15a6470abcc9 (diff) | |
| download | ffmpeg-be920e4820efe310956627074c4d04f963a327aa.tar.gz | |
Merge commit '5637ff01218a44fcc1fff9b4382a15a6470abcc9'
* commit '5637ff01218a44fcc1fff9b4382a15a6470abcc9':
libavcodec: Clarify the documentation of the internal codec capability flags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 8128f0d835..38630eebcb 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -34,11 +34,16 @@ #include "config.h" /** - * Codec is thread safe. + * The codec does not modify any global variables in the init function, + * allowing to call the init function without locking any global mutexes. */ #define FF_CODEC_CAP_INIT_THREADSAFE (1 << 0) /** - * Codec cleans up memory on init failure. + * The codec allows calling the close function for deallocation even if + * the init function returned a failure. Without this capability flag, a + * codec does such cleanup internally when returning failures from the + * init function and does not expect the close function to be called at + * all. */ #define FF_CODEC_CAP_INIT_CLEANUP (1 << 1) |