Skip to content
Permalink
Browse files

Suppress some warnings related to constant being redefined

  • Loading branch information...
jyavenard committed Dec 13, 2012
1 parent c4c473f commit 5f7c50d64415c5b8f32cc7e0cccae6ccd1f886b7
@@ -12,6 +12,8 @@
#include <vector>

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

#include <QString>

extern "C" {
@@ -2,6 +2,7 @@
#define AUDIOPLAYER_H

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

class MythPlayer;
class AudioOutput;
@@ -3676,6 +3676,8 @@ bool AvFormatDecoder::ProcessDataPacket(AVStream *curstream, AVPacket *pkt,
#endif // USING_MHEG:
break;
}
default:
break;
}
return true;
}
@@ -10,7 +10,6 @@

#include "playercontext.h"
#include "volumebase.h"
#include "audiooutputsettings.h"
#include "ringbuffer.h"
#include "osd.h"
#include "jitterometer.h"
@@ -2,6 +2,9 @@
#define PRIVATEDECODER_H

#include <QString>

#include "mythconfig.h"

extern "C" {
#include "libavcodec/avcodec.h"
#include "libavformat/avformat.h"
@@ -6,9 +6,8 @@
#include <QMutex>
#include <QRunnable>

#include "videooutbase.h"

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

class VideoDecodeBuffer : public QRunnable
{

0 comments on commit 5f7c50d

Please sign in to comment.
You can’t perform that action at this time.