summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-08-19 15:26:05 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-08-19 15:26:05 +0200
commitc28d80f4c9360052943d2fdf708dd815cb1889d9 (patch)
tree39d63cef85f9046ceb3c81555aa46538253c5eb1 /libavcodec
parentc9fe864472a2c55c7c4189ff6fb490bec8bd92b3 (diff)
lavc: avcodec_get_name: return "none" for AV_CODEC_ID_NONE.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index a96b52d638..150d90703a 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1851,6 +1851,8 @@ const char *avcodec_get_name(enum AVCodecID id)
const AVCodecDescriptor *cd;
AVCodec *codec;
+ if (id == AV_CODEC_ID_NONE)
+ return "none";
cd = avcodec_descriptor_get(id);
if (cd)
return cd->name;