NotificationsYou must be signed in to change notification settings
Fork50
Star165

Commit2f21294

authored

Merge pull request#280 from avTranscoder/support_ffmpeg_3_1

PixelProperties: replace deprecated flags

2 parents6b535b3 +5311d7c commit2f21294Copy full SHA for 2f21294

File tree

1 file changed

-9

lines changed

src/AvTranscoder/properties
- PixelProperties.cpp

1 file changed

-9

lines changed

`‎src/AvTranscoder/properties/PixelProperties.cpp`

Lines changed: 9 additions & 9 deletions

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`		`-elseif(_pixelDesc->flags &PIX_FMT_PAL \|\| _pixelDesc->flags &PIX_FMT_RGB)`
	`104`	`+elseif(_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`	`throwstd::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`	`boolPixelProperties::hasAlpha()const`
`@@ -163,7 +163,7 @@ bool PixelProperties::hasAlpha() const`
`163`	`163`	`throwstd::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`	`returnfalse;`
`169`	`169`	`#endif`
`@@ -173,35 +173,35 @@ bool PixelProperties::isPlanar() const`
`173`	`173`	`{`
`174`	`174`	`if(!_pixelDesc)`
`175`	`175`	`throwstd::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`	`boolPixelProperties::isIndexedColors()const`
`180`	`180`	`{`
`181`	`181`	`if(!_pixelDesc)`
`182`	`182`	`throwstd::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`	`boolPixelProperties::isBitWisePacked()const`
`187`	`187`	`{`
`188`	`188`	`if(!_pixelDesc)`
`189`	`189`	`throwstd::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`	`boolPixelProperties::isHardwareAccelerated()const`
`194`	`194`	`{`
`195`	`195`	`if(!_pixelDesc)`
`196`	`196`	`throwstd::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`	`boolPixelProperties::isRgbPixelData()const`
`201`	`201`	`{`
`202`	`202`	`if(!_pixelDesc)`
`203`	`203`	`throwstd::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`	`boolPixelProperties::isPseudoPaletted()const`
`@@ -210,7 +210,7 @@ bool PixelProperties::isPseudoPaletted() const`
`210`	`210`	`throwstd::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`	`returnfalse;`
`216`	`216`	`#endif`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2f21294

File tree

1 file changed

1 file changed

`‎src/AvTranscoder/properties/PixelProperties.cpp`

0 commit comments