[FFmpeg-devel] [PATCH] fate: merge mapchan and options into ffmpeg.

[Clément Bœsch]

On Tue, Jan 01, 2013 at 06:34:57PM +0100, Nicolas George wrote:
> They were two very short files that cover ffmpeg-specific features.
> 
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
>  tests/Makefile                         |    3 +--
>  tests/fate/{mapchan.mak => ffmpeg.mak} |    7 +++++++
>  tests/fate/options.mak                 |    9 ---------
>  3 files changed, 8 insertions(+), 11 deletions(-)
>  rename tests/fate/{mapchan.mak => ffmpeg.mak} (73%)
>  delete mode 100644 tests/fate/options.mak
> 
> diff --git a/tests/Makefile b/tests/Makefile
> index f1472f3..c5cd3a7 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -81,6 +81,7 @@ include $(SRC_PATH)/tests/fate/demux.mak
>  include $(SRC_PATH)/tests/fate/dfa.mak
>  include $(SRC_PATH)/tests/fate/dpcm.mak
>  include $(SRC_PATH)/tests/fate/ea.mak
> +include $(SRC_PATH)/tests/fate/ffmpeg.mak
>  include $(SRC_PATH)/tests/fate/ffprobe.mak
>  include $(SRC_PATH)/tests/fate/filter.mak
>  include $(SRC_PATH)/tests/fate/flac.mak
> @@ -91,13 +92,11 @@ include $(SRC_PATH)/tests/fate/indeo.mak
>  include $(SRC_PATH)/tests/fate/libavcodec.mak
>  include $(SRC_PATH)/tests/fate/libavformat.mak
>  include $(SRC_PATH)/tests/fate/libavutil.mak
> -include $(SRC_PATH)/tests/fate/mapchan.mak
>  include $(SRC_PATH)/tests/fate/lossless-audio.mak
>  include $(SRC_PATH)/tests/fate/lossless-video.mak
>  include $(SRC_PATH)/tests/fate/microsoft.mak
>  include $(SRC_PATH)/tests/fate/mp3.mak
>  include $(SRC_PATH)/tests/fate/mpc.mak
> -include $(SRC_PATH)/tests/fate/options.mak
>  include $(SRC_PATH)/tests/fate/pcm.mak
>  include $(SRC_PATH)/tests/fate/probe.mak
>  include $(SRC_PATH)/tests/fate/prores.mak
> diff --git a/tests/fate/mapchan.mak b/tests/fate/ffmpeg.mak
> similarity index 73%
> rename from tests/fate/mapchan.mak
> rename to tests/fate/ffmpeg.mak
> index d8b3ba0..615611c 100644
> --- a/tests/fate/mapchan.mak
> +++ b/tests/fate/ffmpeg.mak
> @@ -12,3 +12,10 @@ fate-mapchan-silent-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-1.
>  
>  FATE_FFMPEG += $(FATE_MAPCHAN)
>  fate-mapchan: $(FATE_MAPCHAN)
> +
> +FATE_FFMPEG += fate-options-force_key_frames
> +fate-options-force_key_frames: tests/data/vsynth2.yuv
> +fate-options-force_key_frames: CMD = enc_dec \
> +  "rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth2.yuv \
> +  avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \
> +  framecrc "" "" "-skip_frame nokey"
> diff --git a/tests/fate/options.mak b/tests/fate/options.mak
> deleted file mode 100644
> index 940d454..0000000
> --- a/tests/fate/options.mak
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -FATE_OPTIONS += fate-options-force_key_frames
> -fate-options-force_key_frames: tests/data/vsynth2.yuv
> -fate-options-force_key_frames: CMD = enc_dec \
> -  "rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth2.yuv \
> -  avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \
> -  framecrc "" "" "-skip_frame nokey"
> -
> -FATE_FFMPEG += $(FATE_OPTIONS)
> -fate-options: $(FATE_OPTIONS)

Fine with me.

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130101/48ef41c4/attachment.asc>