From 5ac50f88c90167e9ade0c998ac62e935e259acee Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 15 Apr 2013 21:22:58 +0200
Subject: av_common: allow calling mp_codec_to_av_codec_id() with NULL

Helps reducing special cases.
---
 core/av_common.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'core')

diff --git a/core/av_common.c b/core/av_common.c
index bf1af853d9..5e6c8a4352 100644
--- a/core/av_common.c
+++ b/core/av_common.c
@@ -75,13 +75,15 @@ void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type)
 int mp_codec_to_av_codec_id(const char *codec)
 {
     int id = AV_CODEC_ID_NONE;
-    const AVCodecDescriptor *desc = avcodec_descriptor_get_by_name(codec);
-    if (desc)
-        id = desc->id;
-    if (id == AV_CODEC_ID_NONE) {
-        AVCodec *avcodec = avcodec_find_decoder_by_name(codec);
-        if (avcodec)
-            id = avcodec->id;
+    if (codec) {
+        const AVCodecDescriptor *desc = avcodec_descriptor_get_by_name(codec);
+        if (desc)
+            id = desc->id;
+        if (id == AV_CODEC_ID_NONE) {
+            AVCodec *avcodec = avcodec_find_decoder_by_name(codec);
+            if (avcodec)
+                id = avcodec->id;
+        }
     }
     return id;
 }
-- 
cgit v1.2.3