[SCM] libav/experimental: wavenc: use codec descriptors to get the codec name
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:03:12 UTC 2014
The following commit has been merged in the experimental branch:
commit d246231e4714119faac6c7acd881d3b687bb8b11
Author: Anton Khirnov <anton at khirnov.net>
Date: Tue Apr 29 17:01:17 2014 +0200
wavenc: use codec descriptors to get the codec name
Also, return a proper error code.
diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c
index 86ed557..25f6ffc 100644
--- a/libavformat/wavenc.c
+++ b/libavformat/wavenc.c
@@ -110,9 +110,10 @@ static int wav_write_header(AVFormatContext *s)
/* format header */
fmt = ff_start_tag(pb, "fmt ");
if (ff_put_wav_header(pb, s->streams[0]->codec) < 0) {
+ const AVCodecDescriptor *desc = avcodec_descriptor_get(s->streams[0]->codec->codec_id);
av_log(s, AV_LOG_ERROR, "%s codec not supported in WAVE format\n",
- s->streams[0]->codec->codec ? s->streams[0]->codec->codec->name : "NONE");
- return -1;
+ desc ? desc->name : "unknown");
+ return AVERROR(ENOSYS);
}
ff_end_tag(pb, fmt);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list