[FFmpeg-devel] [PATCH 1/8] avformat/mj2kdec: Remove always-true #if CONFIG_MJPEG_2000_DEMUXER

[Andreas Rheinhardt]

Andreas Rheinhardt:
> This file is built iff the MJPEG 2000 demuxer is enabled.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
>  libavformat/mj2kdec.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/libavformat/mj2kdec.c b/libavformat/mj2kdec.c
> index 2373f31b94..63c3e8a391 100644
> --- a/libavformat/mj2kdec.c
> +++ b/libavformat/mj2kdec.c
> @@ -19,13 +19,10 @@
>   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>   */
>  
> -#include "config_components.h"
> -
>  #include "libavutil/intreadwrite.h"
>  #include "avformat.h"
>  #include "rawdec.h"
>  
> -#if CONFIG_MJPEG_2000_DEMUXER
>  static int mjpeg2000_probe(const AVProbeData *p)
>  {
>      const uint8_t *b = p->buf;
> @@ -53,4 +50,3 @@ static int mjpeg2000_probe(const AVProbeData *p)
>      return 0;
>  }
>  FF_DEF_RAWVIDEO_DEMUXER2(mjpeg_2000, "raw MJPEG 2000 video", mjpeg2000_probe, "j2k", AV_CODEC_ID_JPEG2000, AVFMT_GENERIC_INDEX|AVFMT_NOTIMESTAMPS)
> -#endif

Unfortunately, patch #4 is still stuck in the moderation queue ("Message
body is too big: 1997072 bytes with a limit of 1000 KB"),
so I pushed the branch here:
https://github.com/mkver/FFmpeg/commits/CONFIG for you to look at.

- Andreas