From 7ef8d11baeaf1847ba7f1df5d858f8cffea9300d Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 12 Aug 2020 21:03:34 +0000 Subject: coding style fixes git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9470 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp') diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 986528d19..b9d890770 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -35,12 +35,12 @@ static int ffmpeg_read(void *data, uint8_t *buf, int size) if(d->input()->atEnd()) return AVERROR_EOF; #endif - return (int)d->input()->read((char*)buf, size); + return static_cast(d->input()->read((char*)buf, size)); } static int64_t ffmpeg_seek(void *data, int64_t offset, int whence) { - DecoderFFmpeg *d = (DecoderFFmpeg*)data; + DecoderFFmpeg *d = static_cast(data); int64_t absolute_pos = 0; /*if(d->input()->isSequential()) return -1;*/ @@ -66,10 +66,10 @@ static int64_t ffmpeg_seek(void *data, int64_t offset, int whence) } // Decoder class -DecoderFFmpeg::DecoderFFmpeg(const QString &path, QIODevice *i) - : Decoder(i) +DecoderFFmpeg::DecoderFFmpeg(const QString &path, QIODevice *i) : Decoder(i), + m_path(path) + { - m_path = path; m_pkt = av_packet_alloc(); } @@ -410,9 +410,9 @@ void DecoderFFmpeg::fillBuffer() if((m_eof || send_error < 0) && recv_error < 0) { - char errbuf[AV_ERROR_MAX_STRING_SIZE] = { 0 }; if(!m_eof) { + char errbuf[AV_ERROR_MAX_STRING_SIZE] = { 0 }; av_strerror(send_error, errbuf, sizeof(errbuf)); qWarning("DecoderFFmpeg: avcodec_send_packet error: %s", errbuf); av_strerror(recv_error, errbuf, sizeof(errbuf)); -- cgit v1.2.3-13-gbd6f