Skip to content

Commit 2bb3bf9

Browse files
author
Clement Champetier
committed
Frame: skip call of 'av_copy_packet' if depend on libav
1 parent bfb0151 commit 2bb3bf9

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/AvTranscoder/frame/Frame.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,18 @@ void Frame::initAVPacket()
7878

7979
void Frame::copyAVPacket( const AVPacket& avPacket )
8080
{
81-
#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(55, 56, 108)
82-
av_copy_packet( &_packet, &avPacket );
83-
#elif LIBAVCODEC_VERSION_INT > AV_VERSION_INT(54, 56, 0)
84-
av_copy_packet( &_packet, const_cast<AVPacket*>( &avPacket ) );
85-
#else
81+
#if AVTRANSCODER_FFMPEG_DEPENDENCY
82+
#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(55, 56, 108)
83+
av_copy_packet( &_packet, &avPacket );
84+
return;
85+
#elif LIBAVCODEC_VERSION_INT > AV_VERSION_INT(54, 56, 0)
86+
av_copy_packet( &_packet, const_cast<AVPacket*>( &avPacket ) );
87+
return;
88+
#endif
89+
#endif
8690
// we just care about data, not side properties of AVPacket
8791
initAVPacket();
8892
copyData( avPacket.data, avPacket.size );
89-
#endif
9093
}
9194

9295
}

0 commit comments

Comments
 (0)