change undefined flags (deprecated before ffmpeg 2.0)

Marc-Antoine Arnaud · Marc-Antoine Arnaud · commit 5311d7cb2324 · 2016-10-05T17:31:42.000+02:00
diff --git a/src/AvTranscoder/properties/PixelProperties.cpp b/src/AvTranscoder/properties/PixelProperties.cpp
@@ -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;
     }
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ EComponentType PixelProperties::getColorComponents() const`
`101`	`101`	`{`
`102`	`102`	`return eComponentGray;`
`103`	`103`	`}`
`104`		`- else if(_pixelDesc->flags & PIX_FMT_PAL \|\| _pixelDesc->flags & PIX_FMT_RGB)`
	`104`	`+ else if(_pixelDesc->flags & AV_PIX_FMT_FLAG_PAL \|\| _pixelDesc->flags & AV_PIX_FMT_FLAG_RGB)`
`105`	`105`	`{`
`106`	`106`	`return eComponentRgb;`
`107`	`107`	`}`
`@@ -154,7 +154,7 @@ bool PixelProperties::isBigEndian() const`
`154`	`154`	`{`
`155`	`155`	`if(!_pixelDesc)`
`156`	`156`	`throw std::runtime_error("unable to find pixel description.");`
`157`		`- return (_pixelDesc->flags & PIX_FMT_BE) == PIX_FMT_BE;`
	`157`	`+ return (_pixelDesc->flags & AV_PIX_FMT_FLAG_BE) == AV_PIX_FMT_FLAG_BE;`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`bool PixelProperties::hasAlpha() const`
`@@ -163,7 +163,7 @@ bool PixelProperties::hasAlpha() const`
`163`	`163`	`throw std::runtime_error("unable to find pixel description.");`
`164`	`164`
`165`	`165`	`#if LIBAVCODEC_VERSION_MAJOR > 53`
`166`		`- return (_pixelDesc->flags & PIX_FMT_ALPHA) == PIX_FMT_ALPHA;`
	`166`	`+ return (_pixelDesc->flags & AV_PIX_FMT_FLAG_ALPHA) == AV_PIX_FMT_FLAG_ALPHA;`
`167`	`167`	`#else`
`168`	`168`	`return false;`
`169`	`169`	`#endif`
`@@ -173,35 +173,35 @@ bool PixelProperties::isPlanar() const`
`173`	`173`	`{`
`174`	`174`	`if(!_pixelDesc)`
`175`	`175`	`throw std::runtime_error("unable to find pixel description.");`
`176`		`- return (_pixelDesc->flags & PIX_FMT_PLANAR) == PIX_FMT_PLANAR;`
	`176`	`+ return (_pixelDesc->flags & AV_PIX_FMT_FLAG_PLANAR) == AV_PIX_FMT_FLAG_PLANAR;`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`bool PixelProperties::isIndexedColors() const`
`180`	`180`	`{`
`181`	`181`	`if(!_pixelDesc)`
`182`	`182`	`throw std::runtime_error("unable to find pixel description.");`
`183`		`- return (_pixelDesc->flags & PIX_FMT_PAL) == PIX_FMT_PAL;`
	`183`	`+ return (_pixelDesc->flags & AV_PIX_FMT_FLAG_PAL) == AV_PIX_FMT_FLAG_PAL;`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`bool PixelProperties::isBitWisePacked() const`
`187`	`187`	`{`
`188`	`188`	`if(!_pixelDesc)`
`189`	`189`	`throw std::runtime_error("unable to find pixel description.");`
`190`		`- return (_pixelDesc->flags & PIX_FMT_BITSTREAM) == PIX_FMT_BITSTREAM;`
	`190`	`+ return (_pixelDesc->flags & AV_PIX_FMT_FLAG_BITSTREAM) == AV_PIX_FMT_FLAG_BITSTREAM;`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`bool PixelProperties::isHardwareAccelerated() const`
`194`	`194`	`{`
`195`	`195`	`if(!_pixelDesc)`
`196`	`196`	`throw std::runtime_error("unable to find pixel description.");`
`197`		`- return (_pixelDesc->flags & PIX_FMT_HWACCEL) == PIX_FMT_HWACCEL;`
	`197`	`+ return (_pixelDesc->flags & AV_PIX_FMT_FLAG_HWACCEL) == AV_PIX_FMT_FLAG_HWACCEL;`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`bool PixelProperties::isRgbPixelData() const`
`201`	`201`	`{`
`202`	`202`	`if(!_pixelDesc)`
`203`	`203`	`throw std::runtime_error("unable to find pixel description.");`
`204`		`- return (_pixelDesc->flags & PIX_FMT_RGB) == PIX_FMT_RGB;`
	`204`	`+ return (_pixelDesc->flags & AV_PIX_FMT_FLAG_RGB) == AV_PIX_FMT_FLAG_RGB;`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`bool PixelProperties::isPseudoPaletted() const`
`@@ -210,7 +210,7 @@ bool PixelProperties::isPseudoPaletted() const`
`210`	`210`	`throw std::runtime_error("unable to find pixel description.");`
`211`	`211`
`212`	`212`	`#if LIBAVCODEC_VERSION_MAJOR > 53`
`213`		`- return (_pixelDesc->flags & PIX_FMT_PSEUDOPAL) == PIX_FMT_PSEUDOPAL;`
	`213`	`+ return (_pixelDesc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) == AV_PIX_FMT_FLAG_PSEUDOPAL;`
`214`	`214`	`#else`
`215`	`215`	`return false;`
`216`	`216`	`#endif`