| Message ID | 20240318202000.24745-1-cus@passwd.hu |
|---|---|
| State | Accepted |
| Commit | 7251f909721a570726775acf61b2b9c28a950c76 |
| Headers | show |
| Series | [FFmpeg-devel] fftools/ffplay: use correct buffersink channel layout parameters | 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 |
LGTM if tested. Sorry for the breakage. Please backport it to all the relevant release branches too. On Mon, Mar 18, 2024 at 5:20 PM Marton Balint <cus@passwd.hu> wrote: > Regression since 0995e1f1b31f6e937a1b527407ed3e850f138098. > > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > fftools/ffplay.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/fftools/ffplay.c b/fftools/ffplay.c > index 09b4846deb..fcd1319ce7 100644 > --- a/fftools/ffplay.c > +++ b/fftools/ffplay.c > @@ -2040,6 +2040,8 @@ static int configure_audio_filters(VideoState *is, > const char *afilters, int for > goto end; > > if (force_output_format) { > + av_bprint_clear(&bp); > + av_channel_layout_describe_bprint(&is->audio_tgt.ch_layout, &bp); > sample_rates [0] = is->audio_tgt.freq; > if ((ret = av_opt_set_int(filt_asink, "all_channel_counts", 0, > AV_OPT_SEARCH_CHILDREN)) < 0) > goto end; > -- > 2.35.3 > > _______________________________________________ > 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". >
On Mon, 18 Mar 2024, James Almer wrote: > LGTM if tested. Sorry for the breakage. > Please backport it to all the relevant release branches too. OK, will apply. Thanks, Marton > > On Mon, Mar 18, 2024 at 5:20 PM Marton Balint <cus@passwd.hu> wrote: > >> Regression since 0995e1f1b31f6e937a1b527407ed3e850f138098. >> >> Signed-off-by: Marton Balint <cus@passwd.hu> >> --- >> fftools/ffplay.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/fftools/ffplay.c b/fftools/ffplay.c >> index 09b4846deb..fcd1319ce7 100644 >> --- a/fftools/ffplay.c >> +++ b/fftools/ffplay.c >> @@ -2040,6 +2040,8 @@ static int configure_audio_filters(VideoState *is, >> const char *afilters, int for >> goto end; >> >> if (force_output_format) { >> + av_bprint_clear(&bp); >> + av_channel_layout_describe_bprint(&is->audio_tgt.ch_layout, &bp); >> sample_rates [0] = is->audio_tgt.freq; >> if ((ret = av_opt_set_int(filt_asink, "all_channel_counts", 0, >> AV_OPT_SEARCH_CHILDREN)) < 0) >> goto end; >> -- >> 2.35.3 >> >> _______________________________________________ >> 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". >> > _______________________________________________ > 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".
diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 09b4846deb..fcd1319ce7 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -2040,6 +2040,8 @@ static int configure_audio_filters(VideoState *is, const char *afilters, int for goto end; if (force_output_format) { + av_bprint_clear(&bp); + av_channel_layout_describe_bprint(&is->audio_tgt.ch_layout, &bp); sample_rates [0] = is->audio_tgt.freq; if ((ret = av_opt_set_int(filt_asink, "all_channel_counts", 0, AV_OPT_SEARCH_CHILDREN)) < 0) goto end;
Regression since 0995e1f1b31f6e937a1b527407ed3e850f138098. Signed-off-by: Marton Balint <cus@passwd.hu> --- fftools/ffplay.c | 2 ++ 1 file changed, 2 insertions(+)