Skip to content

Commit

Permalink
misc
Browse files Browse the repository at this point in the history
  • Loading branch information
wang-bin committed Jan 5, 2013
1 parent cf088cf commit 06e7d3e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 0 additions & 6 deletions src/QtAV/private/AVDecoder_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ extern "C"
}
#endif //__cplusplus

#if CONFIG_EZX
#define PIX_FMT PIX_FMT_BGR565
#else
#define PIX_FMT PIX_FMT_RGB32
#endif //CONFIG_EZX

#include <QtCore/QByteArray>
#include <QtCore/QMutex>
#include <QtAV/QtAV_Global.h>
Expand Down
8 changes: 7 additions & 1 deletion src/VideoDecoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
#include <QtAV/QtAV_Compat.h>
#include <QtCore/QSize>

#if CONFIG_EZX
#define PIX_FMT PIX_FMT_BGR565
#else
#define PIX_FMT PIX_FMT_RGB32
#endif //CONFIG_EZX

namespace QtAV {

class VideoDecoderPrivate : public AVDecoderPrivate
Expand All @@ -39,7 +45,7 @@ VideoDecoder::VideoDecoder()
:AVDecoder(*new VideoDecoderPrivate())
{
}

//TODO: use ipp, cuda decode and yuv functions. is sws_scale necessary?
bool VideoDecoder::decode(const QByteArray &encoded)
{
DPTR_D(VideoDecoder);
Expand Down

0 comments on commit 06e7d3e

Please sign in to comment.