diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2013-10-14 07:41:16 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 18:46:12 +0200 |
| commit | 0f99aad80f656c1bb0fca8034f17447dfc7a1876 (patch) | |
| tree | 155c0710eb4ccb35c25ac42e7b72ba563f1bd36d /libavcodec | |
| parent | f7ed044eeaf39c73333d3cc01d07b07d9bc860c6 (diff) | |
| download | ffmpeg-0f99aad80f656c1bb0fca8034f17447dfc7a1876.tar.gz | |
lavc: Adding seek_preroll to AVCodecContext
seek_preroll field is added to the AVCodecContext struct. It indicates
the number of samples to be discarded whenever there is a discontinuity.
The minor version is bumped accordingly.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 10 | ||||
| -rw-r--r-- | libavcodec/utils.c | 1 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0b23b64fb1..b64331d398 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2882,6 +2882,13 @@ typedef struct AVCodecContext { * - encoding: unused */ int skip_alpha; + + /** + * Number of samples to skip after a discontinuity + * - decoding: unused + * - encoding: set by libavcodec + */ + int seek_preroll; } AVCodecContext; AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx); @@ -2893,6 +2900,9 @@ void av_codec_set_codec_descriptor(AVCodecContext *avctx, co int av_codec_get_lowres(const AVCodecContext *avctx); void av_codec_set_lowres(AVCodecContext *avctx, int val); +int av_codec_get_seek_preroll(const AVCodecContext *avctx); +void av_codec_set_seek_preroll(AVCodecContext *avctx, int val); + /** * AVProfile. */ diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 20de48e269..3832b81677 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1044,6 +1044,7 @@ void avcodec_free_frame(AVFrame **frame) MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor) MAKE_ACCESSORS(AVCodecContext, codec, int, lowres) +MAKE_ACCESSORS(AVCodecContext, codec, int, seek_preroll) int av_codec_get_max_lowres(const AVCodec *codec) { diff --git a/libavcodec/version.h b/libavcodec/version.h index 63a2d8f61c..c540c27bfa 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#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, \ |