[FFmpeg-devel] [PATCH 3/8] avcodec/nvdec_mjpeg: Remove always-true #if CONFIG_MJPEG_NVDEC_HWACCEL

Philip Langdale philipl at overt.org
Wed Oct 19 02:42:52 EEST 2022


On Tue, 18 Oct 2022 15:31:21 +0200
Andreas Rheinhardt <andreas.rheinhardt at outlook.com> wrote:

> This file is built iff said hwaccel is enabled.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at 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


More information about the ffmpeg-devel mailing list