diff options
author | wm4 <wm4@nowhere> | 2012-11-09 01:06:43 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-12 20:08:18 +0100 |
commit | 4873b32c5959c988af1769529ff72e3fd62fba82 (patch) | |
tree | e18fbd7eef54de6071969689aa5c31d6ea1f0963 /video/decode/vd_lavc.c | |
parent | d4bdd0473d6f43132257c9fb3848d829755167a3 (diff) | |
download | mpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.bz2 mpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.xz |
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.)
Diffstat (limited to 'video/decode/vd_lavc.c')
-rw-r--r-- | video/decode/vd_lavc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index e078de4419..929c6c77f3 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -29,20 +29,20 @@ #include "talloc.h" #include "config.h" -#include "mp_msg.h" -#include "options.h" -#include "av_opts.h" +#include "core/mp_msg.h" +#include "core/options.h" +#include "core/av_opts.h" -#include "mpbswap.h" -#include "fmt-conversion.h" +#include "compat/mpbswap.h" +#include "video/fmt-conversion.h" #include "vd.h" -#include "img_format.h" -#include "libmpdemux/stheader.h" -#include "libmpdemux/demux_packet.h" -#include "codec-cfg.h" +#include "video/img_format.h" +#include "demux/stheader.h" +#include "demux/demux_packet.h" +#include "core/codec-cfg.h" #include "osdep/numcores.h" -#include "libvo/csputils.h" +#include "video/csputils.h" static const vd_info_t info = { "libavcodec video codecs", @@ -76,7 +76,7 @@ typedef struct { enum AVDiscard skip_frame; } vd_ffmpeg_ctx; -#include "m_option.h" +#include "core/m_option.h" static int get_buffer(AVCodecContext *avctx, AVFrame *pic); static void release_buffer(AVCodecContext *avctx, AVFrame *pic); |