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

Simplified casting when comparing to AV_NOPTS_VALUE.

Browse source 
AV_NOPTS_VALUE is casted to int64_t when compared with pts,
so with libavc >= 56.1 it should be no-op because in that version
it's already signed int.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
This commit is contained in:
Lukasz Gromanowski 2014-09-21 20:05:46 +02:00
parent 7ad6a94523
commit c72369fafe
1 changed files with 1 additions and 9 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,14 +15,6 @@ AVAudioResampleContext * swr_alloc_set_opts( AVAudioResampleContext *avr, int64_
#endif #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 namespace MWSound
{ {
@ -77,7 +69,7 @@ bool FFmpeg_Decoder::getNextPacket()
/* Check if the packet belongs to this stream */ /* Check if the packet belongs to this stream */
if(stream_idx == mPacket.stream_index) if(stream_idx == mPacket.stream_index)
{ {
if(IS_NOTEQ_NOPTS_VAL(mPacket.pts)) if(mPacket.pts != (int64_t)AV_NOPTS_VALUE)
mNextPts = av_q2d((*mStream)->time_base)*mPacket.pts; mNextPts = av_q2d((*mStream)->time_base)*mPacket.pts;
return true; return true;
} }