comparison sub/vobsub.c @ 32588:aa82dfc7bd49

Make use of mp_basename in a few places.

32587:c878178a05f2

#include "config.h"
#include "mpcommon.h"
#include "vobsub.h"
#include "spudec.h"
#include "mp_msg.h"
#include "unrar_exec.h"
#include "libavutil/common.h"

// Record the original -vobsubid set by commandline, since vobsub_id will be
// overridden if slang match any of vobsub streams.

            }
            strcpy(rar_filename, filename);
            strcat(rar_filename, ".rar");
        }
        /* get rid of the path if there is any */
        if ((p = strrchr(filename, '/')) == NULL) {
            p = filename;
        } else {
            p++;
        }
        rc = unrar_exec_get(&stream->data, &stream->size, p, rar_filename);
        if (!rc) {
            /* There is no matching filename in the archive. However, sometimes
             * the files we are looking for have been given arbitrary names in the archive.
             * Let's look for a file with an exact match in the extension only. */

32588:aa82dfc7bd49

#include "config.h"
#include "mpcommon.h"
#include "vobsub.h"
#include "spudec.h"
#include "mp_msg.h"
#include "path.h"
#include "unrar_exec.h"
#include "libavutil/common.h"

// Record the original -vobsubid set by commandline, since vobsub_id will be
// overridden if slang match any of vobsub streams.

            }
            strcpy(rar_filename, filename);
            strcat(rar_filename, ".rar");
        }
        /* get rid of the path if there is any */
        p = mp_basename(filename);
        rc = unrar_exec_get(&stream->data, &stream->size, p, rar_filename);
        if (!rc) {
            /* There is no matching filename in the archive. However, sometimes
             * the files we are looking for have been given arbitrary names in the archive.
             * Let's look for a file with an exact match in the extension only. */