Message ID | tencent_B8DC400B9DE61ED0A326E2E7DF2A86933606@qq.com |
---|---|
State | Accepted |
Commit | af919cf780b59cdf60835f412f78db1138fc1138 |
Headers | show |
Series | [FFmpeg-devel] fftools/ffmpeg: fix av_display_rotation_set() type cast | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Zhao Zhili <quinkblack@foxmail.com> 于2022年9月1日周四 10:59写道: > > From: Zhao Zhili <zhilizhao@tencent.com> > > Signed-off-by: Zhao Zhili <zhilizhao@tencent.com> > --- > fftools/ffmpeg.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c > index fbabbe6ea2..ecaf3bd984 100644 > --- a/fftools/ffmpeg.c > +++ b/fftools/ffmpeg.c > @@ -3263,7 +3263,7 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame, > return AVERROR(ENOMEM); > memcpy(dst, sd->data, sd->size); > if (ist->autorotate && sd->type == AV_PKT_DATA_DISPLAYMATRIX) > - av_display_rotation_set((uint32_t *)dst, 0); > + av_display_rotation_set((int32_t *)dst, 0); > } > } > } > -- > 2.25.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". looks ok to me Thanks Steven
> On Sep 1, 2022, at 14:17, Steven Liu <lingjiujianke@gmail.com> wrote: > > Zhao Zhili <quinkblack@foxmail.com> 于2022年9月1日周四 10:59写道: >> >> From: Zhao Zhili <zhilizhao@tencent.com> >> >> Signed-off-by: Zhao Zhili <zhilizhao@tencent.com> >> --- >> fftools/ffmpeg.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c >> index fbabbe6ea2..ecaf3bd984 100644 >> --- a/fftools/ffmpeg.c >> +++ b/fftools/ffmpeg.c >> @@ -3263,7 +3263,7 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame, >> return AVERROR(ENOMEM); >> memcpy(dst, sd->data, sd->size); >> if (ist->autorotate && sd->type == AV_PKT_DATA_DISPLAYMATRIX) >> - av_display_rotation_set((uint32_t *)dst, 0); >> + av_display_rotation_set((int32_t *)dst, 0); >> } >> } >> } >> -- >> 2.25.1 >> >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> >> To unsubscribe, visit link above, or email >> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > > looks ok to me > Applied, thanks!
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index fbabbe6ea2..ecaf3bd984 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3263,7 +3263,7 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame, return AVERROR(ENOMEM); memcpy(dst, sd->data, sd->size); if (ist->autorotate && sd->type == AV_PKT_DATA_DISPLAYMATRIX) - av_display_rotation_set((uint32_t *)dst, 0); + av_display_rotation_set((int32_t *)dst, 0); } } }