[FFmpeg-devel] [PATCH 05/24] ffmpeg: move some muxing-related code into a separate file

[Andreas Rheinhardt]

Anton Khirnov:
> This is a first step towards making muxers more independent from the
> rest of the code.
> ---
>  fftools/Makefile     |  11 +-
>  fftools/ffmpeg.c     | 273 ++--------------------------------------
>  fftools/ffmpeg.h     |  10 ++
>  fftools/ffmpeg_mux.c | 293 +++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 320 insertions(+), 267 deletions(-)
>  create mode 100644 fftools/ffmpeg_mux.c
> 
> diff --git a/fftools/Makefile b/fftools/Makefile
> index da420786eb..bd90ef8f32 100644
> --- a/fftools/Makefile
> +++ b/fftools/Makefile
> @@ -9,7 +9,16 @@ AVBASENAMES  = ffmpeg ffplay ffprobe
>  ALLAVPROGS   = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF))
>  ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF))
>  
> -OBJS-ffmpeg                        += fftools/ffmpeg_opt.o fftools/ffmpeg_filter.o fftools/ffmpeg_hw.o
> +OBJS-ffmpeg +=                  \
> +    fftools/ffmpeg_filter.o     \
> +    fftools/ffmpeg_hw.o         \
> +    fftools/ffmpeg_mux.o        \
> +    fftools/ffmpeg_opt.o        \
> +
> +ifndef CONFIG_VIDEOTOOLBOX
> +OBJS-ffmpeg-$(CONFIG_VDA)          += fftools/ffmpeg_videotoolbox.o
> +endif
> +OBJS-ffmpeg-$(CONFIG_VIDEOTOOLBOX) += fftools/ffmpeg_videotoolbox.o

Rebase error.

>  
>  define DOFFTOOL
>  OBJS-$(1) += fftools/cmdutils.o fftools/$(1).o $(OBJS-$(1)-yes)