| Message ID | 20201208133539.12095-1-ffmpeg@gyani.pro |
|---|---|
| State | Accepted |
| Commit | b9b719fedc532ebc6bbde711d60985e8cb5957b2 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/mpegvideo_enc: check for SpeedHQ encoder | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
lgtm On Tue, Dec 8, 2020 at 2:36 PM Gyan Doshi <ffmpeg@gyani.pro> wrote: > Avoids build failure when mpegvideo_enc is built but SpeedHQ encoder > isn't. > --- > libavcodec/mpegvideo_enc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c > index 7afc789ec0..243d3ca632 100644 > --- a/libavcodec/mpegvideo_enc.c > +++ b/libavcodec/mpegvideo_enc.c > @@ -2996,7 +2996,7 @@ static int encode_thread(AVCodecContext *c, void > *arg){ > s->first_slice_line = 1; > s->ptr_lastgob = s->pb.buf; > for (mb_y_order = s->start_mb_y; mb_y_order < s->end_mb_y; > mb_y_order++) { > - if (s->codec_id == AV_CODEC_ID_SPEEDHQ) { > + if (CONFIG_SPEEDHQ_ENCODER && s->codec_id == AV_CODEC_ID_SPEEDHQ) > { > int first_in_slice; > mb_y = ff_speedhq_mb_y_order_to_mb(mb_y_order, s->mb_height, > &first_in_slice); > if (first_in_slice && mb_y_order != s->start_mb_y) > -- > 2.27.0 > > _______________________________________________ > 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".
Thanks. Pushed as b9b719fedc532ebc6bbde711d60985e8cb5957b2 On 08-12-2020 07:06 pm, Paul B Mahol wrote: > lgtm > > On Tue, Dec 8, 2020 at 2:36 PM Gyan Doshi <ffmpeg@gyani.pro> wrote: > >> Avoids build failure when mpegvideo_enc is built but SpeedHQ encoder >> isn't. >> --- >> libavcodec/mpegvideo_enc.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c >> index 7afc789ec0..243d3ca632 100644 >> --- a/libavcodec/mpegvideo_enc.c >> +++ b/libavcodec/mpegvideo_enc.c >> @@ -2996,7 +2996,7 @@ static int encode_thread(AVCodecContext *c, void >> *arg){ >> s->first_slice_line = 1; >> s->ptr_lastgob = s->pb.buf; >> for (mb_y_order = s->start_mb_y; mb_y_order < s->end_mb_y; >> mb_y_order++) { >> - if (s->codec_id == AV_CODEC_ID_SPEEDHQ) { >> + if (CONFIG_SPEEDHQ_ENCODER && s->codec_id == AV_CODEC_ID_SPEEDHQ) >> { >> int first_in_slice; >> mb_y = ff_speedhq_mb_y_order_to_mb(mb_y_order, s->mb_height, >> &first_in_slice); >> if (first_in_slice && mb_y_order != s->start_mb_y) >> -- >> 2.27.0 >> >> _______________________________________________ >> 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/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 7afc789ec0..243d3ca632 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2996,7 +2996,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->first_slice_line = 1; s->ptr_lastgob = s->pb.buf; for (mb_y_order = s->start_mb_y; mb_y_order < s->end_mb_y; mb_y_order++) { - if (s->codec_id == AV_CODEC_ID_SPEEDHQ) { + if (CONFIG_SPEEDHQ_ENCODER && s->codec_id == AV_CODEC_ID_SPEEDHQ) { int first_in_slice; mb_y = ff_speedhq_mb_y_order_to_mb(mb_y_order, s->mb_height, &first_in_slice); if (first_in_slice && mb_y_order != s->start_mb_y)