| Message ID | AS8P250MB0744103E72BD1336589A1E168F289@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 20a1296bb426295f73e1b1027dc047525df3f21a |
| Headers | show |
| Series | [FFmpeg-devel,1/8] avformat/mj2kdec: Remove always-true #if CONFIG_MJPEG_2000_DEMUXER | 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 |
On Tue, 18 Oct 2022 15:31:21 +0200 Andreas Rheinhardt <andreas.rheinhardt@outlook.com> wrote: > This file is built iff said hwaccel is enabled. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/nvdec_mjpeg.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/libavcodec/nvdec_mjpeg.c b/libavcodec/nvdec_mjpeg.c > index 87f7a99a46..fce464c1f8 100644 > --- a/libavcodec/nvdec_mjpeg.c > +++ b/libavcodec/nvdec_mjpeg.c > @@ -20,8 +20,6 @@ > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA > 02110-1301 USA */ > > -#include "config_components.h" > - > #include "avcodec.h" > #include "internal.h" > #include "mjpegdec.h" > @@ -71,7 +69,6 @@ static int nvdec_mjpeg_frame_params(AVCodecContext > *avctx, return ff_nvdec_frame_params(avctx, hw_frames_ctx, 1, 0); > } > > -#if CONFIG_MJPEG_NVDEC_HWACCEL > AVHWAccel ff_mjpeg_nvdec_hwaccel = { > .name = "mjpeg_nvdec", > .type = AVMEDIA_TYPE_VIDEO, > @@ -85,4 +82,3 @@ AVHWAccel ff_mjpeg_nvdec_hwaccel = { > .uninit = ff_nvdec_decode_uninit, > .priv_data_size = sizeof(NVDECContext), > }; > -#endif LGTM. --phil
diff --git a/libavcodec/nvdec_mjpeg.c b/libavcodec/nvdec_mjpeg.c index 87f7a99a46..fce464c1f8 100644 --- a/libavcodec/nvdec_mjpeg.c +++ b/libavcodec/nvdec_mjpeg.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config_components.h" - #include "avcodec.h" #include "internal.h" #include "mjpegdec.h" @@ -71,7 +69,6 @@ static int nvdec_mjpeg_frame_params(AVCodecContext *avctx, return ff_nvdec_frame_params(avctx, hw_frames_ctx, 1, 0); } -#if CONFIG_MJPEG_NVDEC_HWACCEL AVHWAccel ff_mjpeg_nvdec_hwaccel = { .name = "mjpeg_nvdec", .type = AVMEDIA_TYPE_VIDEO, @@ -85,4 +82,3 @@ AVHWAccel ff_mjpeg_nvdec_hwaccel = { .uninit = ff_nvdec_decode_uninit, .priv_data_size = sizeof(NVDECContext), }; -#endif
This file is built iff said hwaccel is enabled. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/nvdec_mjpeg.c | 4 ---- 1 file changed, 4 deletions(-)