RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux_lavf: more future proof AVInputFormat name comparison 

AVInputFormat name fields consist of comma-separated components, more
of which may be added in backwards-compatible versions. demux_lavf did
a strcmp against the whole field at once; this would break if a
component was added. Change the code to search for individual
component matches within the field instead.
This commit is contained in:
Uoti Urpala 2010-11-05 12:50:11 +02:00
parent 348332af3a
commit 661d909f8e
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libmpdemux/demux_lavf.c
View File

@ -23,6 +23,7 @@
// #include <unistd.h>
#include <limits.h>
#include <stdbool.h>
#include <string.h>
#include "config.h"
#include "options.h"
@ -205,13 +206,28 @@ static int lavf_check_file(demuxer_t *demuxer){
return DEMUXER_TYPE_LAVF;
}
static bool matches_avinputformat_name(struct lavf_priv *priv,
const char *name)
{
const char *avifname = priv->avif->name;
while (1) {
const char *next = strchr(avifname, ',');
if (!next)
return !strcmp(avifname, name);
int len = next - avifname;
if (len == strlen(name) && !memcmp(avifname, name, len))
return true;
avifname = next + 1;
}
}
static const char * const preferred_list[] = {
"dxa",
"flv",
"gxf",
"nut",
"nuv",
"mov,mp4,m4a,3gp,3g2,mj2",
"mov", "mp4", // "mov,mp4,m4a,3gp,3g2,mj2" is one AVInputFormat
"mpc",
"mpc8",
"mxf",
@ -225,13 +241,11 @@ static const char * const preferred_list[] = {
static int lavf_check_preferred_file(demuxer_t *demuxer){
if (lavf_check_file(demuxer)) {
const char * const *p = preferred_list;
const char * const *p;
lavf_priv_t *priv = demuxer->priv;
while (*p) {
if (strcmp(*p, priv->avif->name) == 0)
for (p = preferred_list; *p; p++)
if (matches_avinputformat_name(priv, *p))
return DEMUXER_TYPE_LAVF_PREFERRED;
p++;
}
}
return 0;
}