krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.

Browse source 
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian)

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
This commit is contained in:
Lukasz Gromanowski 2014-09-21 16:13:54 +02:00
parent 6987dd768a
commit 7ad6a94523
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwsound/ffmpeg_decoder.cpp
View file

@ -15,6 +15,14 @@ AVAudioResampleContext * swr_alloc_set_opts( AVAudioResampleContext *avr, int64_
#endif
}
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,1,0)
#define IS_NOTEQ_NOPTS_VAL(x) ((uint64_t)x != AV_NOPTS_VALUE)
#define IS_NOTEQ_NOPTS_VAL_PTR(x) (*(uint64_t*)x != AV_NOPTS_VALUE)
#else
#define IS_NOTEQ_NOPTS_VAL(x) ((int64_t)x != AV_NOPTS_VALUE)
#define IS_NOTEQ_NOPTS_VAL_PTR(x) (*(int64_t*)x != AV_NOPTS_VALUE)
#endif /* LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,1,0) */
namespace MWSound
{
@ -69,7 +77,7 @@ bool FFmpeg_Decoder::getNextPacket()
/* Check if the packet belongs to this stream */
if(stream_idx == mPacket.stream_index)
{
if(mPacket.pts != AV_NOPTS_VALUE)
if(IS_NOTEQ_NOPTS_VAL(mPacket.pts))
mNextPts = av_q2d((*mStream)->time_base)*mPacket.pts;
return true;
}