Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Suppress some warnings related to constant being redefined
  • Loading branch information
jyavenard committed Dec 13, 2012
1 parent c4c473f commit 5f7c50d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 3 deletions.
2 changes: 2 additions & 0 deletions mythtv/libs/libmyth/audio/audiooutputsettings.h
Expand Up @@ -12,6 +12,8 @@
#include <vector>

#include "mythexp.h"
#include "mythconfig.h"

#include <QString>

extern "C" {
Expand Down
1 change: 1 addition & 0 deletions mythtv/libs/libmythtv/audioplayer.h
Expand Up @@ -2,6 +2,7 @@
#define AUDIOPLAYER_H

#include <stdint.h>
#include "audiooutputsettings.h"

class MythPlayer;
class AudioOutput;
Expand Down
2 changes: 2 additions & 0 deletions mythtv/libs/libmythtv/avformatdecoder.cpp
Expand Up @@ -3676,6 +3676,8 @@ bool AvFormatDecoder::ProcessDataPacket(AVStream *curstream, AVPacket *pkt,
#endif // USING_MHEG:
break;
}
default:
break;
}
return true;
}
Expand Down
1 change: 0 additions & 1 deletion mythtv/libs/libmythtv/mythplayer.h
Expand Up @@ -10,7 +10,6 @@

#include "playercontext.h"
#include "volumebase.h"
#include "audiooutputsettings.h"
#include "ringbuffer.h"
#include "osd.h"
#include "jitterometer.h"
Expand Down
3 changes: 3 additions & 0 deletions mythtv/libs/libmythtv/privatedecoder.h
Expand Up @@ -2,6 +2,9 @@
#define PRIVATEDECODER_H

#include <QString>

#include "mythconfig.h"

extern "C" {
#include "libavcodec/avcodec.h"
#include "libavformat/avformat.h"
Expand Down
3 changes: 1 addition & 2 deletions mythtv/programs/mythtranscode/videodecodebuffer.h
Expand Up @@ -6,9 +6,8 @@
#include <QMutex>
#include <QRunnable>

#include "videooutbase.h"

#include "mythplayer.h"
#include "videooutbase.h"

class VideoDecodeBuffer : public QRunnable
{
Expand Down

0 comments on commit 5f7c50d

Please sign in to comment.