Build fix for Qt GUI.
This commit is contained in:
parent
8a59bd3191
commit
2be7794ab5
|
@ -1324,7 +1324,7 @@ static int select_audio_channel_layout(const OutputStream *ost, const AVCodec *c
|
||||||
#if __cplusplus >= 202002L
|
#if __cplusplus >= 202002L
|
||||||
const AVChannelLayout defaultLayout = AV_CHANNEL_LAYOUT_MONO;
|
const AVChannelLayout defaultLayout = AV_CHANNEL_LAYOUT_MONO;
|
||||||
#else
|
#else
|
||||||
const AVChannelLayout defaultLayout;
|
AVChannelLayout defaultLayout;
|
||||||
av_channel_layout_from_mask( &defaultLayout, AV_CH_LAYOUT_MONO );
|
av_channel_layout_from_mask( &defaultLayout, AV_CH_LAYOUT_MONO );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1037,17 +1037,18 @@ unsigned int gwavi_t::readChunk(const char *id, int lvl)
|
||||||
|
|
||||||
int gwavi_t::getChunkData( long long int fpos, unsigned char *buf, size_t size )
|
int gwavi_t::getChunkData( long long int fpos, unsigned char *buf, size_t size )
|
||||||
{
|
{
|
||||||
|
int ret;
|
||||||
long long int prev_fpos;
|
long long int prev_fpos;
|
||||||
|
|
||||||
prev_fpos = ftell(in);
|
prev_fpos = ftell(in);
|
||||||
|
|
||||||
fseek( in, fpos, SEEK_SET );
|
fseek( in, fpos, SEEK_SET );
|
||||||
|
|
||||||
fread( buf, 1, size, in );
|
ret = fread( buf, 1, size, in ) != size;
|
||||||
|
|
||||||
fseek( in, prev_fpos, SEEK_SET );
|
fseek( in, prev_fpos, SEEK_SET );
|
||||||
|
|
||||||
return 0;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int gwavi_t::readAviHeader(void)
|
unsigned int gwavi_t::readAviHeader(void)
|
||||||
|
|
Loading…
Reference in New Issue