Commit f7d5f3e7 authored by Antoine Cellerier's avatar Antoine Cellerier

Move avcodec module files to modules/codec/avcodec. (The 3 shared

headers, avutil.h, chroma.h and fourcc.h are also located in that
directory.) This should be the last commit in the "Move all the old
ffmpeg modules source code files around to make it seem like you're
working while you're not".
parent 139829d3
......@@ -5869,9 +5869,9 @@ AC_CONFIG_FILES([
modules/audio_mixer/Makefile
modules/audio_output/Makefile
modules/codec/Makefile
modules/codec/avcodec/Makefile
modules/codec/cmml/Makefile
modules/codec/dmo/Makefile
modules/codec/ffmpeg/Makefile
modules/codec/subtitles/Makefile
modules/codec/spudec/Makefile
modules/codec/xvmc/Makefile
......
SUBDIRS = cmml dmo ffmpeg subtitles spudec xvmc
SUBDIRS = cmml dmo avcodec subtitles spudec xvmc
# Disabled modules
SOURCES_a52 = a52.c
SOURCES_cinepak = cinepak.c
......
......@@ -42,8 +42,8 @@
# include <ffmpeg/avformat.h>
#endif
#include "../../codec/ffmpeg/fourcc.h"
#include "../../codec/ffmpeg/chroma.h"
#include "../../codec/avcodec/fourcc.h"
#include "../../codec/avcodec/chroma.h"
//#define AVFORMAT_DEBUG 1
......
......@@ -41,8 +41,8 @@
#endif
#include "avformat.h"
#include "../../codec/ffmpeg/fourcc.h"
#include "../../codec/ffmpeg/avutil.h"
#include "../../codec/avcodec/fourcc.h"
#include "../../codec/avcodec/avutil.h"
//#define AVFORMAT_DEBUG 1
......
......@@ -43,7 +43,7 @@
# include <avcodec.h>
#endif
#include "../codec/ffmpeg/chroma.h"
#include "../codec/avcodec/chroma.h"
/*****************************************************************************
* Local prototypes
......
......@@ -41,7 +41,7 @@
#endif
/* Gruikkkkkkkkkk!!!!! */
#include "../codec/ffmpeg/chroma.h"
#include "../codec/avcodec/chroma.h"
/****************************************************************************
* Local prototypes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment