Browse Source

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>
tags/n2.1
Vignesh Venkatasubramanian Michael Niedermayer 12 years ago
parent
commit
0f99aad80f
3 changed files with 12 additions and 1 deletions
  1. +10
    -0
      libavcodec/avcodec.h
  2. +1
    -0
      libavcodec/utils.c
  3. +1
    -1
      libavcodec/version.h

+ 10
- 0
libavcodec/avcodec.h View File

@@ -2882,6 +2882,13 @@ typedef struct AVCodecContext {
* - encoding: unused * - encoding: unused
*/ */
int skip_alpha; int skip_alpha;

/**
* Number of samples to skip after a discontinuity
* - decoding: unused
* - encoding: set by libavcodec
*/
int seek_preroll;
} AVCodecContext; } AVCodecContext;


AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx); 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); int av_codec_get_lowres(const AVCodecContext *avctx);
void av_codec_set_lowres(AVCodecContext *avctx, int val); 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. * AVProfile.
*/ */


+ 1
- 0
libavcodec/utils.c View File

@@ -1044,6 +1044,7 @@ void avcodec_free_frame(AVFrame **frame)
MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase)
MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor) MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor)
MAKE_ACCESSORS(AVCodecContext, codec, int, lowres) MAKE_ACCESSORS(AVCodecContext, codec, int, lowres)
MAKE_ACCESSORS(AVCodecContext, codec, int, seek_preroll)


int av_codec_get_max_lowres(const AVCodec *codec) int av_codec_get_max_lowres(const AVCodec *codec)
{ {


+ 1
- 1
libavcodec/version.h View File

@@ -29,7 +29,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"


#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 35
#define LIBAVCODEC_VERSION_MINOR 36
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 100


#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \


Loading…
Cancel
Save