This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 76a005dccff28ee46a5413f381817c4de06c9cf6 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Sat Jun 28 05:10:42 2025 +0200 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Sat Mar 7 20:14:36 2026 +0100 avcodec/rv10enc: Set encode_picture_header in rv10_encode_init() Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/mpegvideo_enc.c | 3 +-- libavcodec/rv10enc.c | 7 +++++-- libavcodec/rv20enc.c | 2 +- libavcodec/{rv10enc.h => rv20enc.h} | 7 +++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 23ec03e71e..99a697994b 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -72,7 +72,7 @@ #include "mpeg4videoenc.h" #include "internal.h" #include "bytestream.h" -#include "rv10enc.h" +#include "rv20enc.h" #include "libavutil/refstruct.h" #include <limits.h> #include "sp5x.h" @@ -930,7 +930,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) break; #if CONFIG_RV10_ENCODER case AV_CODEC_ID_RV10: - m->encode_picture_header = ff_rv10_encode_picture_header; s->c.out_format = FMT_H263; avctx->delay = 0; s->c.low_delay = 1; diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index 70a1e3c769..54941e6acc 100644 --- a/libavcodec/rv10enc.c +++ b/libavcodec/rv10enc.c @@ -29,9 +29,8 @@ #include "mpegvideo.h" #include "mpegvideoenc.h" #include "put_bits.h" -#include "rv10enc.h" -int ff_rv10_encode_picture_header(MPVMainEncContext *const m) +static int rv10_encode_picture_header(MPVMainEncContext *const m) { MPVEncContext *const s = &m->s; int full_frame= 0; @@ -63,6 +62,10 @@ int ff_rv10_encode_picture_header(MPVMainEncContext *const m) static av_cold int rv10_encode_init(AVCodecContext *avctx) { + MPVMainEncContext *const m = avctx->priv_data; + + m->encode_picture_header = rv10_encode_picture_header; + if ((avctx->width | avctx->height) & 15) { av_log(avctx, AV_LOG_ERROR, "width and height must be a multiple of 16\n"); return AVERROR(EINVAL); diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index 8bf93e7c09..835dc7b4c8 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -32,7 +32,7 @@ #include "h263data.h" #include "h263enc.h" #include "put_bits.h" -#include "rv10enc.h" +#include "rv20enc.h" int ff_rv20_encode_picture_header(MPVMainEncContext *const m) { diff --git a/libavcodec/rv10enc.h b/libavcodec/rv20enc.h similarity index 86% rename from libavcodec/rv10enc.h rename to libavcodec/rv20enc.h index 5aa7250e87..e70f1ddfd1 100644 --- a/libavcodec/rv10enc.h +++ b/libavcodec/rv20enc.h @@ -18,12 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_RV10ENC_H -#define AVCODEC_RV10ENC_H +#ifndef AVCODEC_RV20ENC_H +#define AVCODEC_RV20ENC_H typedef struct MPVMainEncContext MPVMainEncContext; -int ff_rv10_encode_picture_header(MPVMainEncContext *m); int ff_rv20_encode_picture_header(MPVMainEncContext *m); -#endif /* AVCODEC_RV10ENC_H */ +#endif /* AVCODEC_RV20ENC_H */ _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
