Skip to content

change undefined flags (deprecated before ffmpeg 2.0) #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2016
Merged

change undefined flags (deprecated before ffmpeg 2.0) #280

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/AvTranscoder/properties/PixelProperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ EComponentType PixelProperties::getColorComponents() const
{
return eComponentGray;
}
else if(_pixelDesc->flags & PIX_FMT_PAL || _pixelDesc->flags & PIX_FMT_RGB)
else if(_pixelDesc->flags & AV_PIX_FMT_FLAG_PAL || _pixelDesc->flags & AV_PIX_FMT_FLAG_RGB)
{
return eComponentRgb;
}
Expand Down Expand Up @@ -154,7 +154,7 @@ bool PixelProperties::isBigEndian() const
{
if(!_pixelDesc)
throw std::runtime_error("unable to find pixel description.");
return (_pixelDesc->flags & PIX_FMT_BE) == PIX_FMT_BE;
return (_pixelDesc->flags & AV_PIX_FMT_FLAG_BE) == AV_PIX_FMT_FLAG_BE;
}

bool PixelProperties::hasAlpha() const
Expand All @@ -163,7 +163,7 @@ bool PixelProperties::hasAlpha() const
throw std::runtime_error("unable to find pixel description.");

#if LIBAVCODEC_VERSION_MAJOR > 53
return (_pixelDesc->flags & PIX_FMT_ALPHA) == PIX_FMT_ALPHA;
return (_pixelDesc->flags & AV_PIX_FMT_FLAG_ALPHA) == AV_PIX_FMT_FLAG_ALPHA;
#else
return false;
#endif
Expand All @@ -173,35 +173,35 @@ bool PixelProperties::isPlanar() const
{
if(!_pixelDesc)
throw std::runtime_error("unable to find pixel description.");
return (_pixelDesc->flags & PIX_FMT_PLANAR) == PIX_FMT_PLANAR;
return (_pixelDesc->flags & AV_PIX_FMT_FLAG_PLANAR) == AV_PIX_FMT_FLAG_PLANAR;
}

bool PixelProperties::isIndexedColors() const
{
if(!_pixelDesc)
throw std::runtime_error("unable to find pixel description.");
return (_pixelDesc->flags & PIX_FMT_PAL) == PIX_FMT_PAL;
return (_pixelDesc->flags & AV_PIX_FMT_FLAG_PAL) == AV_PIX_FMT_FLAG_PAL;
}

bool PixelProperties::isBitWisePacked() const
{
if(!_pixelDesc)
throw std::runtime_error("unable to find pixel description.");
return (_pixelDesc->flags & PIX_FMT_BITSTREAM) == PIX_FMT_BITSTREAM;
return (_pixelDesc->flags & AV_PIX_FMT_FLAG_BITSTREAM) == AV_PIX_FMT_FLAG_BITSTREAM;
}

bool PixelProperties::isHardwareAccelerated() const
{
if(!_pixelDesc)
throw std::runtime_error("unable to find pixel description.");
return (_pixelDesc->flags & PIX_FMT_HWACCEL) == PIX_FMT_HWACCEL;
return (_pixelDesc->flags & AV_PIX_FMT_FLAG_HWACCEL) == AV_PIX_FMT_FLAG_HWACCEL;
}

bool PixelProperties::isRgbPixelData() const
{
if(!_pixelDesc)
throw std::runtime_error("unable to find pixel description.");
return (_pixelDesc->flags & PIX_FMT_RGB) == PIX_FMT_RGB;
return (_pixelDesc->flags & AV_PIX_FMT_FLAG_RGB) == AV_PIX_FMT_FLAG_RGB;
}

bool PixelProperties::isPseudoPaletted() const
Expand All @@ -210,7 +210,7 @@ bool PixelProperties::isPseudoPaletted() const
throw std::runtime_error("unable to find pixel description.");

#if LIBAVCODEC_VERSION_MAJOR > 53
return (_pixelDesc->flags & PIX_FMT_PSEUDOPAL) == PIX_FMT_PSEUDOPAL;
return (_pixelDesc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) == AV_PIX_FMT_FLAG_PSEUDOPAL;
#else
return false;
#endif
Expand Down