From 8b3306924d1b80ed85907449ffa2549946e8b137 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 31 Jan 2018 04:21:02 +0100
Subject: codecs: remove unused family field

MPlayer used this to distinguish multiple decoder wrappers (such as
libavcodec vs. binary codec loader vs. builtin decoders). It lost
meaning in mpv as non-libavcodec things were dropped. Now it doesn't
serve any purpose anymore.

Parsing was removed quite a while ago, and the recent filter change
removed any use of the internal family field. Get rid of it.
---
 common/av_common.c |  4 ++--
 common/codecs.c    | 12 +++---------
 common/codecs.h    |  5 ++---
 3 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'common')

diff --git a/common/av_common.c b/common/av_common.c
index 0599d98465..0981e919e1 100644
--- a/common/av_common.c
+++ b/common/av_common.c
@@ -227,7 +227,7 @@ void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type)
         if (!cur)
             break;
         if (av_codec_is_decoder(cur) && cur->type == type) {
-            mp_add_decoder(list, "lavc", mp_codec_from_av_codec_id(cur->id),
+            mp_add_decoder(list, mp_codec_from_av_codec_id(cur->id),
                            cur->name, cur->long_name);
         }
     }
@@ -242,7 +242,7 @@ void mp_add_lavc_encoders(struct mp_decoder_list *list)
         if (!cur)
             break;
         if (av_codec_is_encoder(cur)) {
-            mp_add_decoder(list, "lavc", mp_codec_from_av_codec_id(cur->id),
+            mp_add_decoder(list, mp_codec_from_av_codec_id(cur->id),
                            cur->name, cur->long_name);
         }
     }
diff --git a/common/codecs.c b/common/codecs.c
index 7985501869..8101b50f68 100644
--- a/common/codecs.c
+++ b/common/codecs.c
@@ -21,11 +21,10 @@
 #include "common/msg.h"
 #include "codecs.h"
 
-void mp_add_decoder(struct mp_decoder_list *list, const char *family,
-                    const char *codec, const char *decoder, const char *desc)
+void mp_add_decoder(struct mp_decoder_list *list, const char *codec,
+                    const char *decoder, const char *desc)
 {
     struct mp_decoder_entry entry = {
-        .family = talloc_strdup(list, family),
         .codec = talloc_strdup(list, codec),
         .decoder = talloc_strdup(list, decoder),
         .desc = talloc_strdup(list, desc),
@@ -40,7 +39,7 @@ static void add_new(struct mp_decoder_list *to, struct mp_decoder_entry *entry,
 {
     if (!entry || (codec && strcmp(entry->codec, codec) != 0))
         return;
-    mp_add_decoder(to, entry->family, entry->codec, entry->decoder, entry->desc);
+    mp_add_decoder(to, entry->codec, entry->decoder, entry->desc);
 }
 
 // Select a decoder from the given list for the given codec. The selection
@@ -72,11 +71,6 @@ struct mp_decoder_list *mp_select_decoders(struct mp_log *log,
             stop = true;
             break;
         }
-        if (bstr_find0(entry, ":") >= 0) {
-            mp_err(log, "Codec family selection was removed. "
-                        "Pass the codec name directly.\n");
-            break;
-        }
         for (int n = 0; n < all->num_entries; n++) {
             struct mp_decoder_entry *cur = &all->entries[n];
             if (bstr_equals0(entry, cur->decoder))
diff --git a/common/codecs.h b/common/codecs.h
index bed5c46905..367e9f6c5b 100644
--- a/common/codecs.h
+++ b/common/codecs.h
@@ -21,7 +21,6 @@
 struct mp_log;
 
 struct mp_decoder_entry {
-    const char *family;         // decoder module (e.g. ad_lavc => "lavc")
     const char *codec;          // name of the codec (e.g. "mp3")
     const char *decoder;        // decoder name (e.g. "mp3float")
     const char *desc;           // human readable description
@@ -32,8 +31,8 @@ struct mp_decoder_list {
     int num_entries;
 };
 
-void mp_add_decoder(struct mp_decoder_list *list, const char *family,
-                    const char *codec, const char *decoder, const char *desc);
+void mp_add_decoder(struct mp_decoder_list *list, const char *codec,
+                    const char *decoder, const char *desc);
 
 struct mp_decoder_list *mp_select_decoders(struct mp_log *log,
                                            struct mp_decoder_list *all,
-- 
cgit v1.2.3