X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=ffmpeg.h;h=a806445e0dc49e00f5cdf3f81f9662f7b7320c11;hb=73d9a9a6af5d00cfa9b98c7d9fc9abd0c734ba8e;hp=d34561275a9519555df64f373d3d291cba8234ed;hpb=974ee16d6a71c31d0b5db4f139a40831c2f45776;p=android-x86%2Fexternal-ffmpeg.git diff --git a/ffmpeg.h b/ffmpeg.h index d34561275a..a806445e0d 100644 --- a/ffmpeg.h +++ b/ffmpeg.h @@ -226,6 +226,8 @@ typedef struct OptionsContext { int nb_program; SpecifierOpt *time_bases; int nb_time_bases; + SpecifierOpt *enc_time_bases; + int nb_enc_time_bases; } OptionsContext; typedef struct InputFilter { @@ -453,9 +455,9 @@ typedef struct OutputStream { int64_t last_mux_dts; // the timebase of the packets sent to the muxer AVRational mux_timebase; + AVRational enc_timebase; int nb_bitstream_filters; - uint8_t *bsf_extradata_updated; AVBSFContext **bsf_ctx; AVCodecContext *enc_ctx;