diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2016-09-22 12:09:26 +0200 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2016-09-23 11:15:08 +0200 |
| commit | 30d3e36a46028d6d4aec5070d1fff89f8af5f9d9 (patch) | |
| tree | a824911e9cf89c8b19b203b3ef6022e9fd81f96c /libavcodec | |
| parent | 7d17d31db4322b0c5e89f889ebf32af9ca2d91a9 (diff) | |
| download | ffmpeg-30d3e36a46028d6d4aec5070d1fff89f8af5f9d9.tar.gz | |
avcodec: add new AVOID_PROBING capability
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 10 | ||||
| -rw-r--r-- | libavcodec/version.h | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index db1061ddb5..b1741166e9 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1036,6 +1036,16 @@ typedef struct RcOverride{ */ #define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16) /** + * Decoder is not a preferred choice for probing. + * This indicates that the decoder is not a good choice for probing. + * It could for example be an expensive to spin up hardware decoder, + * or it could simply not provide a lot of useful information about + * the stream. + * A decoder marked with this flag should only be used as last resort + * choice for probing. + */ +#define AV_CODEC_CAP_AVOID_PROBING (1 << 17) +/** * Codec is intra only. */ #define AV_CODEC_CAP_INTRA_ONLY 0x40000000 diff --git a/libavcodec/version.h b/libavcodec/version.h index 9acf08126e..9e44eca09d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 57 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 58 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |