virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

ffv1dec: call ff_get_format if width and height change

Browse Source
This commit is contained in:
Lynne
2025-11-05 20:31:23 +01:00
parent 18d7ded29e
commit 6080db7d23
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/ffv1.h
View File

@@ -139,6 +139,7 @@ typedef struct FFV1Context {
uint32_t crcref; uint32_t crcref;
enum AVPixelFormat pix_fmt; enum AVPixelFormat pix_fmt;
enum AVPixelFormat configured_pix_fmt; enum AVPixelFormat configured_pix_fmt;
int configured_width, configured_height;
const AVFrame *cur_enc_frame; const AVFrame *cur_enc_frame;
int plane_count; int plane_count;

6
libavcodec/ffv1dec.c
View File

@@ -507,11 +507,15 @@ static int read_header(FFV1Context *f, RangeCoder *c)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (f->configured_pix_fmt != f->pix_fmt) { if (f->configured_pix_fmt != f->pix_fmt ||
f->configured_width != f->avctx->width ||
f->configured_height != f->avctx->height) {
f->avctx->pix_fmt = get_pixel_format(f); f->avctx->pix_fmt = get_pixel_format(f);
if (f->avctx->pix_fmt < 0) if (f->avctx->pix_fmt < 0)
return AVERROR(EINVAL); return AVERROR(EINVAL);
f->configured_pix_fmt = f->pix_fmt; f->configured_pix_fmt = f->pix_fmt;
f->configured_width = f->avctx->width;
f->configured_height = f->avctx->height;
} }
ff_dlog(f->avctx, "%d %d %d\n", ff_dlog(f->avctx, "%d %d %d\n",