ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Tue Mar 21 12:55:40 2017 +0100| [70ca9b76e2afb6dc89e0ffdb2753237ed5290009] | committer: Clément Bœsch
Merge commit '6f733ecab6faff2a16534f2ce7d2ffd41c07846b' * commit '6f733ecab6faff2a16534f2ce7d2ffd41c07846b': mpegvideo_enc: add const to the AVCodec instance Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70ca9b76e2afb6dc89e0ffdb2753237ed5290009 --- libavcodec/mpegvideo_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 0e4cbe8..8051605 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1447,7 +1447,7 @@ static int encode_frame(AVCodecContext *c, AVFrame *frame) static int estimate_best_b_count(MpegEncContext *s) { - AVCodec *codec = avcodec_find_encoder(s->avctx->codec_id); + const AVCodec *codec = avcodec_find_encoder(s->avctx->codec_id); AVCodecContext *c = avcodec_alloc_context3(NULL); const int scale = s->brd_scale; int i, j, out_size, p_lambda, b_lambda, lambda2; ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog