griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Campbell Barton
2025-07-10 21:10:15 +10:00
parent f4dbe20940 f6e2afb82a
commit ca0929e103
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/imbuf/movie/intern/movie_proxy_indexer.cc
View File

@@ -471,8 +471,6 @@ static proxy_output_ctx *alloc_proxy_output_ffmpeg(MovieReader *anim,
rv->c->color_trc = codec_ctx->color_trc;
rv->c->colorspace = codec_ctx->colorspace;
ffmpeg_copy_display_matrix(st, rv->st);
int ret = avio_open(&rv->of->pb, filepath, AVIO_FLAG_WRITE);
if (ret < 0) {
@@ -505,6 +503,7 @@ static proxy_output_ctx *alloc_proxy_output_ffmpeg(MovieReader *anim,
}
avcodec_parameters_from_context(rv->st->codecpar, rv->c);
ffmpeg_copy_display_matrix(st, rv->st);
rv->orig_height = st->codecpar->height;