Message ID | 20201210111657.2276739-40-andreas.rheinhardt@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | Make mpegvideo encoders init-threadsafe | 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 |
probably ok On Thu, Dec 10, 2020 at 12:25 PM Andreas Rheinhardt < andreas.rheinhardt@gmail.com> wrote: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > configure | 1 + > libavcodec/speedhq.c | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/configure b/configure > index 90914752f1..249d7afe02 100755 > --- a/configure > +++ b/configure > @@ -2846,6 +2846,7 @@ sonic_encoder_select="golomb rangecoder" > sonic_ls_encoder_select="golomb rangecoder" > sp5x_decoder_select="mjpeg_decoder" > speedhq_decoder_select="mpegvideo" > +speedhq_encoder_select="mpegvideoenc" > srgc_decoder_deps="zlib" > svq1_decoder_select="hpeldsp" > svq1_encoder_select="hpeldsp me_cmp mpegvideoenc" > diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c > index 0312ed6f0b..739e64fbc5 100644 > --- a/libavcodec/speedhq.c > +++ b/libavcodec/speedhq.c > @@ -26,6 +26,7 @@ > > #define BITSTREAM_READER_LE > > +#include "config.h" > #include "libavutil/attributes.h" > > #include "avcodec.h" > @@ -140,6 +141,7 @@ RLTable ff_rl_speedhq = { > speedhq_level, > }; > > +#if CONFIG_SPEEDHQ_DECODER > /* NOTE: The first element is always 16, unscaled. */ > static const uint8_t unscaled_quant_matrix[64] = { > 16, 16, 19, 22, 26, 27, 29, 34, > @@ -654,3 +656,4 @@ AVCodec ff_speedhq_decoder = { > .capabilities = AV_CODEC_CAP_DR1, > .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, > }; > +#endif /* CONFIG_SPEEDHQ_DECODER */ > -- > 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".
diff --git a/configure b/configure index 90914752f1..249d7afe02 100755 --- a/configure +++ b/configure @@ -2846,6 +2846,7 @@ sonic_encoder_select="golomb rangecoder" sonic_ls_encoder_select="golomb rangecoder" sp5x_decoder_select="mjpeg_decoder" speedhq_decoder_select="mpegvideo" +speedhq_encoder_select="mpegvideoenc" srgc_decoder_deps="zlib" svq1_decoder_select="hpeldsp" svq1_encoder_select="hpeldsp me_cmp mpegvideoenc" diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 0312ed6f0b..739e64fbc5 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -26,6 +26,7 @@ #define BITSTREAM_READER_LE +#include "config.h" #include "libavutil/attributes.h" #include "avcodec.h" @@ -140,6 +141,7 @@ RLTable ff_rl_speedhq = { speedhq_level, }; +#if CONFIG_SPEEDHQ_DECODER /* NOTE: The first element is always 16, unscaled. */ static const uint8_t unscaled_quant_matrix[64] = { 16, 16, 19, 22, 26, 27, 29, 34, @@ -654,3 +656,4 @@ AVCodec ff_speedhq_decoder = { .capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; +#endif /* CONFIG_SPEEDHQ_DECODER */
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- configure | 1 + libavcodec/speedhq.c | 3 +++ 2 files changed, 4 insertions(+)