Skip to content

Commit cc769ff

Browse files
committed
fix build error on odroid-n2-plus
1 parent ce74285 commit cc769ff

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

modules/videoio/src/cap_ffmpeg_impl.hpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ extern "C" {
149149
#define AV_PIX_FMT_BGR24 PIX_FMT_BGR24
150150
#define AV_PIX_FMT_RGB24 PIX_FMT_RGB24
151151
#define AV_PIX_FMT_GRAY8 PIX_FMT_GRAY8
152+
#define AV_PIX_FMT_BGRA PIX_FMT_BGRA
153+
#define AV_PIX_FMT_RGBA PIX_FMT_RGBA
152154
#define AV_PIX_FMT_YUV422P PIX_FMT_YUV422P
153155
#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P
154156
#define AV_PIX_FMT_YUV444P PIX_FMT_YUV444P
@@ -356,7 +358,7 @@ struct AVInterruptCallbackMetadata
356358

357359
// https://github.com/opencv/opencv/pull/12693#issuecomment-426236731
358360
static
359-
inline const char* _opencv_avcodec_get_name(AVCodecID id)
361+
inline const char* _opencv_avcodec_get_name(CV_CODEC_ID id)
360362
{
361363
#if LIBAVCODEC_VERSION_MICRO >= 100 \
362364
&& LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(53, 47, 100)
@@ -1087,11 +1089,11 @@ bool CvCapture_FFMPEG::processRawPacket()
10871089
{
10881090
rawModeInitialized = true;
10891091
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(58, 20, 100)
1090-
AVCodecID eVideoCodec = ic->streams[video_stream]->codecpar->codec_id;
1092+
CV_CODEC_ID eVideoCodec = ic->streams[video_stream]->codecpar->codec_id;
10911093
#elif LIBAVFORMAT_BUILD > 4628
1092-
AVCodecID eVideoCodec = video_st->codec->codec_id;
1094+
CV_CODEC_ID eVideoCodec = video_st->codec->codec_id;
10931095
#else
1094-
AVCodecID eVideoCodec = video_st->codec.codec_id;
1096+
CV_CODEC_ID eVideoCodec = video_st->codec.codec_id;
10951097
#endif
10961098
const char* filterName = NULL;
10971099
if (eVideoCodec == CV_CODEC(CODEC_ID_H264)
@@ -1394,7 +1396,7 @@ double CvCapture_FFMPEG::getProperty( int property_id ) const
13941396
if( !video_st ) return 0;
13951397

13961398
double codec_tag = 0;
1397-
AVCodecID codec_id = AV_CODEC_ID_NONE;
1399+
CV_CODEC_ID codec_id = AV_CODEC_ID_NONE;
13981400
const char* codec_fourcc = NULL;
13991401

14001402
switch( property_id )
@@ -1858,7 +1860,7 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc,
18581860

18591861
#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54,25,0)
18601862
// Set per-codec defaults
1861-
AVCodecID c_id = c->codec_id;
1863+
CV_CODEC_ID c_id = c->codec_id;
18621864
avcodec_get_context_defaults3(c, codec);
18631865
// avcodec_get_context_defaults3 erases codec_id for some reason
18641866
c->codec_id = c_id;

0 commit comments

Comments
 (0)