videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avformat/wavenc: Improve unsupported codec error messages 

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-02-25 07:37:54 +01:00
parent 95af3b6625
commit 6eab25fd13
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/wavenc.c
View File

@ -159,9 +159,8 @@ static av_cold int peak_init_writer(AVFormatContext *s)
par->codec_id != AV_CODEC_ID_PCM_S16LE && par->codec_id != AV_CODEC_ID_PCM_S16LE &&
par->codec_id != AV_CODEC_ID_PCM_U8 && par->codec_id != AV_CODEC_ID_PCM_U8 &&
par->codec_id != AV_CODEC_ID_PCM_U16LE) { par->codec_id != AV_CODEC_ID_PCM_U16LE) {
AVCodec *codec = avcodec_find_decoder(s->streams[0]->codecpar->codec_id); av_log(s, AV_LOG_ERROR, "Codec %s not supported for Peak Chunk\n",
av_log(s, AV_LOG_ERROR, "%s codec not supported for Peak Chunk\n", avcodec_get_name(par->codec_id));
codec ? codec->name : "NONE");
return -1; return -1;
} }
@ -325,9 +324,8 @@ static int wav_write_header(AVFormatContext *s)
/* format header */ /* format header */
fmt = ff_start_tag(pb, "fmt "); fmt = ff_start_tag(pb, "fmt ");
if (ff_put_wav_header(s, pb, s->streams[0]->codecpar, 0) < 0) { if (ff_put_wav_header(s, pb, s->streams[0]->codecpar, 0) < 0) {
const AVCodecDescriptor *desc = avcodec_descriptor_get(s->streams[0]->codecpar->codec_id); av_log(s, AV_LOG_ERROR, "Codec %s not supported in WAVE format\n",
av_log(s, AV_LOG_ERROR, "%s codec not supported in WAVE format\n", avcodec_get_name(s->streams[0]->codecpar->codec_id));
desc ? desc->name : "unknown");
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
ff_end_tag(pb, fmt); ff_end_tag(pb, fmt);
@ -553,9 +551,8 @@ static int w64_write_header(AVFormatContext *s)
avio_write(pb, ff_w64_guid_wave, sizeof(ff_w64_guid_wave)); avio_write(pb, ff_w64_guid_wave, sizeof(ff_w64_guid_wave));
start_guid(pb, ff_w64_guid_fmt, &start); start_guid(pb, ff_w64_guid_fmt, &start);
if ((ret = ff_put_wav_header(s, pb, s->streams[0]->codecpar, 0)) < 0) { if ((ret = ff_put_wav_header(s, pb, s->streams[0]->codecpar, 0)) < 0) {
AVCodec *codec = avcodec_find_decoder(s->streams[0]->codecpar->codec_id); av_log(s, AV_LOG_ERROR, "Codec %s not supported\n",
av_log(s, AV_LOG_ERROR, "%s codec not supported\n", avcodec_get_name(s->streams[0]->codecpar->codec_id));
codec ? codec->name : "NONE");
return ret; return ret;
} }
end_guid(pb, start); end_guid(pb, start);