RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/riffdec: pass correct pointer to av_log

This commit is contained in:
Paul B Mahol 2019-04-07 21:09:56 +02:00
parent 4c8e3725d9
commit 3a2adeedaf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/riffdec.c
View File

@ -58,7 +58,7 @@ enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid)
* an openended structure. * an openended structure.
*/ */
static void parse_waveformatex(AVIOContext *pb, AVCodecParameters *par) static void parse_waveformatex(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par)
{ {
ff_asf_guid subformat; ff_asf_guid subformat;
int bps; int bps;
@ -81,7 +81,7 @@ static void parse_waveformatex(AVIOContext *pb, AVCodecParameters *par)
} else { } else {
par->codec_id = ff_codec_guid_get_id(ff_codec_wav_guids, subformat); par->codec_id = ff_codec_guid_get_id(ff_codec_wav_guids, subformat);
if (!par->codec_id) if (!par->codec_id)
av_log(pb, AV_LOG_WARNING, av_log(s, AV_LOG_WARNING,
"unknown subformat:"FF_PRI_GUID"\n", "unknown subformat:"FF_PRI_GUID"\n",
FF_ARG_GUID(subformat)); FF_ARG_GUID(subformat));
} }
@ -140,7 +140,7 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
size -= 18; size -= 18;
cbSize = FFMIN(size, cbSize); cbSize = FFMIN(size, cbSize);
if (cbSize >= 22 && id == 0xfffe) { /* WAVEFORMATEXTENSIBLE */ if (cbSize >= 22 && id == 0xfffe) { /* WAVEFORMATEXTENSIBLE */
parse_waveformatex(pb, par); parse_waveformatex(s, pb, par);
cbSize -= 22; cbSize -= 22;
size -= 22; size -= 22;
} }