From 4873b32c5959c988af1769529ff72e3fd62fba82 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 9 Nov 2012 01:06:43 +0100 Subject: Rename directories, move files (step 2 of 2) Finish renaming directories and moving files. Adjust all include statements to make the previous commit compile. The two commits are separate, because git is bad at tracking renames and content changes at the same time. Also take this as an opportunity to remove the separation between "common" and "mplayer" sources in the Makefile. ("common" used to be shared between mplayer and mencoder.) --- demux/extension.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demux/extension.c') diff --git a/demux/extension.c b/demux/extension.c index 6845c36af3..71b5bf8f4d 100644 --- a/demux/extension.c +++ b/demux/extension.c @@ -23,7 +23,7 @@ #include "config.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" /* * An autodetection based on the extension is not a good idea, but we don't care ;-) @@ -31,7 +31,7 @@ * You should not add anything here where autodetection can be easily fixed except in * order to speed up auto-detection, in particular for formats that are often streamed. * In particular you should not normally add any DEMUXER_TYPE_LAVF, adding the - * format to preferred_list in libmpdemux/demuxer_lavf.c will usually achieve + * format to preferred_list in demux/demuxer_lavf.c will usually achieve * the same effect in a much more reliable way. */ static struct { -- cgit v1.2.3