diff options
| author | wm4 <wm4@nowhere> | 2018-01-31 04:21:02 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2018-02-01 10:21:55 +0100 |
| commit | 8b3306924d1b80ed85907449ffa2549946e8b137 (patch) | |
| tree | c4696b0af7fb2ef363d40696b370e6ce24c3b275 /common/codecs.c | |
| parent | 4b567aeac8d1741b14bf2ee363a5434a4877565e (diff) | |
| download | mpv-8b3306924d1b80ed85907449ffa2549946e8b137.tar.bz2 mpv-8b3306924d1b80ed85907449ffa2549946e8b137.tar.xz | |
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.
Diffstat (limited to 'common/codecs.c')
| -rw-r--r-- | common/codecs.c | 12 |
1 files changed, 3 insertions, 9 deletions
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)) |