From d246231e4714119faac6c7acd881d3b687bb8b11 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 29 Apr 2014 17:01:17 +0200
Subject: wavenc: use codec descriptors to get the codec name

Also, return a proper error code.
---
 libavformat/wavenc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libavformat')

diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c
index 86ed557802..25f6ffcde0 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);
 
-- 
cgit v1.2.3