From 226f2d2006129870cdb804e49e9b8dfb45b3a60e Mon Sep 17 00:00:00 2001 From: Peter Bennett Date: Sun, 4 Feb 2018 13:00:29 -0500 Subject: [PATCH] ffmpeg: Move files as required by FFmpeg 3.4 Some files moved to new locations between ffmpeg 3.2 and 3.4. This moves the existing 3.2 files in preparation for the 3.4 upgrade. --- mythtv/external/FFmpeg/{ => ffbuild}/arch.mak | 0 mythtv/external/FFmpeg/{ => ffbuild}/common.mak | 0 mythtv/external/FFmpeg/{ => ffbuild}/library.mak | 0 mythtv/external/FFmpeg/{ => ffbuild}/version.sh | 0 mythtv/external/FFmpeg/{ => fftools}/cmdutils.c | 0 mythtv/external/FFmpeg/{ => fftools}/cmdutils.h | 0 mythtv/external/FFmpeg/{ => fftools}/cmdutils_common_opts.h | 0 mythtv/external/FFmpeg/{ => fftools}/cmdutils_opencl.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffmpeg.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffmpeg.h | 0 mythtv/external/FFmpeg/{ => fftools}/ffmpeg_cuvid.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffmpeg_dxva2.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffmpeg_filter.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffmpeg_opt.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffmpeg_qsv.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffmpeg_vaapi.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffmpeg_vdpau.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffmpeg_videotoolbox.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffplay.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffprobe.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffserver.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffserver_config.c | 0 mythtv/external/FFmpeg/{ => fftools}/ffserver_config.h | 0 23 files changed, 0 insertions(+), 0 deletions(-) rename mythtv/external/FFmpeg/{ => ffbuild}/arch.mak (100%) rename mythtv/external/FFmpeg/{ => ffbuild}/common.mak (100%) rename mythtv/external/FFmpeg/{ => ffbuild}/library.mak (100%) rename mythtv/external/FFmpeg/{ => ffbuild}/version.sh (100%) rename mythtv/external/FFmpeg/{ => fftools}/cmdutils.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/cmdutils.h (100%) rename mythtv/external/FFmpeg/{ => fftools}/cmdutils_common_opts.h (100%) rename mythtv/external/FFmpeg/{ => fftools}/cmdutils_opencl.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffmpeg.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffmpeg.h (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffmpeg_cuvid.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffmpeg_dxva2.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffmpeg_filter.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffmpeg_opt.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffmpeg_qsv.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffmpeg_vaapi.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffmpeg_vdpau.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffmpeg_videotoolbox.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffplay.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffprobe.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffserver.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffserver_config.c (100%) rename mythtv/external/FFmpeg/{ => fftools}/ffserver_config.h (100%) diff --git a/mythtv/external/FFmpeg/arch.mak b/mythtv/external/FFmpeg/ffbuild/arch.mak similarity index 100% rename from mythtv/external/FFmpeg/arch.mak rename to mythtv/external/FFmpeg/ffbuild/arch.mak diff --git a/mythtv/external/FFmpeg/common.mak b/mythtv/external/FFmpeg/ffbuild/common.mak similarity index 100% rename from mythtv/external/FFmpeg/common.mak rename to mythtv/external/FFmpeg/ffbuild/common.mak diff --git a/mythtv/external/FFmpeg/library.mak b/mythtv/external/FFmpeg/ffbuild/library.mak similarity index 100% rename from mythtv/external/FFmpeg/library.mak rename to mythtv/external/FFmpeg/ffbuild/library.mak diff --git a/mythtv/external/FFmpeg/version.sh b/mythtv/external/FFmpeg/ffbuild/version.sh similarity index 100% rename from mythtv/external/FFmpeg/version.sh rename to mythtv/external/FFmpeg/ffbuild/version.sh diff --git a/mythtv/external/FFmpeg/cmdutils.c b/mythtv/external/FFmpeg/fftools/cmdutils.c similarity index 100% rename from mythtv/external/FFmpeg/cmdutils.c rename to mythtv/external/FFmpeg/fftools/cmdutils.c diff --git a/mythtv/external/FFmpeg/cmdutils.h b/mythtv/external/FFmpeg/fftools/cmdutils.h similarity index 100% rename from mythtv/external/FFmpeg/cmdutils.h rename to mythtv/external/FFmpeg/fftools/cmdutils.h diff --git a/mythtv/external/FFmpeg/cmdutils_common_opts.h b/mythtv/external/FFmpeg/fftools/cmdutils_common_opts.h similarity index 100% rename from mythtv/external/FFmpeg/cmdutils_common_opts.h rename to mythtv/external/FFmpeg/fftools/cmdutils_common_opts.h diff --git a/mythtv/external/FFmpeg/cmdutils_opencl.c b/mythtv/external/FFmpeg/fftools/cmdutils_opencl.c similarity index 100% rename from mythtv/external/FFmpeg/cmdutils_opencl.c rename to mythtv/external/FFmpeg/fftools/cmdutils_opencl.c diff --git a/mythtv/external/FFmpeg/ffmpeg.c b/mythtv/external/FFmpeg/fftools/ffmpeg.c similarity index 100% rename from mythtv/external/FFmpeg/ffmpeg.c rename to mythtv/external/FFmpeg/fftools/ffmpeg.c diff --git a/mythtv/external/FFmpeg/ffmpeg.h b/mythtv/external/FFmpeg/fftools/ffmpeg.h similarity index 100% rename from mythtv/external/FFmpeg/ffmpeg.h rename to mythtv/external/FFmpeg/fftools/ffmpeg.h diff --git a/mythtv/external/FFmpeg/ffmpeg_cuvid.c b/mythtv/external/FFmpeg/fftools/ffmpeg_cuvid.c similarity index 100% rename from mythtv/external/FFmpeg/ffmpeg_cuvid.c rename to mythtv/external/FFmpeg/fftools/ffmpeg_cuvid.c diff --git a/mythtv/external/FFmpeg/ffmpeg_dxva2.c b/mythtv/external/FFmpeg/fftools/ffmpeg_dxva2.c similarity index 100% rename from mythtv/external/FFmpeg/ffmpeg_dxva2.c rename to mythtv/external/FFmpeg/fftools/ffmpeg_dxva2.c diff --git a/mythtv/external/FFmpeg/ffmpeg_filter.c b/mythtv/external/FFmpeg/fftools/ffmpeg_filter.c similarity index 100% rename from mythtv/external/FFmpeg/ffmpeg_filter.c rename to mythtv/external/FFmpeg/fftools/ffmpeg_filter.c diff --git a/mythtv/external/FFmpeg/ffmpeg_opt.c b/mythtv/external/FFmpeg/fftools/ffmpeg_opt.c similarity index 100% rename from mythtv/external/FFmpeg/ffmpeg_opt.c rename to mythtv/external/FFmpeg/fftools/ffmpeg_opt.c diff --git a/mythtv/external/FFmpeg/ffmpeg_qsv.c b/mythtv/external/FFmpeg/fftools/ffmpeg_qsv.c similarity index 100% rename from mythtv/external/FFmpeg/ffmpeg_qsv.c rename to mythtv/external/FFmpeg/fftools/ffmpeg_qsv.c diff --git a/mythtv/external/FFmpeg/ffmpeg_vaapi.c b/mythtv/external/FFmpeg/fftools/ffmpeg_vaapi.c similarity index 100% rename from mythtv/external/FFmpeg/ffmpeg_vaapi.c rename to mythtv/external/FFmpeg/fftools/ffmpeg_vaapi.c diff --git a/mythtv/external/FFmpeg/ffmpeg_vdpau.c b/mythtv/external/FFmpeg/fftools/ffmpeg_vdpau.c similarity index 100% rename from mythtv/external/FFmpeg/ffmpeg_vdpau.c rename to mythtv/external/FFmpeg/fftools/ffmpeg_vdpau.c diff --git a/mythtv/external/FFmpeg/ffmpeg_videotoolbox.c b/mythtv/external/FFmpeg/fftools/ffmpeg_videotoolbox.c similarity index 100% rename from mythtv/external/FFmpeg/ffmpeg_videotoolbox.c rename to mythtv/external/FFmpeg/fftools/ffmpeg_videotoolbox.c diff --git a/mythtv/external/FFmpeg/ffplay.c b/mythtv/external/FFmpeg/fftools/ffplay.c similarity index 100% rename from mythtv/external/FFmpeg/ffplay.c rename to mythtv/external/FFmpeg/fftools/ffplay.c diff --git a/mythtv/external/FFmpeg/ffprobe.c b/mythtv/external/FFmpeg/fftools/ffprobe.c similarity index 100% rename from mythtv/external/FFmpeg/ffprobe.c rename to mythtv/external/FFmpeg/fftools/ffprobe.c diff --git a/mythtv/external/FFmpeg/ffserver.c b/mythtv/external/FFmpeg/fftools/ffserver.c similarity index 100% rename from mythtv/external/FFmpeg/ffserver.c rename to mythtv/external/FFmpeg/fftools/ffserver.c diff --git a/mythtv/external/FFmpeg/ffserver_config.c b/mythtv/external/FFmpeg/fftools/ffserver_config.c similarity index 100% rename from mythtv/external/FFmpeg/ffserver_config.c rename to mythtv/external/FFmpeg/fftools/ffserver_config.c diff --git a/mythtv/external/FFmpeg/ffserver_config.h b/mythtv/external/FFmpeg/fftools/ffserver_config.h similarity index 100% rename from mythtv/external/FFmpeg/ffserver_config.h rename to mythtv/external/FFmpeg/fftools/ffserver_config.h