Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-04-20 20:19:25 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2016-04-21 14:49:32 +0300
commit0de99ab06f707e71a3c3bb30083d1cc324ba9c26 (patch)
tree7a312b333c570ef15f2d63cc608f5dce559e2801 /libavcodec
parent9f36ea57ae6eefb42432220feab0350494f4144c (diff)
avcodec: Add avpriv_codec_get_cap_skip_frame_fill_param()
With this the use of the caps_internal from libavformat can be avoided Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/internal.h2
-rw-r--r--libavcodec/utils.c4
-rw-r--r--libavcodec/version.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 24d320c186..6c0efec8b1 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -293,6 +293,8 @@ const uint8_t *avpriv_find_start_code(const uint8_t *p,
const uint8_t *end,
uint32_t *state);
+int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec);
+
/**
* Check that the provided frame dimensions are valid and set them on the codec
* context.
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 44843a44e9..9766bb06d6 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1160,6 +1160,10 @@ int av_codec_get_max_lowres(const AVCodec *codec)
return codec->max_lowres;
}
+int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec){
+ return !!(codec->caps_internal & FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM);
+}
+
static void get_subtitle_defaults(AVSubtitle *sub)
{
memset(sub, 0, sizeof(*sub));
diff --git a/libavcodec/version.h b/libavcodec/version.h
index b8ef9c5193..8712425366 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 35
+#define LIBAVCODEC_VERSION_MINOR 36
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \