[FFmpeg-cvslog] avformat/mj2kdec: Remove always-true #if CONFIG_MJPEG_2000_DEMUXER

Andreas Rheinhardt git at videolan.org
Fri Oct 21 22:16:20 EEST 2022


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Oct 18 12:07:39 2022 +0200| [1132007d3c340960f67da1dab79afe5931f3d36e] | committer: Andreas Rheinhardt

avformat/mj2kdec: Remove always-true #if CONFIG_MJPEG_2000_DEMUXER

This file is built iff the MJPEG 2000 demuxer is enabled.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1132007d3c340960f67da1dab79afe5931f3d36e
---

 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



More information about the ffmpeg-cvslog mailing list