Skip to content

Commit

Permalink
do not reference HAVE_AV_CONFIG_H outside FFmpeg
Browse files Browse the repository at this point in the history
This is only defined when building FFmpeg, otherwise it should not be defined
and does not need to be `undef`ed.
  • Loading branch information
ulmus-scott committed Jan 1, 2025
1 parent ad408f8 commit e22ca3e
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 8 deletions.
1 change: 0 additions & 1 deletion mythtv/external/libmythdvdnav/config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#define DVDREAD_VERSION @DVDREAD_VERSION@
#define DVDREAD_VERSION_STRING "@DVDREAD_VERSION@"

#define HAVE_AV_CONFIG_H
#cmakedefine HAVE_DLFCN_H
#cmakedefine01 HAVE_GETTIMEOFDAY
#cmakedefine01 HAVE_BIGENDIAN
Expand Down
2 changes: 0 additions & 2 deletions mythtv/external/libmythdvdnav/libmythdvdnav.pro
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ DEFINES += DVDREAD_VERSION_MICRO=$$dvdread_micro
DEFINES += DVDREAD_VERSION=$$dvdread_version
DEFINES += DVDREAD_VERSION_STRING=\\\"$$dvdread_version\\\"

DEFINES += HAVE_AV_CONFIG_H

# DEFINES += LOG_DEBUG TRACE

QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
Expand Down
1 change: 0 additions & 1 deletion mythtv/libs/libmythtv/io/mythavformatwriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "libmythtv/io/mythmediawriter.h"
#include "libmythtv/mythavutil.h"

#undef HAVE_AV_CONFIG_H
extern "C" {
#include "libavcodec/avcodec.h"
#include "libavformat/avformat.h"
Expand Down
3 changes: 0 additions & 3 deletions mythtv/libs/libmythtv/mythplayer.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
// -*- Mode: c++ -*-

#undef HAVE_AV_CONFIG_H

// C++ headers
#include <algorithm>
#include <cassert>
Expand Down
1 change: 0 additions & 1 deletion mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "lzo/lzo1x.h"
#include "v4lrecorder.h"

#undef HAVE_AV_CONFIG_H
extern "C" {
#include "libavcodec/avcodec.h"
}
Expand Down

0 comments on commit e22ca3e

Please sign in to comment.