Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Aug 2012 22:26:38 +0000 (00:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Aug 2012 22:51:02 +0000 (00:51 +0200)
* qatar/master: (23 commits)
  build: cosmetics: Reorder some lists in a more logical fashion
  x86: pngdsp: Fix assembly for OS/2
  fate: add test for RTjpeg in nuv with frameheader
  rtmp: send check_bw as notification
  g723_1: clip argument for 15-bit version of normalize_bits()
  g723_1: use all LPC vectors in formant postfilter
  id3v2: Support v2.2 PIC
  avplay: fix build with lavfi disabled.
  avconv: split configuring filter configuration to a separate file.
  avconv: split option parsing into a separate file.
  mpc8: do not leave padding after last frame in buffer for the next decode call
  mpegaudioenc: list supported channel layouts.
  mpegaudiodec: don't print an error on > 1 frame in a packet.
  api-example: update to new audio encoding API.
  configure: add --enable/disable-random option
  doc: cygwin: Update list of FATE package requirements
  build: Remove all installed headers and header directories on uninstall
  build: change checkheaders to use regular build rules
  rtmp: Add a new option 'rtmp_subscribe'
  rtmp: Add support for subscribing live streams
  ...

Conflicts:
Makefile
common.mak
configure
doc/examples/decoding_encoding.c
ffmpeg.c
libavcodec/g723_1.c
libavcodec/mpegaudiodec.c
libavcodec/x86/pngdsp.asm
libavformat/version.h
library.mak
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
26 files changed:
1  2 
.gitignore
Makefile
common.mak
configure
doc/examples/decoding_encoding.c
doc/platform.texi
doc/protocols.texi
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
libavcodec/g723_1.c
libavcodec/mpc8.c
libavcodec/mpegaudiodec.c
libavcodec/mpegaudioenc.c
libavformat/id3v2.c
libavformat/rtmp.h
libavformat/rtmpproto.c
libavformat/version.h
libavutil/arm/intmath.h
libavutil/arm/intreadwrite.h
library.mak
tests/fate/video.mak
tests/ref/fate/acodec-g723_1
tests/ref/fate/nuv-rtjpeg
tests/ref/fate/nuv-rtjpeg-fh

diff --cc .gitignore
Simple merge
diff --cc Makefile
+++ b/Makefile
@@@ -8,16 -6,61 +8,17 @@@ vpath %.S    $(SRC_PATH
  vpath %.asm  $(SRC_PATH)
  vpath %.v    $(SRC_PATH)
  vpath %.texi $(SRC_PATH)
 +vpath %/fate_config.sh.template $(SRC_PATH)
  
 -ifndef V
 -Q      = @
 -ECHO   = printf "$(1)\t%s\n" $(2)
 -BRIEF  = CC HOSTCC AS YASM AR LD
 -SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM
 -MSG    = $@
 -M      = @$(call ECHO,$(TAG),$@);
 -$(foreach VAR,$(BRIEF), \
 -    $(eval override $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))
 -$(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))
 -$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_PATH)/%=%)); $(INSTALL))
 -endif
 -
 -ALLFFLIBS = avcodec avdevice avfilter avformat avresample avutil swscale
 -
 -IFLAGS     := -I. -I$(SRC_PATH)
 -CPPFLAGS   := $(IFLAGS) $(CPPFLAGS)
 -CFLAGS     += $(ECFLAGS)
 -CCFLAGS     = $(CPPFLAGS) $(CFLAGS)
 -ASFLAGS    := $(CPPFLAGS) $(ASFLAGS)
 -YASMFLAGS  += $(IFLAGS:%=%/) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
 -HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS)
 -LDFLAGS    := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)
 -
 -define COMPILE
 -      $(call $(1)DEP,$(1))
 -      $($(1)) $($(1)FLAGS) $($(1)_DEPFLAGS) $($(1)_C) $($(1)_O) $<
 -endef
 -
 -COMPILE_C = $(call COMPILE,CC)
 -COMPILE_S = $(call COMPILE,AS)
 -
 -%.o: %.c
 -      $(COMPILE_C)
 -
 -%.o: %.S
 -      $(COMPILE_S)
 -
 -%.h.c:
 -      $(Q)echo '#include "$*.h"' >$@
 -
 -%.ver: %.v
 -      $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
 -
 -%.c %.h: TAG = GEN
 -
 -PROGS-$(CONFIG_AVCONV)   += avconv
 -PROGS-$(CONFIG_AVPLAY)   += avplay
 -PROGS-$(CONFIG_AVPROBE)  += avprobe
 -PROGS-$(CONFIG_AVSERVER) += avserver
 +PROGS-$(CONFIG_FFMPEG)   += ffmpeg
 +PROGS-$(CONFIG_FFPLAY)   += ffplay
 +PROGS-$(CONFIG_FFPROBE)  += ffprobe
 +PROGS-$(CONFIG_FFSERVER) += ffserver
  
  PROGS      := $(PROGS-yes:%=%$(EXESUF))
 +INSTPROGS   = $(PROGS-yes:%=%$(PROGSSUF)$(EXESUF))
  OBJS        = cmdutils.o
 -OBJS-avconv = avconv_opt.o avconv_filter.o
++OBJS-ffmpeg = ffmpeg_opt.o ffmpeg_filter.o
  TESTTOOLS   = audiogen videogen rotozoom tiny_psnr base64
  HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
  TOOLS       = qt-faststart trasher
@@@ -68,9 -103,9 +69,10 @@@ config.h: .confi
  
  SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS      \
                 ARCH_HEADERS BUILT_HEADERS SKIPHEADERS                    \
-                ALTIVEC-OBJS ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS MMI-OBJS \
-                MMX-OBJS NEON-OBJS VIS-OBJS YASM-OBJS                     \
+                ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS             \
+                MMI-OBJS ALTIVEC-OBJS VIS-OBJS                            \
+                MMX-OBJS YASM-OBJS                                        \
 +               MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSPR1-OBJS MIPS32R2-OBJS  \
                 OBJS TESTOBJS
  
  define RESET
diff --cc common.mak
@@@ -5,76 -5,6 +5,77 @@@
  # first so "all" becomes default target
  all: all-yes
  
- BRIEF  = CC CXX AS YASM AR LD HOSTCC STRIP CP
- SILENT = DEPCC DEPAS DEPHOSTCC DEPYASM RM RANLIB
 +ifndef SUBDIR
 +
 +ifndef V
 +Q      = @
 +ECHO   = printf "$(1)\t%s\n" $(2)
++BRIEF  = CC CXX HOSTCC AS YASM AR LD STRIP CP
++SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM
++
 +MSG    = $@
 +M      = @$(call ECHO,$(TAG),$@);
 +$(foreach VAR,$(BRIEF), \
 +    $(eval override $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))
 +$(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))
 +$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL))
 +endif
 +
 +ALLFFLIBS = avcodec avdevice avfilter avformat avresample avutil postproc swscale swresample
 +
 +# NASM requires -I path terminated with /
 +IFLAGS     := -I. -I$(SRC_PATH)/
 +CPPFLAGS   := $(IFLAGS) $(CPPFLAGS)
 +CFLAGS     += $(ECFLAGS)
 +CCFLAGS     = $(CPPFLAGS) $(CFLAGS)
 +ASFLAGS    := $(CPPFLAGS) $(ASFLAGS)
 +CXXFLAGS   += $(CPPFLAGS) $(CFLAGS)
 +YASMFLAGS  += $(IFLAGS:%=%/) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
 +
 +HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS)
 +LDFLAGS    := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)
 +
 +define COMPILE
 +       $(call $(1)DEP,$(1))
 +       $($(1)) $($(1)FLAGS) $($(1)_DEPFLAGS) $($(1)_C) $($(1)_O) $<
 +endef
 +
 +COMPILE_C = $(call COMPILE,CC)
 +COMPILE_CXX = $(call COMPILE,CXX)
 +COMPILE_S = $(call COMPILE,AS)
 +
 +%.o: %.c
 +      $(COMPILE_C)
 +
 +%.o: %.cpp
 +      $(COMPILE_CXX)
 +
 +%.s: %.c
 +      $(CC) $(CPPFLAGS) $(CFLAGS) -S -o $@ $<
 +
 +%.o: %.S
 +      $(COMPILE_S)
 +
 +%.ho: %.h
 +      $(CC) $(CCFLAGS) -c $(CC_O) -x c $<
 +
 +%.ver: %.v
 +      $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
 +
 +%.c %.h: TAG = GEN
 +
 +# Dummy rule to stop make trying to rebuild removed or renamed headers
 +%.h:
 +      @:
 +
 +# Disable suffix rules.  Most of the builtin rules are suffix rules,
 +# so this saves some time on slow systems.
 +.SUFFIXES:
 +
 +# Do not delete intermediate files from chains of implicit rules
 +$(OBJS):
 +endif
 +
  include $(SRC_PATH)/arch.mak
  
  OBJS      += $(OBJS-yes)
@@@ -109,15 -40,14 +111,15 @@@ $(HOSTOBJS): %.o: %.
  $(HOSTPROGS): %$(HOSTEXESUF): %.o
        $(HOSTCC) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS)
  
 -$(OBJS):     | $(sort $(dir $(OBJS)))
 -$(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
 -$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
 -$(TOOLOBJS): | tools
 +$(OBJS):       | $(sort $(dir $(OBJS)))
 +$(HOSTOBJS):   | $(sort $(dir $(HOSTOBJS)))
 +$(TESTOBJS):   | $(sort $(dir $(TESTOBJS)))
 +$(HEADEROBJS): | $(sort $(dir $(HEADEROBJS)))
 +$(TOOLOBJS):   | tools
  
 -OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS))
 +OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS) $(HEADEROBJS))
  
- CLEANSUFFIXES     = *.d *.o *~ *.ho *.map *.ver *.gcno *.gcda
 -CLEANSUFFIXES     = *.d *.o *~ *.h.c *.map *.ver
++CLEANSUFFIXES     = *.d *.o *~ *.h.c *.map *.ver *.ho *.gcno *.gcda
  DISTCLEANSUFFIXES = *.pc
  LIBSUFFIXES       = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
  
diff --cc configure
+++ b/configure
@@@ -1211,8 -1085,8 +1211,9 @@@ HAVE_LIST=
      alsa_asoundlib_h
      altivec_h
      arpa_inet_h
+     asm_mod_q
      asm_mod_y
 +    asm_types_h
      attribute_may_alias
      attribute_packed
      cbrtf
   * format handling
   */
  
 -#include <stdlib.h>
 -#include <stdio.h>
 -#include <string.h>
 -
 -#ifdef HAVE_AV_CONFIG_H
 -#undef HAVE_AV_CONFIG_H
 -#endif
 +#include <math.h>
  
 -#include "libavcodec/avcodec.h"
 -#include "libavutil/audioconvert.h"
 -#include "libavutil/mathematics.h"
 -#include "libavutil/samplefmt.h"
 +#include <libavutil/imgutils.h>
 +#include <libavutil/opt.h>
 +#include <libavcodec/avcodec.h>
++#include <libavutil/audioconvert.h>
 +#include <libavutil/mathematics.h>
 +#include <libavutil/samplefmt.h>
  
  #define INBUF_SIZE 4096
  #define AUDIO_INBUF_SIZE 20480
@@@ -48,13 -105,15 +102,15 @@@ static void audio_encode_example(const 
  {
      AVCodec *codec;
      AVCodecContext *c= NULL;
-     int frame_size, i, j, out_size, outbuf_size;
+     AVFrame *frame;
+     AVPacket pkt;
+     int i, j, k, ret, got_output;
+     int buffer_size;
      FILE *f;
-     short *samples;
+     uint16_t *samples;
      float t, tincr;
-     uint8_t *outbuf;
  
 -    printf("Audio encoding\n");
 +    printf("Encode audio file %s\n", filename);
  
      /* find the MP2 encoder */
      codec = avcodec_find_encoder(AV_CODEC_ID_MP2);
Simple merge
Simple merge
diff --cc ffmpeg.c
+++ b/ffmpeg.c
  #include <math.h>
  #include <stdlib.h>
  #include <errno.h>
--#include <signal.h>
  #include <limits.h>
 +#if HAVE_ISATTY
 +#include <unistd.h>
 +#endif
  #include "libavformat/avformat.h"
  #include "libavdevice/avdevice.h"
  #include "libswscale/swscale.h"
  
  #include <time.h>
  
 -#include "avconv.h"
++#include "ffmpeg.h"
  #include "cmdutils.h"
  
  #include "libavutil/avassert.h"
  
- #define VSYNC_AUTO       -1
- #define VSYNC_PASSTHROUGH 0
- #define VSYNC_CFR         1
- #define VSYNC_VFR         2
- #define VSYNC_DROP        0xff
 -const char program_name[] = "avconv";
 +const char program_name[] = "ffmpeg";
  const int program_birth_year = 2000;
  
- /* select an input stream for an output stream */
- typedef struct StreamMap {
-     int disabled;           /** 1 is this mapping is disabled by a negative map */
-     int file_index;
-     int stream_index;
-     int sync_file_index;
-     int sync_stream_index;
-     char *linklabel;       /** name of an output link, for mapping lavfi outputs */
- } StreamMap;
- typedef struct {
-     int  file_idx,  stream_idx,  channel_idx; // input
-     int ofile_idx, ostream_idx;               // output
- } AudioChannelMap;
- static const OptionDef *options;
- #define MAX_STREAMS 1024    /* arbitrary sanity check value */
- static int frame_bits_per_raw_sample = 0;
- static int video_discard = 0;
- static int same_quant = 0;
- static int do_deinterlace = 0;
- static int intra_dc_precision = 8;
- static int qp_hist = 0;
- static int intra_only = 0;
- static const char *video_codec_name    = NULL;
- static const char *audio_codec_name    = NULL;
- static const char *subtitle_codec_name = NULL;
- static int file_overwrite = 0;
- static int no_file_overwrite = 0;
- static int do_benchmark = 0;
- static int do_benchmark_all = 0;
- static int do_hex_dump = 0;
- static int do_pkt_dump = 0;
- static int do_psnr = 0;
- static int do_pass = 0;
- static const char *pass_logfilename_prefix;
- static int video_sync_method = VSYNC_AUTO;
- static int audio_sync_method = 0;
- static float audio_drift_threshold = 0.1;
- static int copy_ts = 0;
- static int copy_tb = -1;
- static int opt_shortest = 0;
- static char *vstats_filename;
  static FILE *vstats_file;
  
- static int audio_volume = 256;
++static void do_video_stats(AVFormatContext *os, OutputStream *ost, int frame_size);
++static int64_t getutime(void);
 +
- static int exit_on_error = 0;
- static int stdin_interaction = 1;
 +static int run_as_daemon  = 0;
 +static volatile int received_nb_signals = 0;
  static int64_t video_size = 0;
  static int64_t audio_size = 0;
 +static int64_t subtitle_size = 0;
  static int64_t extra_size = 0;
  static int nb_frames_dup = 0;
  static int nb_frames_drop = 0;
- static int input_sync;
  
- static float dts_delta_threshold = 10;
- static float dts_error_threshold = 3600*30;
- static int print_stats = 1;
- static int debug_ts = 0;
 +static int current_time;
- static AVIOContext *progress_avio = NULL;
++AVIOContext *progress_avio = NULL;
  
 +static uint8_t *subtitle_out;
  
  #if HAVE_PTHREADS
  /* signal to input threads that they should exit; set by the main thread */
  static int transcoding_finished;
  #endif
  
 -#define DEFAULT_PASS_LOGFILENAME_PREFIX "av2pass"
 +#define DEFAULT_PASS_LOGFILENAME_PREFIX "ffmpeg2pass"
  
- typedef struct InputFilter {
-     AVFilterContext    *filter;
-     struct InputStream *ist;
-     struct FilterGraph *graph;
-     uint8_t            *name;
- } InputFilter;
- typedef struct OutputFilter {
-     AVFilterContext     *filter;
-     struct OutputStream *ost;
-     struct FilterGraph  *graph;
-     uint8_t             *name;
-     /* temporary storage until stream maps are processed */
-     AVFilterInOut       *out_tmp;
- } OutputFilter;
- typedef struct FilterGraph {
-     int            index;
-     const char    *graph_desc;
-     AVFilterGraph *graph;
-     InputFilter   **inputs;
-     int          nb_inputs;
-     OutputFilter **outputs;
-     int         nb_outputs;
- } FilterGraph;
- typedef struct InputStream {
-     int file_index;
-     AVStream *st;
-     int discard;             /* true if stream data should be discarded */
-     int decoding_needed;     /* true if the packets must be decoded in 'raw_fifo' */
-     AVCodec *dec;
-     AVFrame *decoded_frame;
-     int64_t       start;     /* time when read started */
-     /* predicted dts of the next packet read for this stream or (when there are
-      * several frames in a packet) of the next frame in current packet (in AV_TIME_BASE units) */
-     int64_t       next_dts;
-     int64_t       dts;       ///< dts of the last packet read for this stream (in AV_TIME_BASE units)
-     int64_t       next_pts;  ///< synthetic pts for the next decode frame (in AV_TIME_BASE units)
-     int64_t       pts;       ///< current pts of the decoded frame  (in AV_TIME_BASE units)
-     int           wrap_correction_done;
-     double ts_scale;
-     int is_start;            /* is 1 at the start and after a discontinuity */
-     int saw_first_ts;
-     int showed_multi_packet_warning;
-     AVDictionary *opts;
-     AVRational framerate;               /* framerate forced with -r */
-     int top_field_first;
-     int resample_height;
-     int resample_width;
-     int resample_pix_fmt;
-     int      resample_sample_fmt;
-     int      resample_sample_rate;
-     int      resample_channels;
-     uint64_t resample_channel_layout;
-     struct sub2video {
-         int64_t last_pts;
-         AVFilterBufferRef *ref;
-         int w, h;
-     } sub2video;
-     /* a pool of free buffers for decoded data */
-     FrameBuffer *buffer_pool;
-     int dr1;
-     /* decoded data from this stream goes into all those filters
-      * currently video and audio only */
-     InputFilter **filters;
-     int        nb_filters;
- } InputStream;
- typedef struct InputFile {
-     AVFormatContext *ctx;
-     int eof_reached;      /* true if eof reached */
-     int unavailable;      /* true if the file is unavailable (possibly temporarily) */
-     int ist_index;        /* index of first stream in input_streams */
-     int64_t ts_offset;
-     int nb_streams;       /* number of stream that ffmpeg is aware of; may be different
-                              from ctx.nb_streams if new streams appear during av_read_frame() */
-     int nb_streams_warn;  /* number of streams that the user was warned of */
-     int rate_emu;
+ InputStream **input_streams = NULL;
+ int        nb_input_streams = 0;
+ InputFile   **input_files   = NULL;
+ int        nb_input_files   = 0;
  
- #if HAVE_PTHREADS
-     pthread_t thread;           /* thread reading from this file */
-     int finished;               /* the thread has exited */
-     int joined;                 /* the thread has been joined */
-     pthread_mutex_t fifo_lock;  /* lock for access to fifo */
-     pthread_cond_t  fifo_cond;  /* the main thread will signal on this cond after reading from fifo */
-     AVFifoBuffer *fifo;         /* demuxed packets are stored here; freed by the main thread */
- #endif
- } InputFile;
- typedef struct OutputStream {
-     int file_index;          /* file index */
-     int index;               /* stream index in the output file */
-     int source_index;        /* InputStream index */
-     AVStream *st;            /* stream in the output file */
-     int encoding_needed;     /* true if encoding needed for this stream */
-     int frame_number;
-     /* input pts and corresponding output pts
-        for A/V sync */
-     struct InputStream *sync_ist; /* input stream to sync against */
-     int64_t sync_opts;       /* output frame counter, could be changed to some true timestamp */ // FIXME look at frame_number
-     /* pts of the first frame encoded for this stream, used for limiting
-      * recording time */
-     int64_t first_pts;
-     AVBitStreamFilterContext *bitstream_filters;
-     AVCodec *enc;
-     int64_t max_frames;
-     AVFrame *filtered_frame;
-     /* video only */
-     AVRational frame_rate;
-     int force_fps;
-     int top_field_first;
-     float frame_aspect_ratio;
-     float last_quality;
-     /* forced key frames */
-     int64_t *forced_kf_pts;
-     int forced_kf_count;
-     int forced_kf_index;
-     char *forced_keyframes;
-     /* audio only */
-     int audio_channels_map[SWR_CH_MAX];  /* list of the channels id to pick from the source stream */
-     int audio_channels_mapped;           /* number of channels in audio_channels_map */
-     FILE *logfile;
-     OutputFilter *filter;
-     char *avfilter;
-     int64_t sws_flags;
-     int64_t swr_dither_method;
-     double swr_dither_scale;
-     AVDictionary *opts;
-     int is_past_recording_time;
-     int unavailable;  /* true if the steram is unavailable (possibly temporarily) */
-     int stream_copy;
-     const char *attachment_filename;
-     int copy_initial_nonkeyframes;
-     int keep_pix_fmt;
- } OutputStream;
+ OutputStream **output_streams = NULL;
+ int         nb_output_streams = 0;
+ OutputFile   **output_files   = NULL;
+ int         nb_output_files   = 0;
  
+ FilterGraph **filtergraphs;
+ int        nb_filtergraphs;
  
 -static void term_exit(void)
 +#if HAVE_TERMIOS_H
 +
 +/* init terminal so that we can grab keys */
 +static struct termios oldtty;
 +static int restore_tty;
 +#endif
 +
- typedef struct OutputFile {
-     AVFormatContext *ctx;
-     AVDictionary *opts;
-     int ost_index;       /* index of the first stream in output_streams */
-     int64_t recording_time;  ///< desired length of the resulting file in microseconds == AV_TIME_BASE units
-     int64_t start_time;      ///< start time in microseconds == AV_TIME_BASE units
-     uint64_t limit_filesize; /* filesize limit expressed in bytes */
- } OutputFile;
- static InputStream **input_streams = NULL;
- static int        nb_input_streams = 0;
- static InputFile   **input_files   = NULL;
- static int        nb_input_files   = 0;
- static OutputStream **output_streams = NULL;
- static int         nb_output_streams = 0;
- static OutputFile   **output_files   = NULL;
- static int         nb_output_files   = 0;
- static FilterGraph **filtergraphs;
- int               nb_filtergraphs;
- typedef struct OptionsContext {
-     /* input/output options */
-     int64_t start_time;
-     const char *format;
-     SpecifierOpt *codec_names;
-     int        nb_codec_names;
-     SpecifierOpt *audio_channels;
-     int        nb_audio_channels;
-     SpecifierOpt *audio_sample_rate;
-     int        nb_audio_sample_rate;
-     SpecifierOpt *frame_rates;
-     int        nb_frame_rates;
-     SpecifierOpt *frame_sizes;
-     int        nb_frame_sizes;
-     SpecifierOpt *frame_pix_fmts;
-     int        nb_frame_pix_fmts;
-     /* input options */
-     int64_t input_ts_offset;
-     int rate_emu;
-     SpecifierOpt *ts_scale;
-     int        nb_ts_scale;
-     SpecifierOpt *dump_attachment;
-     int        nb_dump_attachment;
-     /* output options */
-     StreamMap *stream_maps;
-     int     nb_stream_maps;
-     AudioChannelMap *audio_channel_maps; /* one info entry per -map_channel */
-     int           nb_audio_channel_maps; /* number of (valid) -map_channel settings */
-     int metadata_global_manual;
-     int metadata_streams_manual;
-     int metadata_chapters_manual;
-     const char **attachments;
-     int       nb_attachments;
-     int chapters_input_file;
-     int64_t recording_time;
-     uint64_t limit_filesize;
-     float mux_preload;
-     float mux_max_delay;
-     int video_disable;
-     int audio_disable;
-     int subtitle_disable;
-     int data_disable;
-     /* indexed by output file stream index */
-     int   *streamid_map;
-     int nb_streamid_map;
-     SpecifierOpt *metadata;
-     int        nb_metadata;
-     SpecifierOpt *max_frames;
-     int        nb_max_frames;
-     SpecifierOpt *bitstream_filters;
-     int        nb_bitstream_filters;
-     SpecifierOpt *codec_tags;
-     int        nb_codec_tags;
-     SpecifierOpt *sample_fmts;
-     int        nb_sample_fmts;
-     SpecifierOpt *qscale;
-     int        nb_qscale;
-     SpecifierOpt *forced_key_frames;
-     int        nb_forced_key_frames;
-     SpecifierOpt *force_fps;
-     int        nb_force_fps;
-     SpecifierOpt *frame_aspect_ratios;
-     int        nb_frame_aspect_ratios;
-     SpecifierOpt *rc_overrides;
-     int        nb_rc_overrides;
-     SpecifierOpt *intra_matrices;
-     int        nb_intra_matrices;
-     SpecifierOpt *inter_matrices;
-     int        nb_inter_matrices;
-     SpecifierOpt *top_field_first;
-     int        nb_top_field_first;
-     SpecifierOpt *metadata_map;
-     int        nb_metadata_map;
-     SpecifierOpt *presets;
-     int        nb_presets;
-     SpecifierOpt *copy_initial_nonkeyframes;
-     int        nb_copy_initial_nonkeyframes;
-     SpecifierOpt *filters;
-     int        nb_filters;
- } OptionsContext;
- static void do_video_stats(AVFormatContext *os, OutputStream *ost, int frame_size);
- #define MATCH_PER_STREAM_OPT(name, type, outvar, fmtctx, st)\
- {\
-     int i, ret;\
-     for (i = 0; i < o->nb_ ## name; i++) {\
-         char *spec = o->name[i].specifier;\
-         if ((ret = check_stream_specifier(fmtctx, st, spec)) > 0)\
-             outvar = o->name[i].u.type;\
-         else if (ret < 0)\
-             exit_program(1);\
-     }\
- }
- static int64_t getutime(void)
- {
- #if HAVE_GETRUSAGE
-     struct rusage rusage;
-     getrusage(RUSAGE_SELF, &rusage);
-     return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
- #elif HAVE_GETPROCESSTIMES
-     HANDLE proc;
-     FILETIME c, e, k, u;
-     proc = GetCurrentProcess();
-     GetProcessTimes(proc, &c, &e, &k, &u);
-     return ((int64_t) u.dwHighDateTime << 32 | u.dwLowDateTime) / 10;
- #else
-     return av_gettime();
- #endif
- }
- static void update_benchmark(const char *fmt, ...)
- {
-     if (do_benchmark_all) {
-         int64_t t = getutime();
-         va_list va;
-         char buf[1024];
-         if (fmt) {
-             va_start(va, fmt);
-             vsnprintf(buf, sizeof(buf), fmt, va);
-             va_end(va);
-             printf("bench: %8"PRIu64" %s \n", t - current_time, buf);
-         }
-         current_time = t;
-     }
- }
 +
 +/* sub2video hack:
 +   Convert subtitles to video with alpha to insert them in filter graphs.
 +   This is a temporary solution until libavfilter gets real subtitles support.
 + */
 +
 +
- static int sub2video_prepare(InputStream *ist)
- {
-     AVFormatContext *avf = input_files[ist->file_index]->ctx;
-     int i, ret, w, h;
-     uint8_t *image[4];
-     int linesize[4];
-     /* Compute the size of the canvas for the subtitles stream.
-        If the subtitles codec has set a size, use it. Otherwise use the
-        maximum dimensions of the video streams in the same file. */
-     w = ist->st->codec->width;
-     h = ist->st->codec->height;
-     if (!(w && h)) {
-         for (i = 0; i < avf->nb_streams; i++) {
-             if (avf->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-                 w = FFMAX(w, avf->streams[i]->codec->width);
-                 h = FFMAX(h, avf->streams[i]->codec->height);
-             }
-         }
-         if (!(w && h)) {
-             w = FFMAX(w, 720);
-             h = FFMAX(h, 576);
-         }
-         av_log(avf, AV_LOG_INFO, "sub2video: using %dx%d canvas\n", w, h);
-     }
-     ist->sub2video.w = ist->st->codec->width  = w;
-     ist->sub2video.h = ist->st->codec->height = h;
-     /* rectangles are PIX_FMT_PAL8, but we have no guarantee that the
-        palettes for all rectangles are identical or compatible */
-     ist->st->codec->pix_fmt = PIX_FMT_RGB32;
-     ret = av_image_alloc(image, linesize, w, h, PIX_FMT_RGB32, 32);
-     if (ret < 0)
-         return ret;
-     memset(image[0], 0, h * linesize[0]);
-     ist->sub2video.ref = avfilter_get_video_buffer_ref_from_arrays(
-             image, linesize, AV_PERM_READ | AV_PERM_PRESERVE,
-             w, h, PIX_FMT_RGB32);
-     if (!ist->sub2video.ref) {
-         av_free(image[0]);
-         return AVERROR(ENOMEM);
-     }
-     return 0;
- }
 +
 +static void sub2video_copy_rect(uint8_t *dst, int dst_linesize, int w, int h,
 +                                AVSubtitleRect *r)
  {
 -    av_log(NULL, AV_LOG_QUIET, "");
 +    uint32_t *pal, *dst2;
 +    uint8_t *src, *src2;
 +    int x, y;
 +
 +    if (r->type != SUBTITLE_BITMAP) {
 +        av_log(NULL, AV_LOG_WARNING, "sub2video: non-bitmap subtitle\n");
 +        return;
 +    }
 +    if (r->x < 0 || r->x + r->w > w || r->y < 0 || r->y + r->h > h) {
 +        av_log(NULL, AV_LOG_WARNING, "sub2video: rectangle overflowing\n");
 +        return;
 +    }
 +
 +    dst += r->y * dst_linesize + r->x * 4;
 +    src = r->pict.data[0];
 +    pal = (uint32_t *)r->pict.data[1];
 +    for (y = 0; y < r->h; y++) {
 +        dst2 = (uint32_t *)dst;
 +        src2 = src;
 +        for (x = 0; x < r->w; x++)
 +            *(dst2++) = pal[*(src2++)];
 +        dst += dst_linesize;
 +        src += r->pict.linesize[0];
 +    }
 +}
 +
 +static void sub2video_push_ref(InputStream *ist, int64_t pts)
 +{
 +    AVFilterBufferRef *ref = ist->sub2video.ref;
 +    int i;
 +
 +    ist->sub2video.last_pts = ref->pts = pts;
 +    for (i = 0; i < ist->nb_filters; i++)
 +        av_buffersrc_add_ref(ist->filters[i]->filter,
 +                             avfilter_ref_buffer(ref, ~0),
 +                             AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT |
 +                             AV_BUFFERSRC_FLAG_NO_COPY);
 +}
 +
 +static void sub2video_update(InputStream *ist, AVSubtitle *sub, int64_t pts)
 +{
 +    int w = ist->sub2video.w, h = ist->sub2video.h;
 +    AVFilterBufferRef *ref = ist->sub2video.ref;
 +    int8_t *dst;
 +    int     dst_linesize;
 +    int i;
 +
 +    if (!ref)
 +        return;
 +    dst          = ref->data    [0];
 +    dst_linesize = ref->linesize[0];
 +    memset(dst, 0, h * dst_linesize);
 +    for (i = 0; i < sub->num_rects; i++)
 +        sub2video_copy_rect(dst, dst_linesize, w, h, sub->rects[i]);
 +    sub2video_push_ref(ist, pts);
 +}
 +
 +static void sub2video_heartbeat(InputStream *ist, int64_t pts)
 +{
 +    InputFile *infile = input_files[ist->file_index];
 +    int i, j, nb_reqs;
 +    int64_t pts2;
 +
 +    /* When a frame is read from a file, examine all sub2video streams in
 +       the same file and send the sub2video frame again. Otherwise, decoded
 +       video frames could be accumulating in the filter graph while a filter
 +       (possibly overlay) is desperately waiting for a subtitle frame. */
 +    for (i = 0; i < infile->nb_streams; i++) {
 +        InputStream *ist2 = input_streams[infile->ist_index + i];
 +        if (!ist2->sub2video.ref)
 +            continue;
 +        /* subtitles seem to be usually muxed ahead of other streams;
 +           if not, substracting a larger time here is necessary */
 +        pts2 = av_rescale_q(pts, ist->st->time_base, ist2->st->time_base) - 1;
 +        /* do not send the heartbeat frame if the subtitle is already ahead */
 +        if (pts2 <= ist2->sub2video.last_pts)
 +            continue;
 +        for (j = 0, nb_reqs = 0; j < ist2->nb_filters; j++)
 +            nb_reqs += av_buffersrc_get_nb_failed_requests(ist2->filters[j]->filter);
 +        if (nb_reqs)
 +            sub2video_push_ref(ist2, pts2);
 +    }
 +}
 +
 +static void sub2video_flush(InputStream *ist)
 +{
 +    int i;
 +
 +    for (i = 0; i < ist->nb_filters; i++)
 +        av_buffersrc_add_ref(ist->filters[i]->filter, NULL, 0);
 +}
 +
 +/* end of sub2video hack */
 +
- static void reset_options(OptionsContext *o, int is_input)
++void term_exit(void)
 +{
-     const OptionDef *po = options;
-     OptionsContext bak= *o;
-     int i;
-     /* all OPT_SPEC and OPT_STRING can be freed in generic way */
-     while (po->name) {
-         void *dst = (uint8_t*)o + po->u.off;
-         if (po->flags & OPT_SPEC) {
-             SpecifierOpt **so = dst;
-             int i, *count = (int*)(so + 1);
-             for (i = 0; i < *count; i++) {
-                 av_freep(&(*so)[i].specifier);
-                 if (po->flags & OPT_STRING)
-                     av_freep(&(*so)[i].u.str);
-             }
-             av_freep(so);
-             *count = 0;
-         } else if (po->flags & OPT_OFFSET && po->flags & OPT_STRING)
-             av_freep(dst);
-         po++;
-     }
++    av_log(NULL, AV_LOG_QUIET, "%s", "");
++#if HAVE_TERMIOS_H
++    if(restore_tty)
++        tcsetattr (0, TCSANOW, &oldtty);
++#endif
+ }
  
-     for (i = 0; i < o->nb_stream_maps; i++)
-         av_freep(&o->stream_maps[i].linklabel);
-     av_freep(&o->stream_maps);
-     av_freep(&o->audio_channel_maps);
-     av_freep(&o->streamid_map);
-     memset(o, 0, sizeof(*o));
-     if (is_input) {
-         o->recording_time = bak.recording_time;
-         if (o->recording_time != INT64_MAX)
-             av_log(NULL, AV_LOG_WARNING,
-                    "-t is not an input option, keeping it for the next output;"
-                    " consider fixing your command line.\n");
-     } else
-         o->recording_time = INT64_MAX;
-     o->mux_max_delay  = 0.7;
-     o->limit_filesize = UINT64_MAX;
-     o->chapters_input_file = INT_MAX;
+ static volatile int received_sigterm = 0;
 -static volatile int received_nb_signals = 0;
  
-     uninit_opts();
-     init_opts();
 -static void
 -sigterm_handler(int sig)
++static void sigterm_handler(int sig)
+ {
+     received_sigterm = sig;
+     received_nb_signals++;
+     term_exit();
++    if(received_nb_signals > 3)
++        exit(123);
  }
  
- static enum PixelFormat choose_pixel_fmt(AVStream *st, AVCodec *codec, enum PixelFormat target)
 -static void term_init(void)
++void term_init(void)
  {
-     if (codec && codec->pix_fmts) {
-         const enum PixelFormat *p = codec->pix_fmts;
-         int has_alpha= av_pix_fmt_descriptors[target].nb_components % 2 == 0;
-         enum PixelFormat best= PIX_FMT_NONE;
-         if (st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) {
-             if (st->codec->codec_id == AV_CODEC_ID_MJPEG) {
-                 p = (const enum PixelFormat[]) { PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE };
-             } else if (st->codec->codec_id == AV_CODEC_ID_LJPEG) {
-                 p = (const enum PixelFormat[]) { PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ444P, PIX_FMT_YUV420P,
-                                                  PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_BGRA, PIX_FMT_NONE };
-             }
-         }
-         for (; *p != PIX_FMT_NONE; p++) {
-             best= avcodec_find_best_pix_fmt2(best, *p, target, has_alpha, NULL);
-             if (*p == target)
-                 break;
-         }
-         if (*p == PIX_FMT_NONE) {
-             if (target != PIX_FMT_NONE)
-                 av_log(NULL, AV_LOG_WARNING,
-                        "Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n",
-                        av_pix_fmt_descriptors[target].name,
-                        codec->name,
-                        av_pix_fmt_descriptors[best].name);
-             return best;
++#if HAVE_TERMIOS_H
++    if(!run_as_daemon){
++        struct termios tty;
++        int istty = 1;
++#if HAVE_ISATTY
++        istty = isatty(0) && isatty(2);
++#endif
++        if (istty && tcgetattr (0, &tty) == 0) {
++            oldtty = tty;
++            restore_tty = 1;
++            atexit(term_exit);
++
++            tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP
++                             |INLCR|IGNCR|ICRNL|IXON);
++            tty.c_oflag |= OPOST;
++            tty.c_lflag &= ~(ECHO|ECHONL|ICANON|IEXTEN);
++            tty.c_cflag &= ~(CSIZE|PARENB);
++            tty.c_cflag |= CS8;
++            tty.c_cc[VMIN] = 1;
++            tty.c_cc[VTIME] = 0;
++
++            tcsetattr (0, TCSANOW, &tty);
 +        }
++        signal(SIGQUIT, sigterm_handler); /* Quit (POSIX).  */
 +    }
-     return target;
++#endif
++    avformat_network_deinit();
++
+     signal(SIGINT , sigterm_handler); /* Interrupt (ANSI).    */
+     signal(SIGTERM, sigterm_handler); /* Termination (ANSI).  */
+ #ifdef SIGXCPU
+     signal(SIGXCPU, sigterm_handler);
+ #endif
  }
  
- static char *choose_pix_fmts(OutputStream *ost)
++/* read a key without blocking */
++static int read_key(void)
 +{
-      if (ost->keep_pix_fmt) {
-         if (ost->filter)
-             avfilter_graph_set_auto_convert(ost->filter->graph->graph,
-                                             AVFILTER_AUTO_CONVERT_NONE);
-         if (ost->st->codec->pix_fmt == PIX_FMT_NONE)
-             return NULL;
-         return av_strdup(av_get_pix_fmt_name(ost->st->codec->pix_fmt));
-     }
-     if (ost->st->codec->pix_fmt != PIX_FMT_NONE) {
-         return av_strdup(av_get_pix_fmt_name(choose_pixel_fmt(ost->st, ost->enc, ost->st->codec->pix_fmt)));
-     } else if (ost->enc && ost->enc->pix_fmts) {
-         const enum PixelFormat *p;
-         AVIOContext *s = NULL;
-         uint8_t *ret;
-         int len;
-         if (avio_open_dyn_buf(&s) < 0)
-             exit_program(1);
++    unsigned char ch;
++#if HAVE_TERMIOS_H
++    int n = 1;
++    struct timeval tv;
++    fd_set rfds;
 +
-         p = ost->enc->pix_fmts;
-         if (ost->st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) {
-             if (ost->st->codec->codec_id == AV_CODEC_ID_MJPEG) {
-                 p = (const enum PixelFormat[]) { PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE };
-             } else if (ost->st->codec->codec_id == AV_CODEC_ID_LJPEG) {
-                 p = (const enum PixelFormat[]) { PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ444P, PIX_FMT_YUV420P,
-                                                     PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_BGRA, PIX_FMT_NONE };
-             }
-         }
++    FD_ZERO(&rfds);
++    FD_SET(0, &rfds);
++    tv.tv_sec = 0;
++    tv.tv_usec = 0;
++    n = select(1, &rfds, NULL, NULL, &tv);
++    if (n > 0) {
++        n = read(0, &ch, 1);
++        if (n == 1)
++            return ch;
++
++        return n;
++    }
++#elif HAVE_KBHIT
++#    if HAVE_PEEKNAMEDPIPE
++    static int is_pipe;
++    static HANDLE input_handle;
++    DWORD dw, nchars;
++    if(!input_handle){
++        input_handle = GetStdHandle(STD_INPUT_HANDLE);
++        is_pipe = !GetConsoleMode(input_handle, &dw);
++    }
 +
-         for (; *p != PIX_FMT_NONE; p++) {
-             const char *name = av_get_pix_fmt_name(*p);
-             avio_printf(s, "%s:", name);
++    if (stdin->_cnt > 0) {
++        read(0, &ch, 1);
++        return ch;
++    }
++    if (is_pipe) {
++        /* When running under a GUI, you will end here. */
++        if (!PeekNamedPipe(input_handle, NULL, 0, NULL, &nchars, NULL))
++            return -1;
++        //Read it
++        if(nchars != 0) {
++            read(0, &ch, 1);
++            return ch;
++        }else{
++            return -1;
 +        }
-         len = avio_close_dyn_buf(s, &ret);
-         ret[len - 1] = 0;
-         return ret;
-     } else
-         return NULL;
++    }
++#    endif
++    if(kbhit())
++        return(getch());
++#endif
++    return -1;
 +}
 +
- /**
-  * Define a function for building a string containing a list of
-  * allowed formats,
-  */
- #define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name, separator) \
- static char *choose_ ## var ## s(OutputStream *ost)                             \
- {                                                                               \
-     if (ost->st->codec->var != none) {                                          \
-         get_name(ost->st->codec->var);                                          \
-         return av_strdup(name);                                                 \
-     } else if (ost->enc->supported_list) {                                      \
-         const type *p;                                                          \
-         AVIOContext *s = NULL;                                                  \
-         uint8_t *ret;                                                           \
-         int len;                                                                \
-                                                                                 \
-         if (avio_open_dyn_buf(&s) < 0)                                          \
-             exit_program(1);                                                    \
-                                                                                 \
-         for (p = ost->enc->supported_list; *p != none; p++) {                   \
-             get_name(*p);                                                       \
-             avio_printf(s, "%s" separator, name);                               \
-         }                                                                       \
-         len = avio_close_dyn_buf(s, &ret);                                      \
-         ret[len - 1] = 0;                                                       \
-         return ret;                                                             \
-     } else                                                                      \
-         return NULL;                                                            \
+ static int decode_interrupt_cb(void *ctx)
+ {
+     return received_nb_signals > 1;
  }
  
- #define GET_PIX_FMT_NAME(pix_fmt)\
-     const char *name = av_get_pix_fmt_name(pix_fmt);
- // DEF_CHOOSE_FORMAT(enum PixelFormat, pix_fmt, pix_fmts, PIX_FMT_NONE,
- //                   GET_PIX_FMT_NAME, ":")
- #define GET_SAMPLE_FMT_NAME(sample_fmt)\
-     const char *name = av_get_sample_fmt_name(sample_fmt)
- DEF_CHOOSE_FORMAT(enum AVSampleFormat, sample_fmt, sample_fmts,
-                   AV_SAMPLE_FMT_NONE, GET_SAMPLE_FMT_NAME, ",")
+ const AVIOInterruptCB int_cb = { decode_interrupt_cb, NULL };
  
- #define GET_SAMPLE_RATE_NAME(rate)\
-     char name[16];\
-     snprintf(name, sizeof(name), "%d", rate);
- DEF_CHOOSE_FORMAT(int, sample_rate, supported_samplerates, 0,
-                   GET_SAMPLE_RATE_NAME, ",")
 -void exit_program(int ret)
++void av_noreturn exit_program(int ret)
+ {
+     int i, j;
  
- #define GET_CH_LAYOUT_NAME(ch_layout)\
-     char name[16];\
-     snprintf(name, sizeof(name), "0x%"PRIx64, ch_layout);
+     for (i = 0; i < nb_filtergraphs; i++) {
+         avfilter_graph_free(&filtergraphs[i]->graph);
+         for (j = 0; j < filtergraphs[i]->nb_inputs; j++) {
+             av_freep(&filtergraphs[i]->inputs[j]->name);
+             av_freep(&filtergraphs[i]->inputs[j]);
+         }
+         av_freep(&filtergraphs[i]->inputs);
+         for (j = 0; j < filtergraphs[i]->nb_outputs; j++) {
+             av_freep(&filtergraphs[i]->outputs[j]->name);
+             av_freep(&filtergraphs[i]->outputs[j]);
+         }
+         av_freep(&filtergraphs[i]->outputs);
+         av_freep(&filtergraphs[i]);
+     }
+     av_freep(&filtergraphs);
  
- DEF_CHOOSE_FORMAT(uint64_t, channel_layout, channel_layouts, 0,
-                   GET_CH_LAYOUT_NAME, ",")
++    av_freep(&subtitle_out);
 +
- static FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost)
- {
-     FilterGraph *fg = av_mallocz(sizeof(*fg));
+     /* close files */
+     for (i = 0; i < nb_output_files; i++) {
+         AVFormatContext *s = output_files[i]->ctx;
+         if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
+             avio_close(s->pb);
+         avformat_free_context(s);
+         av_dict_free(&output_files[i]->opts);
+         av_freep(&output_files[i]);
+     }
+     for (i = 0; i < nb_output_streams; i++) {
+         AVBitStreamFilterContext *bsfc = output_streams[i]->bitstream_filters;
+         while (bsfc) {
+             AVBitStreamFilterContext *next = bsfc->next;
+             av_bitstream_filter_close(bsfc);
+             bsfc = next;
+         }
+         output_streams[i]->bitstream_filters = NULL;
  
-     if (!fg)
-         exit_program(1);
-     fg->index = nb_filtergraphs;
+         av_freep(&output_streams[i]->forced_keyframes);
 -        av_freep(&output_streams[i]->avfilter);
+         av_freep(&output_streams[i]->filtered_frame);
++        av_freep(&output_streams[i]->avfilter);
+         av_freep(&output_streams[i]);
+     }
+     for (i = 0; i < nb_input_files; i++) {
+         avformat_close_input(&input_files[i]->ctx);
+         av_freep(&input_files[i]);
+     }
+     for (i = 0; i < nb_input_streams; i++) {
+         av_freep(&input_streams[i]->decoded_frame);
+         av_dict_free(&input_streams[i]->opts);
+         free_buffer_pool(&input_streams[i]->buffer_pool);
++        avfilter_unref_bufferp(&input_streams[i]->sub2video.ref);
+         av_freep(&input_streams[i]->filters);
+         av_freep(&input_streams[i]);
+     }
  
-     fg->outputs = grow_array(fg->outputs, sizeof(*fg->outputs), &fg->nb_outputs,
-                              fg->nb_outputs + 1);
-     if (!(fg->outputs[0] = av_mallocz(sizeof(*fg->outputs[0]))))
-         exit_program(1);
-     fg->outputs[0]->ost   = ost;
-     fg->outputs[0]->graph = fg;
+     if (vstats_file)
+         fclose(vstats_file);
+     av_free(vstats_filename);
  
-     ost->filter = fg->outputs[0];
+     av_freep(&input_streams);
+     av_freep(&input_files);
+     av_freep(&output_streams);
+     av_freep(&output_files);
  
-     fg->inputs = grow_array(fg->inputs, sizeof(*fg->inputs), &fg->nb_inputs,
-                             fg->nb_inputs + 1);
-     if (!(fg->inputs[0] = av_mallocz(sizeof(*fg->inputs[0]))))
-         exit_program(1);
-     fg->inputs[0]->ist   = ist;
-     fg->inputs[0]->graph = fg;
+     uninit_opts();
  
-     ist->filters = grow_array(ist->filters, sizeof(*ist->filters),
-                               &ist->nb_filters, ist->nb_filters + 1);
-     ist->filters[ist->nb_filters - 1] = fg->inputs[0];
+     avfilter_uninit();
+     avformat_network_deinit();
  
-     filtergraphs = grow_array(filtergraphs, sizeof(*filtergraphs),
-                               &nb_filtergraphs, nb_filtergraphs + 1);
-     filtergraphs[nb_filtergraphs - 1] = fg;
+     if (received_sigterm) {
+         av_log(NULL, AV_LOG_INFO, "Received signal %d: terminating.\n",
+                (int) received_sigterm);
+         exit (255);
+     }
  
-     return fg;
+     exit(ret);
  }
  
static void init_input_filter(FilterGraph *fg, AVFilterInOut *in)
void assert_avoptions(AVDictionary *m)
  {
-     InputStream *ist = NULL;
-     enum AVMediaType type = avfilter_pad_get_type(in->filter_ctx->input_pads, in->pad_idx);
-     int i;
-     // TODO: support other filter types
-     if (type != AVMEDIA_TYPE_VIDEO && type != AVMEDIA_TYPE_AUDIO) {
-         av_log(NULL, AV_LOG_FATAL, "Only video and audio filters supported "
-                "currently.\n");
+     AVDictionaryEntry *t;
+     if ((t = av_dict_get(m, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
+         av_log(NULL, AV_LOG_FATAL, "Option %s not found.\n", t->key);
          exit_program(1);
      }
+ }
  
-     if (in->name) {
-         AVFormatContext *s;
-         AVStream       *st = NULL;
-         char *p;
-         int file_idx = strtol(in->name, &p, 0);
+ static void assert_codec_experimental(AVCodecContext *c, int encoder)
+ {
+     const char *codec_string = encoder ? "encoder" : "decoder";
+     AVCodec *codec;
+     if (c->codec->capabilities & CODEC_CAP_EXPERIMENTAL &&
+         c->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
+         av_log(NULL, AV_LOG_FATAL, "%s '%s' is experimental and might produce bad "
+                 "results.\nAdd '-strict experimental' if you want to use it.\n",
+                 codec_string, c->codec->name);
+         codec = encoder ? avcodec_find_encoder(c->codec->id) : avcodec_find_decoder(c->codec->id);
+         if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL))
+             av_log(NULL, AV_LOG_FATAL, "Or use the non experimental %s '%s'.\n",
+                    codec_string, codec->name);
+         exit_program(1);
+     }
+ }
  
-         if (file_idx < 0 || file_idx >= nb_input_files) {
-             av_log(NULL, AV_LOG_FATAL, "Invalid file index %d in filtergraph description %s.\n",
-                    file_idx, fg->graph_desc);
-             exit_program(1);
-         }
-         s = input_files[file_idx]->ctx;
 -/**
 - * Update the requested input sample format based on the output sample format.
 - * This is currently only used to request float output from decoders which
 - * support multiple sample formats, one of which is AV_SAMPLE_FMT_FLT.
 - * Ideally this will be removed in the future when decoders do not do format
 - * conversion and only output in their native format.
 - */
 -static void update_sample_fmt(AVCodecContext *dec, AVCodec *dec_codec,
 -                              AVCodecContext *enc)
++static void update_benchmark(const char *fmt, ...)
+ {
 -    /* if sample formats match or a decoder sample format has already been
 -       requested, just return */
 -    if (enc->sample_fmt == dec->sample_fmt ||
 -        dec->request_sample_fmt > AV_SAMPLE_FMT_NONE)
 -        return;
 -
 -    /* if decoder supports more than one output format */
 -    if (dec_codec && dec_codec->sample_fmts &&
 -        dec_codec->sample_fmts[0] != AV_SAMPLE_FMT_NONE &&
 -        dec_codec->sample_fmts[1] != AV_SAMPLE_FMT_NONE) {
 -        const enum AVSampleFormat *p;
 -        int min_dec = -1, min_inc = -1;
 -
 -        /* find a matching sample format in the encoder */
 -        for (p = dec_codec->sample_fmts; *p != AV_SAMPLE_FMT_NONE; p++) {
 -            if (*p == enc->sample_fmt) {
 -                dec->request_sample_fmt = *p;
 -                return;
 -            } else if (*p > enc->sample_fmt) {
 -                min_inc = FFMIN(min_inc, *p - enc->sample_fmt);
 -            } else
 -                min_dec = FFMIN(min_dec, enc->sample_fmt - *p);
++    if (do_benchmark_all) {
++        int64_t t = getutime();
++        va_list va;
++        char buf[1024];
 +
-         for (i = 0; i < s->nb_streams; i++) {
-             enum AVMediaType stream_type = s->streams[i]->codec->codec_type;
-             if (stream_type != type &&
-                 !(stream_type == AVMEDIA_TYPE_SUBTITLE &&
-                   type == AVMEDIA_TYPE_VIDEO /* sub2video hack */))
-                 continue;
-             if (check_stream_specifier(s, s->streams[i], *p == ':' ? p + 1 : p) == 1) {
-                 st = s->streams[i];
-                 break;
-             }
-         }
-         if (!st) {
-             av_log(NULL, AV_LOG_FATAL, "Stream specifier '%s' in filtergraph description %s "
-                    "matches no streams.\n", p, fg->graph_desc);
-             exit_program(1);
-         }
-         ist = input_streams[input_files[file_idx]->ist_index + st->index];
-     } else {
-         /* find the first unused stream of corresponding type */
-         for (i = 0; i < nb_input_streams; i++) {
-             ist = input_streams[i];
-             if (ist->st->codec->codec_type == type && ist->discard)
-                 break;
-         }
-         if (i == nb_input_streams) {
-             av_log(NULL, AV_LOG_FATAL, "Cannot find a matching stream for "
-                    "unlabeled input pad %d on filter %s\n", in->pad_idx,
-                    in->filter_ctx->name);
-             exit_program(1);
++        if (fmt) {
++            va_start(va, fmt);
++            vsnprintf(buf, sizeof(buf), fmt, va);
++            va_end(va);
++            printf("bench: %8"PRIu64" %s \n", t - current_time, buf);
          }
 -
 -        /* if none match, provide the one that matches quality closest */
 -        dec->request_sample_fmt = min_inc > 0 ? enc->sample_fmt + min_inc :
 -                                  enc->sample_fmt - min_dec;
++        current_time = t;
      }
-     av_assert0(ist);
-     ist->discard         = 0;
-     ist->decoding_needed = 1;
-     ist->st->discard = AVDISCARD_NONE;
-     fg->inputs = grow_array(fg->inputs, sizeof(*fg->inputs),
-                             &fg->nb_inputs, fg->nb_inputs + 1);
-     if (!(fg->inputs[fg->nb_inputs - 1] = av_mallocz(sizeof(*fg->inputs[0]))))
-         exit_program(1);
-     fg->inputs[fg->nb_inputs - 1]->ist   = ist;
-     fg->inputs[fg->nb_inputs - 1]->graph = fg;
-     ist->filters = grow_array(ist->filters, sizeof(*ist->filters),
-                               &ist->nb_filters, ist->nb_filters + 1);
-     ist->filters[ist->nb_filters - 1] = fg->inputs[fg->nb_inputs - 1];
  }
  
- static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out)
+ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
  {
-     char *pix_fmts;
-     OutputStream *ost = ofilter->ost;
-     AVCodecContext *codec = ost->st->codec;
-     AVFilterContext *last_filter = out->filter_ctx;
-     int pad_idx = out->pad_idx;
+     AVBitStreamFilterContext *bsfc = ost->bitstream_filters;
+     AVCodecContext          *avctx = ost->st->codec;
      int ret;
-     char name[255];
-     AVBufferSinkParams *buffersink_params = av_buffersink_params_alloc();
  
-     snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index);
-     ret = avfilter_graph_create_filter(&ofilter->filter,
-                                        avfilter_get_by_name("buffersink"),
-                                        name, NULL, NULL/*buffersink_params*/, fg->graph);
-     av_freep(&buffersink_params);
-     if (ret < 0)
-         return ret;
-     if (codec->width || codec->height) {
-         char args[255];
-         AVFilterContext *filter;
-         snprintf(args, sizeof(args), "%d:%d:flags=0x%X",
-                  codec->width,
-                  codec->height,
-                  (unsigned)ost->sws_flags);
-         snprintf(name, sizeof(name), "scaler for output stream %d:%d",
-                  ost->file_index, ost->index);
-         if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"),
-                                                 name, args, NULL, fg->graph)) < 0)
-             return ret;
-         if ((ret = avfilter_link(last_filter, pad_idx, filter, 0)) < 0)
-             return ret;
++    if ((avctx->codec_type == AVMEDIA_TYPE_VIDEO && video_sync_method == VSYNC_DROP) ||
++        (avctx->codec_type == AVMEDIA_TYPE_AUDIO && audio_sync_method < 0))
++        pkt->pts = pkt->dts = AV_NOPTS_VALUE;
 +
-         last_filter = filter;
-         pad_idx = 0;
++    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && pkt->dts != AV_NOPTS_VALUE) {
++        int64_t max = ost->st->cur_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT);
++        if (ost->st->cur_dts && ost->st->cur_dts != AV_NOPTS_VALUE &&  max > pkt->dts) {
++            av_log(s, max - pkt->dts > 2 ? AV_LOG_WARNING : AV_LOG_DEBUG, "Audio timestamp %"PRId64" < %"PRId64" invalid, cliping\n", pkt->dts, max);
++            pkt->pts = pkt->dts = max;
++        }
 +    }
 +
-     if ((pix_fmts = choose_pix_fmts(ost))) {
-         AVFilterContext *filter;
-         snprintf(name, sizeof(name), "pixel format for output stream %d:%d",
-                  ost->file_index, ost->index);
-         if ((ret = avfilter_graph_create_filter(&filter,
-                                                 avfilter_get_by_name("format"),
-                                                 "format", pix_fmts, NULL,
-                                                 fg->graph)) < 0)
-             return ret;
-         if ((ret = avfilter_link(last_filter, pad_idx, filter, 0)) < 0)
-             return ret;
-         last_filter = filter;
-         pad_idx     = 0;
-         av_freep(&pix_fmts);
+     /*
+      * Audio encoders may split the packets --  #frames in != #packets out.
+      * But there is no reordering, so we can limit the number of output packets
+      * by simply dropping them here.
+      * Counting encoded video frames needs to be done separately because of
+      * reordering, see do_video_out()
+      */
+     if (!(avctx->codec_type == AVMEDIA_TYPE_VIDEO && avctx->codec)) {
+         if (ost->frame_number >= ost->max_frames) {
+             av_free_packet(pkt);
+             return;
+         }
+         ost->frame_number++;
      }
  
-     if (ost->frame_rate.num && 0) {
-         AVFilterContext *fps;
-         char args[255];
-         snprintf(args, sizeof(args), "fps=%d/%d", ost->frame_rate.num,
-                  ost->frame_rate.den);
-         snprintf(name, sizeof(name), "fps for output stream %d:%d",
-                  ost->file_index, ost->index);
-         ret = avfilter_graph_create_filter(&fps, avfilter_get_by_name("fps"),
-                                            name, args, NULL, fg->graph);
-         if (ret < 0)
-             return ret;
+     while (bsfc) {
+         AVPacket new_pkt = *pkt;
+         int a = av_bitstream_filter_filter(bsfc, avctx, NULL,
+                                            &new_pkt.data, &new_pkt.size,
+                                            pkt->data, pkt->size,
+                                            pkt->flags & AV_PKT_FLAG_KEY);
+         if (a > 0) {
+             av_free_packet(pkt);
+             new_pkt.destruct = av_destruct_packet;
+         } else if (a < 0) {
 -            av_log(NULL, AV_LOG_ERROR, "%s failed for stream %d, codec %s",
++            av_log(NULL, AV_LOG_ERROR, "Failed to open bitstream filter %s for stream %d with codec %s",
+                    bsfc->filter->name, pkt->stream_index,
+                    avctx->codec ? avctx->codec->name : "copy");
+             print_error("", a);
+             if (exit_on_error)
+                 exit_program(1);
+         }
+         *pkt = new_pkt;
  
-         ret = avfilter_link(last_filter, pad_idx, fps, 0);
-         if (ret < 0)
-             return ret;
-         last_filter = fps;
-         pad_idx = 0;
+         bsfc = bsfc->next;
      }
  
-     if ((ret = avfilter_link(last_filter, pad_idx, ofilter->filter, 0)) < 0)
-         return ret;
-     return 0;
+     pkt->stream_index = ost->index;
+     ret = av_interleaved_write_frame(s, pkt);
+     if (ret < 0) {
+         print_error("av_interleaved_write_frame()", ret);
+         exit_program(1);
+     }
  }
  
- static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out)
+ static int check_recording_time(OutputStream *ost)
  {
-     OutputStream *ost = ofilter->ost;
-     AVCodecContext *codec  = ost->st->codec;
-     AVFilterContext *last_filter = out->filter_ctx;
-     int pad_idx = out->pad_idx;
-     char *sample_fmts, *sample_rates, *channel_layouts;
-     char name[255];
-     int ret;
-     snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index);
-     ret = avfilter_graph_create_filter(&ofilter->filter,
-                                        avfilter_get_by_name("abuffersink"),
-                                        name, NULL, NULL, fg->graph);
-     if (ret < 0)
-         return ret;
+     OutputFile *of = output_files[ost->file_index];
  
- #define AUTO_INSERT_FILTER(opt_name, filter_name, arg) do {                 \
-     AVFilterContext *filt_ctx;                                              \
-                                                                             \
-     av_log(NULL, AV_LOG_INFO, opt_name " is forwarded to lavfi "            \
-            "similarly to -af " filter_name "=%s.\n", arg);                  \
-                                                                             \
-     ret = avfilter_graph_create_filter(&filt_ctx,                           \
-                                        avfilter_get_by_name(filter_name),   \
-                                        filter_name, arg, NULL, fg->graph);  \
-     if (ret < 0)                                                            \
-         return ret;                                                         \
-                                                                             \
-     ret = avfilter_link(last_filter, pad_idx, filt_ctx, 0);                 \
-     if (ret < 0)                                                            \
-         return ret;                                                         \
-                                                                             \
-     last_filter = filt_ctx;                                                 \
-     pad_idx = 0;                                                            \
- } while (0)
-     if (ost->audio_channels_mapped) {
-         int i;
-         AVBPrint pan_buf;
-         av_bprint_init(&pan_buf, 256, 8192);
-         av_bprintf(&pan_buf, "0x%"PRIx64,
-                    av_get_default_channel_layout(ost->audio_channels_mapped));
-         for (i = 0; i < ost->audio_channels_mapped; i++)
-             if (ost->audio_channels_map[i] != -1)
-                 av_bprintf(&pan_buf, ":c%d=c%d", i, ost->audio_channels_map[i]);
-         AUTO_INSERT_FILTER("-map_channel", "pan", pan_buf.str);
-         av_bprint_finalize(&pan_buf, NULL);
+     if (of->recording_time != INT64_MAX &&
+         av_compare_ts(ost->sync_opts - ost->first_pts, ost->st->codec->time_base, of->recording_time,
+                       AV_TIME_BASE_Q) >= 0) {
+         ost->is_past_recording_time = 1;
+         return 0;
      }
+     return 1;
+ }
  
-     if (codec->channels && !codec->channel_layout)
-         codec->channel_layout = av_get_default_channel_layout(codec->channels);
-     sample_fmts     = choose_sample_fmts(ost);
-     sample_rates    = choose_sample_rates(ost);
-     channel_layouts = choose_channel_layouts(ost);
-     if (sample_fmts || sample_rates || channel_layouts) {
-         AVFilterContext *format;
-         char args[256];
-         int len = 0;
-         if (sample_fmts)
-             len += snprintf(args + len, sizeof(args) - len, "sample_fmts=%s:",
-                             sample_fmts);
-         if (sample_rates)
-             len += snprintf(args + len, sizeof(args) - len, "sample_rates=%s:",
-                             sample_rates);
-         if (channel_layouts)
-             len += snprintf(args + len, sizeof(args) - len, "channel_layouts=%s:",
-                             channel_layouts);
-         args[len - 1] = 0;
-         av_freep(&sample_fmts);
-         av_freep(&sample_rates);
-         av_freep(&channel_layouts);
-         snprintf(name, sizeof(name), "audio format for output stream %d:%d",
-                  ost->file_index, ost->index);
-         ret = avfilter_graph_create_filter(&format,
-                                            avfilter_get_by_name("aformat"),
-                                            name, args, NULL, fg->graph);
-         if (ret < 0)
-             return ret;
+ static void do_audio_out(AVFormatContext *s, OutputStream *ost,
+                          AVFrame *frame)
+ {
+     AVCodecContext *enc = ost->st->codec;
+     AVPacket pkt;
+     int got_packet = 0;
  
-         ret = avfilter_link(last_filter, pad_idx, format, 0);
-         if (ret < 0)
-             return ret;
+     av_init_packet(&pkt);
+     pkt.data = NULL;
+     pkt.size = 0;
  
-         last_filter = format;
-         pad_idx = 0;
-     }
+     if (!check_recording_time(ost))
+         return;
  
-     if (audio_volume != 256 && 0) {
-         char args[256];
+     if (frame->pts == AV_NOPTS_VALUE || audio_sync_method < 0)
+         frame->pts = ost->sync_opts;
+     ost->sync_opts = frame->pts + frame->nb_samples;
  
-         snprintf(args, sizeof(args), "%f", audio_volume / 256.);
-         AUTO_INSERT_FILTER("-vol", "volume", args);
++    av_assert0(pkt.size || !pkt.data);
++    update_benchmark(NULL);
+     if (avcodec_encode_audio2(enc, &pkt, frame, &got_packet) < 0) {
 -        av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
++        av_log(NULL, AV_LOG_FATAL, "Audio encoding failed (avcodec_encode_audio2)\n");
+         exit_program(1);
      }
++    update_benchmark("encode_audio %d.%d", ost->file_index, ost->index);
  
-     if ((ret = avfilter_link(last_filter, pad_idx, ofilter->filter, 0)) < 0)
-         return ret;
-     return 0;
- }
+     if (got_packet) {
+         if (pkt.pts != AV_NOPTS_VALUE)
+             pkt.pts      = av_rescale_q(pkt.pts,      enc->time_base, ost->st->time_base);
+         if (pkt.dts != AV_NOPTS_VALUE)
+             pkt.dts      = av_rescale_q(pkt.dts,      enc->time_base, ost->st->time_base);
+         if (pkt.duration > 0)
+             pkt.duration = av_rescale_q(pkt.duration, enc->time_base, ost->st->time_base);
  
- #define DESCRIBE_FILTER_LINK(f, inout, in)                         \
- {                                                                  \
-     AVFilterContext *ctx = inout->filter_ctx;                      \
-     AVFilterPad *pads = in ? ctx->input_pads  : ctx->output_pads;  \
-     int       nb_pads = in ? ctx->input_count : ctx->output_count; \
-     AVIOContext *pb;                                               \
-                                                                    \
-     if (avio_open_dyn_buf(&pb) < 0)                                \
-         exit_program(1);                                           \
-                                                                    \
-     avio_printf(pb, "%s", ctx->filter->name);                      \
-     if (nb_pads > 1)                                               \
-         avio_printf(pb, ":%s", avfilter_pad_get_name(pads, inout->pad_idx));\
-     avio_w8(pb, 0);                                                \
-     avio_close_dyn_buf(pb, &f->name);                              \
- }
++        if (debug_ts) {
++            av_log(NULL, AV_LOG_INFO, "encoder -> type:audio "
++                   "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s\n",
++                   av_ts2str(pkt.pts), av_ts2timestr(pkt.pts, &ost->st->time_base),
++                   av_ts2str(pkt.dts), av_ts2timestr(pkt.dts, &ost->st->time_base));
++        }
 +
- static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out)
- {
-     av_freep(&ofilter->name);
-     DESCRIBE_FILTER_LINK(ofilter, out, 0);
+         write_frame(s, &pkt, ost);
  
-     switch (avfilter_pad_get_type(out->filter_ctx->output_pads, out->pad_idx)) {
-     case AVMEDIA_TYPE_VIDEO: return configure_output_video_filter(fg, ofilter, out);
-     case AVMEDIA_TYPE_AUDIO: return configure_output_audio_filter(fg, ofilter, out);
-     default: av_assert0(0);
+         audio_size += pkt.size;
++        av_free_packet(&pkt);
      }
  }
  
- static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
-                                         AVFilterInOut *in)
+ static void pre_process_video_frame(InputStream *ist, AVPicture *picture, void **bufp)
  {
-     AVFilterContext *first_filter = in->filter_ctx;
-     AVFilter *filter = avfilter_get_by_name("buffer");
-     InputStream *ist = ifilter->ist;
-     AVRational tb = ist->framerate.num ? av_inv_q(ist->framerate) :
-                                          ist->st->time_base;
-     AVRational fr = ist->framerate.num ? ist->framerate :
-                                          ist->st->r_frame_rate;
-     AVRational sar;
-     AVBPrint args;
-     char name[255];
-     int pad_idx = in->pad_idx;
-     int ret;
-     if (ist->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
-         ret = sub2video_prepare(ist);
-         if (ret < 0)
-             return ret;
-     }
+     AVCodecContext *dec;
+     AVPicture *picture2;
+     AVPicture picture_tmp;
+     uint8_t *buf = 0;
  
-     sar = ist->st->sample_aspect_ratio.num ?
-           ist->st->sample_aspect_ratio :
-           ist->st->codec->sample_aspect_ratio;
-     if(!sar.den)
-         sar = (AVRational){0,1};
-     av_bprint_init(&args, 0, 1);
-     av_bprintf(&args,
-              "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:"
-              "pixel_aspect=%d/%d:sws_param=flags=%d", ist->st->codec->width,
-              ist->st->codec->height, ist->st->codec->pix_fmt,
-              tb.num, tb.den, sar.num, sar.den,
-              SWS_BILINEAR + ((ist->st->codec->flags&CODEC_FLAG_BITEXACT) ? SWS_BITEXACT:0));
-     if (fr.num && fr.den)
-         av_bprintf(&args, ":frame_rate=%d/%d", fr.num, fr.den);
-     snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index,
-              ist->file_index, ist->st->index);
-     if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, name,
-                                             args.str, NULL, fg->graph)) < 0)
-         return ret;
+     dec = ist->st->codec;
  
-     if (ist->framerate.num) {
-         AVFilterContext *setpts;
+     /* deinterlace : must be done before any resize */
+     if (do_deinterlace) {
+         int size;
  
-         snprintf(name, sizeof(name), "force CFR for input from stream %d:%d",
-                  ist->file_index, ist->st->index);
-         if ((ret = avfilter_graph_create_filter(&setpts,
-                                                 avfilter_get_by_name("setpts"),
-                                                 name, "N", NULL,
-                                                 fg->graph)) < 0)
-             return ret;
+         /* create temporary picture */
+         size = avpicture_get_size(dec->pix_fmt, dec->width, dec->height);
+         buf  = av_malloc(size);
+         if (!buf)
+             return;
  
-         if ((ret = avfilter_link(setpts, 0, first_filter, pad_idx)) < 0)
-             return ret;
+         picture2 = &picture_tmp;
+         avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height);
  
-         first_filter = setpts;
-         pad_idx = 0;
+         if (avpicture_deinterlace(picture2, picture,
+                                  dec->pix_fmt, dec->width, dec->height) < 0) {
+             /* if error, do not deinterlace */
+             av_log(NULL, AV_LOG_WARNING, "Deinterlacing failed\n");
+             av_free(buf);
+             buf = NULL;
+             picture2 = picture;
+         }
+     } else {
+         picture2 = picture;
      }
  
-     if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0)
-         return ret;
-     return 0;
+     if (picture != picture2)
+         *picture = *picture2;
+     *bufp = buf;
  }
  
- static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter,
-                                         AVFilterInOut *in)
+ static void do_subtitle_out(AVFormatContext *s,
+                             OutputStream *ost,
+                             InputStream *ist,
+                             AVSubtitle *sub,
+                             int64_t pts)
  {
-     AVFilterContext *first_filter = in->filter_ctx;
-     AVFilter *filter = avfilter_get_by_name("abuffer");
-     InputStream *ist = ifilter->ist;
-     int pad_idx = in->pad_idx;
-     char args[255], name[255];
-     int ret;
-     snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s"
-              ":channel_layout=0x%"PRIx64,
-              1, ist->st->codec->sample_rate,
-              ist->st->codec->sample_rate,
-              av_get_sample_fmt_name(ist->st->codec->sample_fmt),
-              ist->st->codec->channel_layout);
-     snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index,
-              ist->file_index, ist->st->index);
-     if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter,
-                                             name, args, NULL,
-                                             fg->graph)) < 0)
-         return ret;
- #define AUTO_INSERT_FILTER_INPUT(opt_name, filter_name, arg) do {                 \
-     AVFilterContext *filt_ctx;                                              \
-                                                                             \
-     av_log(NULL, AV_LOG_INFO, opt_name " is forwarded to lavfi "            \
-            "similarly to -af " filter_name "=%s.\n", arg);                  \
-                                                                             \
-     snprintf(name, sizeof(name), "graph %d %s for input stream %d:%d",      \
-                 fg->index, filter_name, ist->file_index, ist->st->index);   \
-     ret = avfilter_graph_create_filter(&filt_ctx,                           \
-                                        avfilter_get_by_name(filter_name),   \
-                                        name, arg, NULL, fg->graph);         \
-     if (ret < 0)                                                            \
-         return ret;                                                         \
-                                                                             \
-     ret = avfilter_link(filt_ctx, 0, first_filter, pad_idx);                \
-     if (ret < 0)                                                            \
-         return ret;                                                         \
-                                                                             \
-     first_filter = filt_ctx;                                                  \
- } while (0)
-     if (audio_sync_method > 0) {
-         char args[256] = {0};
-         av_strlcatf(args, sizeof(args), "min_comp=0.001:min_hard_comp=%f", audio_drift_threshold);
-         if (audio_sync_method > 1)
-             av_strlcatf(args, sizeof(args), ":max_soft_comp=%f", audio_sync_method/(double)ist->st->codec->sample_rate);
-         AUTO_INSERT_FILTER_INPUT("-async", "aresample", args);
-     }
 -    static uint8_t *subtitle_out = NULL;
+     int subtitle_out_max_size = 1024 * 1024;
+     int subtitle_out_size, nb, i;
+     AVCodecContext *enc;
+     AVPacket pkt;
  
- //     if (ost->audio_channels_mapped) {
- //         int i;
- //         AVBPrint pan_buf;
- //         av_bprint_init(&pan_buf, 256, 8192);
- //         av_bprintf(&pan_buf, "0x%"PRIx64,
- //                    av_get_default_channel_layout(ost->audio_channels_mapped));
- //         for (i = 0; i < ost->audio_channels_mapped; i++)
- //             if (ost->audio_channels_map[i] != -1)
- //                 av_bprintf(&pan_buf, ":c%d=c%d", i, ost->audio_channels_map[i]);
- //         AUTO_INSERT_FILTER_INPUT("-map_channel", "pan", pan_buf.str);
- //         av_bprint_finalize(&pan_buf, NULL);
- //     }
-     if (audio_volume != 256) {
-         char args[256];
-         snprintf(args, sizeof(args), "%f", audio_volume / 256.);
-         AUTO_INSERT_FILTER_INPUT("-vol", "volume", args);
+     if (pts == AV_NOPTS_VALUE) {
+         av_log(NULL, AV_LOG_ERROR, "Subtitle packets must have a pts\n");
+         if (exit_on_error)
+             exit_program(1);
+         return;
      }
-     if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0)
-         return ret;
  
-     return 0;
- }
- static int configure_input_filter(FilterGraph *fg, InputFilter *ifilter,
-                                   AVFilterInOut *in)
- {
-     av_freep(&ifilter->name);
-     DESCRIBE_FILTER_LINK(ifilter, in, 1);
+     enc = ost->st->codec;
  
-     switch (avfilter_pad_get_type(in->filter_ctx->input_pads, in->pad_idx)) {
-     case AVMEDIA_TYPE_VIDEO: return configure_input_video_filter(fg, ifilter, in);
-     case AVMEDIA_TYPE_AUDIO: return configure_input_audio_filter(fg, ifilter, in);
-     default: av_assert0(0);
+     if (!subtitle_out) {
+         subtitle_out = av_malloc(subtitle_out_max_size);
      }
- }
  
- static int configure_filtergraph(FilterGraph *fg)
- {
-     AVFilterInOut *inputs, *outputs, *cur;
-     int ret, i, init = !fg->graph, simple = !fg->graph_desc;
-     const char *graph_desc = simple ? fg->outputs[0]->ost->avfilter :
-                                       fg->graph_desc;
+     /* Note: DVB subtitle need one packet to draw them and one other
+        packet to clear them */
+     /* XXX: signal it in the codec context ? */
+     if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE)
+         nb = 2;
+     else
+         nb = 1;
  
-     avfilter_graph_free(&fg->graph);
-     if (!(fg->graph = avfilter_graph_alloc()))
-         return AVERROR(ENOMEM);
++    /* shift timestamp to honor -ss and make check_recording_time() work with -t */
++    pts = av_rescale_q(pts, ist->st->time_base, AV_TIME_BASE_Q)
++        - output_files[ost->file_index]->start_time;
+     for (i = 0; i < nb; i++) {
 -        ost->sync_opts = av_rescale_q(pts, ist->st->time_base, enc->time_base);
++        ost->sync_opts = av_rescale_q(pts, AV_TIME_BASE_Q, enc->time_base);
+         if (!check_recording_time(ost))
+             return;
  
-     if (simple) {
-         OutputStream *ost = fg->outputs[0]->ost;
-         char args[255];
-         snprintf(args, sizeof(args), "flags=0x%X", (unsigned)ost->sws_flags);
-         fg->graph->scale_sws_opts = av_strdup(args);
 -        sub->pts = av_rescale_q(pts, ist->st->time_base, AV_TIME_BASE_Q);
++        sub->pts = pts;
+         // start_display_time is required to be 0
+         sub->pts               += av_rescale_q(sub->start_display_time, (AVRational){ 1, 1000 }, AV_TIME_BASE_Q);
+         sub->end_display_time  -= sub->start_display_time;
+         sub->start_display_time = 0;
+         subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out,
+                                                     subtitle_out_max_size, sub);
+         if (subtitle_out_size < 0) {
+             av_log(NULL, AV_LOG_FATAL, "Subtitle encoding failed\n");
+             exit_program(1);
+         }
+         av_init_packet(&pkt);
+         pkt.data = subtitle_out;
+         pkt.size = subtitle_out_size;
+         pkt.pts  = av_rescale_q(sub->pts, AV_TIME_BASE_Q, ost->st->time_base);
++        pkt.duration = av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, ost->st->time_base);
+         if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {
+             /* XXX: the pts correction is handled here. Maybe handling
+                it in the codec would be better */
+             if (i == 0)
+                 pkt.pts += 90 * sub->start_display_time;
+             else
+                 pkt.pts += 90 * sub->end_display_time;
+         }
+         write_frame(s, &pkt, ost);
++        subtitle_size += pkt.size;
      }
+ }
  
-     if ((ret = avfilter_graph_parse2(fg->graph, graph_desc, &inputs, &outputs)) < 0)
-         return ret;
+ static void do_video_out(AVFormatContext *s,
+                          OutputStream *ost,
+                          AVFrame *in_picture,
 -                         int *frame_size, float quality)
++                         float quality)
+ {
+     int ret, format_video_sync;
+     AVPacket pkt;
+     AVCodecContext *enc = ost->st->codec;
++    int nb_frames, i;
++    double sync_ipts, delta;
++    double duration = 0;
++    int frame_size = 0;
++    InputStream *ist = NULL;
 +
-     if (simple && (!inputs || inputs->next || !outputs || outputs->next)) {
-         av_log(NULL, AV_LOG_ERROR, "Simple filtergraph '%s' does not have "
-                "exactly one input and output.\n", graph_desc);
-         return AVERROR(EINVAL);
-     }
++    if (ost->source_index >= 0)
++        ist = input_streams[ost->source_index];
 +
-     for (cur = inputs; !simple && init && cur; cur = cur->next)
-         init_input_filter(fg, cur);
++    if(ist && ist->st->start_time != AV_NOPTS_VALUE && ist->st->first_dts != AV_NOPTS_VALUE && ost->frame_rate.num)
++        duration = 1/(av_q2d(ost->frame_rate) * av_q2d(enc->time_base));
 +
-     for (cur = inputs, i = 0; cur; cur = cur->next, i++)
-         if ((ret = configure_input_filter(fg, fg->inputs[i], cur)) < 0)
-             return ret;
-     avfilter_inout_free(&inputs);
++    sync_ipts = in_picture->pts;
++    delta = sync_ipts - ost->sync_opts + duration;
  
-     if (!init || simple) {
-         /* we already know the mappings between lavfi outputs and output streams,
-          * so we can finish the setup */
-         for (cur = outputs, i = 0; cur; cur = cur->next, i++)
-             configure_output_filter(fg, fg->outputs[i], cur);
-         avfilter_inout_free(&outputs);
 -    *frame_size = 0;
++    /* by default, we output a single frame */
++    nb_frames = 1;
  
-         if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0)
-             return ret;
-     } else {
-         /* wait until output mappings are processed */
-         for (cur = outputs; cur;) {
-             fg->outputs = grow_array(fg->outputs, sizeof(*fg->outputs),
-                                      &fg->nb_outputs, fg->nb_outputs + 1);
-             if (!(fg->outputs[fg->nb_outputs - 1] = av_mallocz(sizeof(*fg->outputs[0]))))
-                 exit_program(1);
-             fg->outputs[fg->nb_outputs - 1]->graph   = fg;
-             fg->outputs[fg->nb_outputs - 1]->out_tmp = cur;
-             cur = cur->next;
-             fg->outputs[fg->nb_outputs - 1]->out_tmp->next = NULL;
+     format_video_sync = video_sync_method;
+     if (format_video_sync == VSYNC_AUTO)
 -        format_video_sync = (s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH :
 -                            (s->oformat->flags & AVFMT_VARIABLE_FPS) ? VSYNC_VFR : VSYNC_CFR;
 -    if (format_video_sync != VSYNC_PASSTHROUGH &&
 -        ost->frame_number &&
 -        in_picture->pts != AV_NOPTS_VALUE &&
 -        in_picture->pts < ost->sync_opts) {
++        format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? ((s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH : VSYNC_VFR) : 1;
++
++    switch (format_video_sync) {
++    case VSYNC_CFR:
++        // FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
++        if (delta < -1.1)
++            nb_frames = 0;
++        else if (delta > 1.1)
++            nb_frames = lrintf(delta);
++        break;
++    case VSYNC_VFR:
++        if (delta <= -0.6)
++            nb_frames = 0;
++        else if (delta > 0.6)
++            ost->sync_opts = lrint(sync_ipts);
++        break;
++    case VSYNC_DROP:
++    case VSYNC_PASSTHROUGH:
++        ost->sync_opts = lrint(sync_ipts);
++        break;
++    default:
++        av_assert0(0);
++    }
++
++    nb_frames = FFMIN(nb_frames, ost->max_frames - ost->frame_number);
++    if (nb_frames == 0) {
+         nb_frames_drop++;
+         av_log(NULL, AV_LOG_VERBOSE, "*** drop!\n");
+         return;
++    } else if (nb_frames > 1) {
++        if (nb_frames > dts_error_threshold * 30) {
++            av_log(NULL, AV_LOG_ERROR, "%d frame duplication too large, skiping\n", nb_frames - 1);
++            nb_frames_drop++;
++            return;
 +        }
++        nb_frames_dup += nb_frames - 1;
++        av_log(NULL, AV_LOG_VERBOSE, "*** %d dup!\n", nb_frames - 1);
      }
  
-     return 0;
- }
 -    if (in_picture->pts == AV_NOPTS_VALUE)
 -        in_picture->pts = ost->sync_opts;
 -    ost->sync_opts = in_picture->pts;
 -
 -
 -    if (!ost->frame_number)
 -        ost->first_pts = in_picture->pts;
 -
++  /* duplicates frame if needed */
++  for (i = 0; i < nb_frames; i++) {
+     av_init_packet(&pkt);
+     pkt.data = NULL;
+     pkt.size = 0;
  
- static int configure_complex_filters(void)
- {
-     int i, ret = 0;
 -    if (!check_recording_time(ost) ||
 -        ost->frame_number >= ost->max_frames)
++    in_picture->pts = ost->sync_opts;
 +
-     for (i = 0; i < nb_filtergraphs; i++)
-         if (!filtergraphs[i]->graph &&
-             (ret = configure_filtergraph(filtergraphs[i])) < 0)
-             return ret;
-     return 0;
- }
++    if (!check_recording_time(ost))
+         return;
  
- static int ist_in_filtergraph(FilterGraph *fg, InputStream *ist)
- {
-     int i;
-     for (i = 0; i < fg->nb_inputs; i++)
-         if (fg->inputs[i]->ist == ist)
-             return 1;
-     return 0;
- }
+     if (s->oformat->flags & AVFMT_RAWPICTURE &&
+         enc->codec->id == AV_CODEC_ID_RAWVIDEO) {
+         /* raw pictures are written as AVPicture structure to
+            avoid any copies. We support temporarily the older
+            method. */
+         enc->coded_frame->interlaced_frame = in_picture->interlaced_frame;
+         enc->coded_frame->top_field_first  = in_picture->top_field_first;
+         pkt.data   = (uint8_t *)in_picture;
+         pkt.size   =  sizeof(AVPicture);
+         pkt.pts    = av_rescale_q(in_picture->pts, enc->time_base, ost->st->time_base);
+         pkt.flags |= AV_PKT_FLAG_KEY;
  
- static void term_exit(void)
- {
-     av_log(NULL, AV_LOG_QUIET, "%s", "");
- #if HAVE_TERMIOS_H
-     if(restore_tty)
-         tcsetattr (0, TCSANOW, &oldtty);
- #endif
- }
+         write_frame(s, &pkt, ost);
++        video_size += pkt.size;
+     } else {
+         int got_packet;
+         AVFrame big_picture;
  
- static volatile int received_sigterm = 0;
+         big_picture = *in_picture;
+         /* better than nothing: use input picture interlaced
+            settings */
+         big_picture.interlaced_frame = in_picture->interlaced_frame;
+         if (ost->st->codec->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)) {
+             if (ost->top_field_first == -1)
+                 big_picture.top_field_first = in_picture->top_field_first;
+             else
+                 big_picture.top_field_first = !!ost->top_field_first;
+         }
  
- static void sigterm_handler(int sig)
- {
-     received_sigterm = sig;
-     received_nb_signals++;
-     term_exit();
-     if(received_nb_signals > 3)
-         exit(123);
- }
+         /* handles same_quant here. This is not correct because it may
+            not be a global option */
+         big_picture.quality = quality;
+         if (!enc->me_threshold)
+             big_picture.pict_type = 0;
+         if (ost->forced_kf_index < ost->forced_kf_count &&
+             big_picture.pts >= ost->forced_kf_pts[ost->forced_kf_index]) {
+             big_picture.pict_type = AV_PICTURE_TYPE_I;
+             ost->forced_kf_index++;
+         }
++        update_benchmark(NULL);
+         ret = avcodec_encode_video2(enc, &pkt, &big_picture, &got_packet);
++        update_benchmark("encode_video %d.%d", ost->file_index, ost->index);
+         if (ret < 0) {
+             av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n");
+             exit_program(1);
+         }
  
- static void term_init(void)
- {
- #if HAVE_TERMIOS_H
-     if(!run_as_daemon){
-         struct termios tty;
-         int istty = 1;
- #if HAVE_ISATTY
-         istty = isatty(0) && isatty(2);
- #endif
-         if (istty && tcgetattr (0, &tty) == 0) {
-             oldtty = tty;
-             restore_tty = 1;
-             atexit(term_exit);
+         if (got_packet) {
++            if (pkt.pts == AV_NOPTS_VALUE && !(enc->codec->capabilities & CODEC_CAP_DELAY))
++                pkt.pts = ost->sync_opts;
 +
-             tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP
-                              |INLCR|IGNCR|ICRNL|IXON);
-             tty.c_oflag |= OPOST;
-             tty.c_lflag &= ~(ECHO|ECHONL|ICANON|IEXTEN);
-             tty.c_cflag &= ~(CSIZE|PARENB);
-             tty.c_cflag |= CS8;
-             tty.c_cc[VMIN] = 1;
-             tty.c_cc[VTIME] = 0;
+             if (pkt.pts != AV_NOPTS_VALUE)
+                 pkt.pts = av_rescale_q(pkt.pts, enc->time_base, ost->st->time_base);
+             if (pkt.dts != AV_NOPTS_VALUE)
+                 pkt.dts = av_rescale_q(pkt.dts, enc->time_base, ost->st->time_base);
  
-             tcsetattr (0, TCSANOW, &tty);
++            if (debug_ts) {
++                av_log(NULL, AV_LOG_INFO, "encoder -> type:video "
++                    "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s\n",
++                    av_ts2str(pkt.pts), av_ts2timestr(pkt.pts, &ost->st->time_base),
++                    av_ts2str(pkt.dts), av_ts2timestr(pkt.dts, &ost->st->time_base));
++            }
++
+             write_frame(s, &pkt, ost);
 -            *frame_size = pkt.size;
++            frame_size = pkt.size;
+             video_size += pkt.size;
++            av_free_packet(&pkt);
+             /* if two pass, output log */
+             if (ost->logfile && enc->stats_out) {
+                 fprintf(ost->logfile, "%s", enc->stats_out);
+             }
          }
-         signal(SIGQUIT, sigterm_handler); /* Quit (POSIX).  */
      }
- #endif
-     avformat_network_deinit();
+     ost->sync_opts++;
+     /*
+      * For video, number of frames in == number of packets out.
+      * But there may be reordering, so we can't throw away frames on encoder
+      * flush, we need to limit them here, before they go into encoder.
+      */
+     ost->frame_number++;
++  }
 +
-     signal(SIGINT , sigterm_handler); /* Interrupt (ANSI).    */
-     signal(SIGTERM, sigterm_handler); /* Termination (ANSI).  */
- #ifdef SIGXCPU
-     signal(SIGXCPU, sigterm_handler);
- #endif
++    if (vstats_filename && frame_size)
++        do_video_stats(output_files[ost->file_index]->ctx, ost, frame_size);
  }
  
- /* read a key without blocking */
- static int read_key(void)
+ static double psnr(double d)
  {
-     unsigned char ch;
- #if HAVE_TERMIOS_H
-     int n = 1;
-     struct timeval tv;
-     fd_set rfds;
-     FD_ZERO(&rfds);
-     FD_SET(0, &rfds);
-     tv.tv_sec = 0;
-     tv.tv_usec = 0;
-     n = select(1, &rfds, NULL, NULL, &tv);
-     if (n > 0) {
-         n = read(0, &ch, 1);
-         if (n == 1)
-             return ch;
+     return -10.0 * log(d) / log(10.0);
+ }
  
-         return n;
-     }
- #elif HAVE_KBHIT
- #    if HAVE_PEEKNAMEDPIPE
-     static int is_pipe;
-     static HANDLE input_handle;
-     DWORD dw, nchars;
-     if(!input_handle){
-         input_handle = GetStdHandle(STD_INPUT_HANDLE);
-         is_pipe = !GetConsoleMode(input_handle, &dw);
-     }
-     if (stdin->_cnt > 0) {
-         read(0, &ch, 1);
-         return ch;
-     }
-     if (is_pipe) {
-         /* When running under a GUI, you will end here. */
-         if (!PeekNamedPipe(input_handle, NULL, 0, NULL, &nchars, NULL))
-             return -1;
-         //Read it
-         if(nchars != 0) {
-             read(0, &ch, 1);
-             return ch;
-         }else{
-             return -1;
-         }
-     }
- #    endif
-     if(kbhit())
-         return(getch());
- #endif
-     return -1;
- }
- static int decode_interrupt_cb(void *ctx)
- {
-     return received_nb_signals > 1;
- }
- static const AVIOInterruptCB int_cb = { decode_interrupt_cb, NULL };
- void av_noreturn exit_program(int ret)
+ static void do_video_stats(AVFormatContext *os, OutputStream *ost,
+                            int frame_size)
  {
-     int i, j;
+     AVCodecContext *enc;
+     int frame_number;
+     double ti1, bitrate, avg_bitrate;
  
-     for (i = 0; i < nb_filtergraphs; i++) {
-         avfilter_graph_free(&filtergraphs[i]->graph);
-         for (j = 0; j < filtergraphs[i]->nb_inputs; j++) {
-             av_freep(&filtergraphs[i]->inputs[j]->name);
-             av_freep(&filtergraphs[i]->inputs[j]);
-         }
-         av_freep(&filtergraphs[i]->inputs);
-         for (j = 0; j < filtergraphs[i]->nb_outputs; j++) {
-             av_freep(&filtergraphs[i]->outputs[j]->name);
-             av_freep(&filtergraphs[i]->outputs[j]);
+     /* this is executed just the first time do_video_stats is called */
+     if (!vstats_file) {
+         vstats_file = fopen(vstats_filename, "w");
+         if (!vstats_file) {
+             perror("fopen");
+             exit_program(1);
          }
-         av_freep(&filtergraphs[i]->outputs);
-         av_freep(&filtergraphs[i]);
      }
-     av_freep(&filtergraphs);
  
-     av_freep(&subtitle_out);
+     enc = ost->st->codec;
+     if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
+         frame_number = ost->frame_number;
+         fprintf(vstats_file, "frame= %5d q= %2.1f ", frame_number, enc->coded_frame->quality / (float)FF_QP2LAMBDA);
+         if (enc->flags&CODEC_FLAG_PSNR)
+             fprintf(vstats_file, "PSNR= %6.2f ", psnr(enc->coded_frame->error[0] / (enc->width * enc->height * 255.0 * 255.0)));
  
-     /* close files */
-     for (i = 0; i < nb_output_files; i++) {
-         AVFormatContext *s = output_files[i]->ctx;
-         if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
-             avio_close(s->pb);
-         avformat_free_context(s);
-         av_dict_free(&output_files[i]->opts);
-         av_freep(&output_files[i]);
-     }
-     for (i = 0; i < nb_output_streams; i++) {
-         AVBitStreamFilterContext *bsfc = output_streams[i]->bitstream_filters;
-         while (bsfc) {
-             AVBitStreamFilterContext *next = bsfc->next;
-             av_bitstream_filter_close(bsfc);
-             bsfc = next;
-         }
-         output_streams[i]->bitstream_filters = NULL;
+         fprintf(vstats_file,"f_size= %6d ", frame_size);
+         /* compute pts value */
+         ti1 = ost->sync_opts * av_q2d(enc->time_base);
+         if (ti1 < 0.01)
+             ti1 = 0.01;
  
-         av_freep(&output_streams[i]->forced_keyframes);
-         av_freep(&output_streams[i]->filtered_frame);
-         av_freep(&output_streams[i]->avfilter);
-         av_freep(&output_streams[i]);
-     }
-     for (i = 0; i < nb_input_files; i++) {
-         avformat_close_input(&input_files[i]->ctx);
-         av_freep(&input_files[i]);
-     }
-     for (i = 0; i < nb_input_streams; i++) {
-         av_freep(&input_streams[i]->decoded_frame);
-         av_dict_free(&input_streams[i]->opts);
-         free_buffer_pool(&input_streams[i]->buffer_pool);
-         avfilter_unref_bufferp(&input_streams[i]->sub2video.ref);
-         av_freep(&input_streams[i]->filters);
-         av_freep(&input_streams[i]);
+         bitrate     = (frame_size * 8) / av_q2d(enc->time_base) / 1000.0;
+         avg_bitrate = (double)(video_size * 8) / ti1 / 1000.0;
+         fprintf(vstats_file, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ",
+                (double)video_size / 1024, ti1, bitrate, avg_bitrate);
+         fprintf(vstats_file, "type= %c\n", av_get_picture_type_char(enc->coded_frame->pict_type));
      }
+ }
  
-     if (vstats_file)
-         fclose(vstats_file);
-     av_free(vstats_filename);
+ /* check for new output on any of the filtergraphs */
+ static int poll_filters(void)
+ {
+     AVFilterBufferRef *picref;
+     AVFrame *filtered_frame = NULL;
 -    int i, frame_size;
++    int i, ret, ret_all;
++    unsigned nb_success = 1, av_uninit(nb_eof);
++    int64_t frame_pts;
  
-     av_freep(&input_streams);
-     av_freep(&input_files);
-     av_freep(&output_streams);
-     av_freep(&output_files);
 -    for (i = 0; i < nb_output_streams; i++) {
 -        OutputStream *ost = output_streams[i];
 -        OutputFile    *of = output_files[ost->file_index];
 -        int ret = 0;
++    while (1) {
++        /* Reap all buffers present in the buffer sinks */
++        for (i = 0; i < nb_output_streams; i++) {
++            OutputStream *ost = output_streams[i];
++            OutputFile    *of = output_files[ost->file_index];
++            int ret = 0;
  
-     uninit_opts();
 -        if (!ost->filter)
 -            continue;
++            if (!ost->filter)
++                continue;
  
-     avfilter_uninit();
-     avformat_network_deinit();
 -        if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) {
 -            return AVERROR(ENOMEM);
 -        } else
 -            avcodec_get_frame_defaults(ost->filtered_frame);
 -        filtered_frame = ost->filtered_frame;
++            if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) {
++                return AVERROR(ENOMEM);
++            } else
++                avcodec_get_frame_defaults(ost->filtered_frame);
++            filtered_frame = ost->filtered_frame;
  
-     if (received_sigterm) {
-         av_log(NULL, AV_LOG_INFO, "Received signal %d: terminating.\n",
-                (int) received_sigterm);
-         exit (255);
-     }
 -        while (ret >= 0 && !ost->is_past_recording_time) {
 -            if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
 -                !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
 -                ret = av_buffersink_read_samples(ost->filter->filter, &picref,
 -                                                 ost->st->codec->frame_size);
 -            else
 -                ret = av_buffersink_read(ost->filter->filter, &picref);
++            while (1) {
++                ret = av_buffersink_get_buffer_ref(ost->filter->filter, &picref,
++                                                   AV_BUFFERSINK_FLAG_NO_REQUEST);
++                if (ret < 0) {
++                    if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
++                        char buf[256];
++                        av_strerror(ret, buf, sizeof(buf));
++                        av_log(NULL, AV_LOG_WARNING,
++                               "Error in av_buffersink_get_buffer_ref(): %s\n", buf);
++                    }
++                    break;
++                }
++                frame_pts = AV_NOPTS_VALUE;
++                if (picref->pts != AV_NOPTS_VALUE) {
++                    filtered_frame->pts = frame_pts = av_rescale_q(picref->pts,
++                                                    ost->filter->filter->inputs[0]->time_base,
++                                                    ost->st->codec->time_base) -
++                                        av_rescale_q(of->start_time,
++                                                    AV_TIME_BASE_Q,
++                                                    ost->st->codec->time_base);
 +
-     exit(ret);
- }
++                    if (of->start_time && filtered_frame->pts < 0) {
++                        avfilter_unref_buffer(picref);
++                        continue;
++                    }
++                }
++                //if (ost->source_index >= 0)
++                //    *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold
  
- static void assert_avoptions(AVDictionary *m)
- {
-     AVDictionaryEntry *t;
-     if ((t = av_dict_get(m, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
-         av_log(NULL, AV_LOG_FATAL, "Option %s not found.\n", t->key);
-         exit_program(1);
-     }
- }
 -            if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN))
 -                break;
 -            else if (ret < 0)
 -                return ret;
  
- static void assert_codec_experimental(AVCodecContext *c, int encoder)
- {
-     const char *codec_string = encoder ? "encoder" : "decoder";
-     AVCodec *codec;
-     if (c->codec->capabilities & CODEC_CAP_EXPERIMENTAL &&
-         c->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
-         av_log(NULL, AV_LOG_FATAL, "%s '%s' is experimental and might produce bad "
-                 "results.\nAdd '-strict experimental' if you want to use it.\n",
-                 codec_string, c->codec->name);
-         codec = encoder ? avcodec_find_encoder(c->codec->id) : avcodec_find_decoder(c->codec->id);
-         if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL))
-             av_log(NULL, AV_LOG_FATAL, "Or use the non experimental %s '%s'.\n",
-                    codec_string, codec->name);
-         exit_program(1);
-     }
- }
 -            avfilter_copy_buf_props(filtered_frame, picref);
 -            if (picref->pts != AV_NOPTS_VALUE) {
 -                filtered_frame->pts = av_rescale_q(picref->pts,
 -                                                   ost->filter->filter->inputs[0]->time_base,
 -                                                   ost->st->codec->time_base) -
 -                                      av_rescale_q(of->start_time,
 -                                                   AV_TIME_BASE_Q,
 -                                                   ost->st->codec->time_base);
 -
 -                if (of->start_time && filtered_frame->pts < 0) {
 -                    avfilter_unref_buffer(picref);
 -                    continue;
++                switch (ost->filter->filter->inputs[0]->type) {
++                case AVMEDIA_TYPE_VIDEO:
++                    avfilter_copy_buf_props(filtered_frame, picref);
++                    filtered_frame->pts = frame_pts;
++                    if (!ost->frame_aspect_ratio)
++                        ost->st->codec->sample_aspect_ratio = picref->video->sample_aspect_ratio;
 +
- static void choose_sample_fmt(AVStream *st, AVCodec *codec)
- {
-     if (codec && codec->sample_fmts) {
-         const enum AVSampleFormat *p = codec->sample_fmts;
-         for (; *p != -1; p++) {
-             if (*p == st->codec->sample_fmt)
-                 break;
++                    do_video_out(of->ctx, ost, filtered_frame,
++                                 same_quant ? ost->last_quality :
++                                              ost->st->codec->global_quality);
++                    break;
++                case AVMEDIA_TYPE_AUDIO:
++                    avfilter_copy_buf_props(filtered_frame, picref);
++                    filtered_frame->pts = frame_pts;
++                    do_audio_out(of->ctx, ost, filtered_frame);
++                    break;
++                default:
++                    // TODO support subtitle filters
++                    av_assert0(0);
+                 }
 -            }
 -            switch (ost->filter->filter->inputs[0]->type) {
 -            case AVMEDIA_TYPE_VIDEO:
 -                if (!ost->frame_aspect_ratio)
 -                    ost->st->codec->sample_aspect_ratio = picref->video->pixel_aspect;
 -
 -                do_video_out(of->ctx, ost, filtered_frame, &frame_size,
 -                             same_quant ? ost->last_quality :
 -                                          ost->st->codec->global_quality);
 -                if (vstats_filename && frame_size)
 -                    do_video_stats(of->ctx, ost, frame_size);
 -                break;
 -            case AVMEDIA_TYPE_AUDIO:
 -                do_audio_out(of->ctx, ost, filtered_frame);
 -                break;
 -            default:
 -                // TODO support subtitle filters
 -                av_assert0(0);
++                avfilter_unref_buffer(picref);
++            }
 +        }
-         if (*p == -1) {
-             if((codec->capabilities & CODEC_CAP_LOSSLESS) && av_get_sample_fmt_name(st->codec->sample_fmt) > av_get_sample_fmt_name(codec->sample_fmts[0]))
-                 av_log(NULL, AV_LOG_ERROR, "Conversion will not be lossless.\n");
-             if(av_get_sample_fmt_name(st->codec->sample_fmt))
-             av_log(NULL, AV_LOG_WARNING,
-                    "Incompatible sample format '%s' for codec '%s', auto-selecting format '%s'\n",
-                    av_get_sample_fmt_name(st->codec->sample_fmt),
-                    codec->name,
-                    av_get_sample_fmt_name(codec->sample_fmts[0]));
-             st->codec->sample_fmt = codec->sample_fmts[0];
++        if (!nb_success) /* from last round */
++            break;
++        /* Request frames through all the graphs */
++        ret_all = nb_success = nb_eof = 0;
++        for (i = 0; i < nb_filtergraphs; i++) {
++            ret = avfilter_graph_request_oldest(filtergraphs[i]->graph);
++            if (!ret) {
++                nb_success++;
++            } else if (ret == AVERROR_EOF) {
++                nb_eof++;
++            } else if (ret != AVERROR(EAGAIN)) {
++                char buf[256];
++                av_strerror(ret, buf, sizeof(buf));
++                av_log(NULL, AV_LOG_WARNING,
++                       "Error in request_frame(): %s\n", buf);
++                ret_all = ret;
+             }
 -
 -            avfilter_unref_buffer(picref);
          }
++        /* Try again if anything succeeded */
      }
 -    return 0;
++    return nb_eof == nb_filtergraphs ? AVERROR_EOF : ret_all;
  }
  
- static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
 -static void print_report(int is_last_report, int64_t timer_start)
++static void print_report(int is_last_report, int64_t timer_start, int64_t cur_time)
  {
-     AVBitStreamFilterContext *bsfc = ost->bitstream_filters;
-     AVCodecContext          *avctx = ost->st->codec;
-     int ret;
-     if ((avctx->codec_type == AVMEDIA_TYPE_VIDEO && video_sync_method == VSYNC_DROP) ||
-         (avctx->codec_type == AVMEDIA_TYPE_AUDIO && audio_sync_method < 0))
-         pkt->pts = pkt->dts = AV_NOPTS_VALUE;
-     if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && pkt->dts != AV_NOPTS_VALUE) {
-         int64_t max = ost->st->cur_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT);
-         if (ost->st->cur_dts && ost->st->cur_dts != AV_NOPTS_VALUE &&  max > pkt->dts) {
-             av_log(s, max - pkt->dts > 2 ? AV_LOG_WARNING : AV_LOG_DEBUG, "Audio timestamp %"PRId64" < %"PRId64" invalid, cliping\n", pkt->dts, max);
-             pkt->pts = pkt->dts = max;
-         }
-     }
-     /*
-      * Audio encoders may split the packets --  #frames in != #packets out.
-      * But there is no reordering, so we can limit the number of output packets
-      * by simply dropping them here.
-      * Counting encoded video frames needs to be done separately because of
-      * reordering, see do_video_out()
-      */
-     if (!(avctx->codec_type == AVMEDIA_TYPE_VIDEO && avctx->codec)) {
-         if (ost->frame_number >= ost->max_frames) {
-             av_free_packet(pkt);
-             return;
-         }
-         ost->frame_number++;
-     }
-     while (bsfc) {
-         AVPacket new_pkt = *pkt;
-         int a = av_bitstream_filter_filter(bsfc, avctx, NULL,
-                                            &new_pkt.data, &new_pkt.size,
-                                            pkt->data, pkt->size,
-                                            pkt->flags & AV_PKT_FLAG_KEY);
-         if (a > 0) {
-             av_free_packet(pkt);
-             new_pkt.destruct = av_destruct_packet;
-         } else if (a < 0) {
-             av_log(NULL, AV_LOG_ERROR, "Failed to open bitstream filter %s for stream %d with codec %s",
-                    bsfc->filter->name, pkt->stream_index,
-                    avctx->codec ? avctx->codec->name : "copy");
-             print_error("", a);
-             if (exit_on_error)
-                 exit_program(1);
-         }
-         *pkt = new_pkt;
-         bsfc = bsfc->next;
-     }
-     pkt->stream_index = ost->index;
-     ret = av_interleaved_write_frame(s, pkt);
-     if (ret < 0) {
-         print_error("av_interleaved_write_frame()", ret);
-         exit_program(1);
-     }
- }
- static int check_recording_time(OutputStream *ost)
- {
-     OutputFile *of = output_files[ost->file_index];
-     if (of->recording_time != INT64_MAX &&
-         av_compare_ts(ost->sync_opts - ost->first_pts, ost->st->codec->time_base, of->recording_time,
-                       AV_TIME_BASE_Q) >= 0) {
-         ost->is_past_recording_time = 1;
-         return 0;
-     }
-     return 1;
- }
- static void do_audio_out(AVFormatContext *s, OutputStream *ost,
-                          AVFrame *frame)
- {
-     AVCodecContext *enc = ost->st->codec;
-     AVPacket pkt;
-     int got_packet = 0;
-     av_init_packet(&pkt);
-     pkt.data = NULL;
-     pkt.size = 0;
+     char buf[1024];
++    AVBPrint buf_script;
+     OutputStream *ost;
+     AVFormatContext *oc;
+     int64_t total_size;
+     AVCodecContext *enc;
+     int frame_number, vid, i;
 -    double bitrate, ti1, pts;
++    double bitrate;
++    int64_t pts = INT64_MAX;
+     static int64_t last_time = -1;
+     static int qp_histogram[52];
++    int hours, mins, secs, us;
  
-     if (!check_recording_time(ost))
 -    if (!print_stats && !is_last_report)
++    if (!print_stats && !is_last_report && !progress_avio)
          return;
  
-     if (frame->pts == AV_NOPTS_VALUE || audio_sync_method < 0)
-         frame->pts = ost->sync_opts;
-     ost->sync_opts = frame->pts + frame->nb_samples;
-     av_assert0(pkt.size || !pkt.data);
-     update_benchmark(NULL);
-     if (avcodec_encode_audio2(enc, &pkt, frame, &got_packet) < 0) {
-         av_log(NULL, AV_LOG_FATAL, "Audio encoding failed (avcodec_encode_audio2)\n");
-         exit_program(1);
-     }
-     update_benchmark("encode_audio %d.%d", ost->file_index, ost->index);
-     if (got_packet) {
-         if (pkt.pts != AV_NOPTS_VALUE)
-             pkt.pts      = av_rescale_q(pkt.pts,      enc->time_base, ost->st->time_base);
-         if (pkt.dts != AV_NOPTS_VALUE)
-             pkt.dts      = av_rescale_q(pkt.dts,      enc->time_base, ost->st->time_base);
-         if (pkt.duration > 0)
-             pkt.duration = av_rescale_q(pkt.duration, enc->time_base, ost->st->time_base);
-         if (debug_ts) {
-             av_log(NULL, AV_LOG_INFO, "encoder -> type:audio "
-                    "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s\n",
-                    av_ts2str(pkt.pts), av_ts2timestr(pkt.pts, &ost->st->time_base),
-                    av_ts2str(pkt.dts), av_ts2timestr(pkt.dts, &ost->st->time_base));
-         }
-         write_frame(s, &pkt, ost);
-         audio_size += pkt.size;
-         av_free_packet(&pkt);
-     }
- }
- static void pre_process_video_frame(InputStream *ist, AVPicture *picture, void **bufp)
- {
-     AVCodecContext *dec;
-     AVPicture *picture2;
-     AVPicture picture_tmp;
-     uint8_t *buf = 0;
-     dec = ist->st->codec;
-     /* deinterlace : must be done before any resize */
-     if (do_deinterlace) {
-         int size;
-         /* create temporary picture */
-         size = avpicture_get_size(dec->pix_fmt, dec->width, dec->height);
-         buf  = av_malloc(size);
-         if (!buf)
+     if (!is_last_report) {
 -        int64_t cur_time;
 -        /* display the report every 0.5 seconds */
 -        cur_time = av_gettime();
+         if (last_time == -1) {
+             last_time = cur_time;
              return;
-         picture2 = &picture_tmp;
-         avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height);
-         if (avpicture_deinterlace(picture2, picture,
-                                  dec->pix_fmt, dec->width, dec->height) < 0) {
-             /* if error, do not deinterlace */
-             av_log(NULL, AV_LOG_WARNING, "Deinterlacing failed\n");
-             av_free(buf);
-             buf = NULL;
-             picture2 = picture;
          }
-     } else {
-         picture2 = picture;
+         if ((cur_time - last_time) < 500000)
+             return;
+         last_time = cur_time;
      }
  
-     if (picture != picture2)
-         *picture = *picture2;
-     *bufp = buf;
- }
- static void do_subtitle_out(AVFormatContext *s,
-                             OutputStream *ost,
-                             InputStream *ist,
-                             AVSubtitle *sub,
-                             int64_t pts)
- {
-     int subtitle_out_max_size = 1024 * 1024;
-     int subtitle_out_size, nb, i;
-     AVCodecContext *enc;
-     AVPacket pkt;
-     if (pts == AV_NOPTS_VALUE) {
-         av_log(NULL, AV_LOG_ERROR, "Subtitle packets must have a pts\n");
-         if (exit_on_error)
-             exit_program(1);
-         return;
-     }
  
-     enc = ost->st->codec;
+     oc = output_files[0]->ctx;
  
-     if (!subtitle_out) {
-         subtitle_out = av_malloc(subtitle_out_max_size);
+     total_size = avio_size(oc->pb);
 -    if (total_size < 0) // FIXME improve avio_size() so it works with non seekable output too
++    if (total_size < 0) { // FIXME improve avio_size() so it works with non seekable output too
+         total_size = avio_tell(oc->pb);
++        if (total_size < 0)
++            total_size = 0;
 +    }
  
-     /* Note: DVB subtitle need one packet to draw them and one other
-        packet to clear them */
-     /* XXX: signal it in the codec context ? */
-     if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE)
-         nb = 2;
-     else
-         nb = 1;
-     /* shift timestamp to honor -ss and make check_recording_time() work with -t */
-     pts = av_rescale_q(pts, ist->st->time_base, AV_TIME_BASE_Q)
-         - output_files[ost->file_index]->start_time;
-     for (i = 0; i < nb; i++) {
-         ost->sync_opts = av_rescale_q(pts, AV_TIME_BASE_Q, enc->time_base);
-         if (!check_recording_time(ost))
-             return;
-         sub->pts = pts;
-         // start_display_time is required to be 0
-         sub->pts               += av_rescale_q(sub->start_display_time, (AVRational){ 1, 1000 }, AV_TIME_BASE_Q);
-         sub->end_display_time  -= sub->start_display_time;
-         sub->start_display_time = 0;
-         subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out,
-                                                     subtitle_out_max_size, sub);
-         if (subtitle_out_size < 0) {
-             av_log(NULL, AV_LOG_FATAL, "Subtitle encoding failed\n");
-             exit_program(1);
-         }
-         av_init_packet(&pkt);
-         pkt.data = subtitle_out;
-         pkt.size = subtitle_out_size;
-         pkt.pts  = av_rescale_q(sub->pts, AV_TIME_BASE_Q, ost->st->time_base);
-         pkt.duration = av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, ost->st->time_base);
-         if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {
-             /* XXX: the pts correction is handled here. Maybe handling
-                it in the codec would be better */
-             if (i == 0)
-                 pkt.pts += 90 * sub->start_display_time;
-             else
-                 pkt.pts += 90 * sub->end_display_time;
+     buf[0] = '\0';
 -    ti1 = 1e10;
+     vid = 0;
++    av_bprint_init(&buf_script, 0, 1);
+     for (i = 0; i < nb_output_streams; i++) {
+         float q = -1;
+         ost = output_streams[i];
+         enc = ost->st->codec;
+         if (!ost->stream_copy && enc->coded_frame)
+             q = enc->coded_frame->quality / (float)FF_QP2LAMBDA;
+         if (vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) {
+             snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "q=%2.1f ", q);
++            av_bprintf(&buf_script, "stream_%d_%d_q=%.1f\n",
++                       ost->file_index, ost->index, q);
          }
-         write_frame(s, &pkt, ost);
-         subtitle_size += pkt.size;
-     }
- }
+         if (!vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) {
 -            float t = (av_gettime() - timer_start) / 1000000.0;
++            float fps, t = (cur_time-timer_start) / 1000000.0;
  
- static void do_video_out(AVFormatContext *s,
-                          OutputStream *ost,
-                          AVFrame *in_picture,
-                          float quality)
- {
-     int ret, format_video_sync;
-     AVPacket pkt;
-     AVCodecContext *enc = ost->st->codec;
-     int nb_frames, i;
-     double sync_ipts, delta;
-     double duration = 0;
-     int frame_size = 0;
-     InputStream *ist = NULL;
-     if (ost->source_index >= 0)
-         ist = input_streams[ost->source_index];
-     if(ist && ist->st->start_time != AV_NOPTS_VALUE && ist->st->first_dts != AV_NOPTS_VALUE && ost->frame_rate.num)
-         duration = 1/(av_q2d(ost->frame_rate) * av_q2d(enc->time_base));
-     sync_ipts = in_picture->pts;
-     delta = sync_ipts - ost->sync_opts + duration;
-     /* by default, we output a single frame */
-     nb_frames = 1;
-     format_video_sync = video_sync_method;
-     if (format_video_sync == VSYNC_AUTO)
-         format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? ((s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH : VSYNC_VFR) : 1;
-     switch (format_video_sync) {
-     case VSYNC_CFR:
-         // FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
-         if (delta < -1.1)
-             nb_frames = 0;
-         else if (delta > 1.1)
-             nb_frames = lrintf(delta);
-         break;
-     case VSYNC_VFR:
-         if (delta <= -0.6)
-             nb_frames = 0;
-         else if (delta > 0.6)
-             ost->sync_opts = lrint(sync_ipts);
-         break;
-     case VSYNC_DROP:
-     case VSYNC_PASSTHROUGH:
-         ost->sync_opts = lrint(sync_ipts);
-         break;
-     default:
-         av_assert0(0);
-     }
-     nb_frames = FFMIN(nb_frames, ost->max_frames - ost->frame_number);
-     if (nb_frames == 0) {
-         nb_frames_drop++;
-         av_log(NULL, AV_LOG_VERBOSE, "*** drop!\n");
-         return;
-     } else if (nb_frames > 1) {
-         if (nb_frames > dts_error_threshold * 30) {
-             av_log(NULL, AV_LOG_ERROR, "%d frame duplication too large, skiping\n", nb_frames - 1);
-             nb_frames_drop++;
-             return;
-         }
-         nb_frames_dup += nb_frames - 1;
-         av_log(NULL, AV_LOG_VERBOSE, "*** %d dup!\n", nb_frames - 1);
-     }
-   /* duplicates frame if needed */
-   for (i = 0; i < nb_frames; i++) {
-     av_init_packet(&pkt);
-     pkt.data = NULL;
-     pkt.size = 0;
-     in_picture->pts = ost->sync_opts;
-     if (!check_recording_time(ost))
-         return;
-     if (s->oformat->flags & AVFMT_RAWPICTURE &&
-         enc->codec->id == AV_CODEC_ID_RAWVIDEO) {
-         /* raw pictures are written as AVPicture structure to
-            avoid any copies. We support temporarily the older
-            method. */
-         enc->coded_frame->interlaced_frame = in_picture->interlaced_frame;
-         enc->coded_frame->top_field_first  = in_picture->top_field_first;
-         pkt.data   = (uint8_t *)in_picture;
-         pkt.size   =  sizeof(AVPicture);
-         pkt.pts    = av_rescale_q(in_picture->pts, enc->time_base, ost->st->time_base);
-         pkt.flags |= AV_PKT_FLAG_KEY;
-         write_frame(s, &pkt, ost);
-         video_size += pkt.size;
-     } else {
-         int got_packet;
-         AVFrame big_picture;
-         big_picture = *in_picture;
-         /* better than nothing: use input picture interlaced
-            settings */
-         big_picture.interlaced_frame = in_picture->interlaced_frame;
-         if (ost->st->codec->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)) {
-             if (ost->top_field_first == -1)
-                 big_picture.top_field_first = in_picture->top_field_first;
-             else
-                 big_picture.top_field_first = !!ost->top_field_first;
-         }
-         /* handles same_quant here. This is not correct because it may
-            not be a global option */
-         big_picture.quality = quality;
-         if (!enc->me_threshold)
-             big_picture.pict_type = 0;
-         if (ost->forced_kf_index < ost->forced_kf_count &&
-             big_picture.pts >= ost->forced_kf_pts[ost->forced_kf_index]) {
-             big_picture.pict_type = AV_PICTURE_TYPE_I;
-             ost->forced_kf_index++;
-         }
-         update_benchmark(NULL);
-         ret = avcodec_encode_video2(enc, &pkt, &big_picture, &got_packet);
-         update_benchmark("encode_video %d.%d", ost->file_index, ost->index);
-         if (ret < 0) {
-             av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n");
-             exit_program(1);
-         }
-         if (got_packet) {
-             if (pkt.pts == AV_NOPTS_VALUE && !(enc->codec->capabilities & CODEC_CAP_DELAY))
-                 pkt.pts = ost->sync_opts;
-             if (pkt.pts != AV_NOPTS_VALUE)
-                 pkt.pts = av_rescale_q(pkt.pts, enc->time_base, ost->st->time_base);
-             if (pkt.dts != AV_NOPTS_VALUE)
-                 pkt.dts = av_rescale_q(pkt.dts, enc->time_base, ost->st->time_base);
-             if (debug_ts) {
-                 av_log(NULL, AV_LOG_INFO, "encoder -> type:video "
-                     "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s\n",
-                     av_ts2str(pkt.pts), av_ts2timestr(pkt.pts, &ost->st->time_base),
-                     av_ts2str(pkt.dts), av_ts2timestr(pkt.dts, &ost->st->time_base));
-             }
-             write_frame(s, &pkt, ost);
-             frame_size = pkt.size;
-             video_size += pkt.size;
-             av_free_packet(&pkt);
-             /* if two pass, output log */
-             if (ost->logfile && enc->stats_out) {
-                 fprintf(ost->logfile, "%s", enc->stats_out);
-             }
-         }
-     }
-     ost->sync_opts++;
-     /*
-      * For video, number of frames in == number of packets out.
-      * But there may be reordering, so we can't throw away frames on encoder
-      * flush, we need to limit them here, before they go into encoder.
-      */
-     ost->frame_number++;
-   }
-     if (vstats_filename && frame_size)
-         do_video_stats(output_files[ost->file_index]->ctx, ost, frame_size);
- }
- static double psnr(double d)
- {
-     return -10.0 * log(d) / log(10.0);
- }
- static void do_video_stats(AVFormatContext *os, OutputStream *ost,
-                            int frame_size)
- {
-     AVCodecContext *enc;
-     int frame_number;
-     double ti1, bitrate, avg_bitrate;
-     /* this is executed just the first time do_video_stats is called */
-     if (!vstats_file) {
-         vstats_file = fopen(vstats_filename, "w");
-         if (!vstats_file) {
-             perror("fopen");
-             exit_program(1);
-         }
-     }
-     enc = ost->st->codec;
-     if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
-         frame_number = ost->frame_number;
-         fprintf(vstats_file, "frame= %5d q= %2.1f ", frame_number, enc->coded_frame->quality / (float)FF_QP2LAMBDA);
-         if (enc->flags&CODEC_FLAG_PSNR)
-             fprintf(vstats_file, "PSNR= %6.2f ", psnr(enc->coded_frame->error[0] / (enc->width * enc->height * 255.0 * 255.0)));
-         fprintf(vstats_file,"f_size= %6d ", frame_size);
-         /* compute pts value */
-         ti1 = ost->sync_opts * av_q2d(enc->time_base);
-         if (ti1 < 0.01)
-             ti1 = 0.01;
-         bitrate     = (frame_size * 8) / av_q2d(enc->time_base) / 1000.0;
-         avg_bitrate = (double)(video_size * 8) / ti1 / 1000.0;
-         fprintf(vstats_file, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ",
-                (double)video_size / 1024, ti1, bitrate, avg_bitrate);
-         fprintf(vstats_file, "type= %c\n", av_get_picture_type_char(enc->coded_frame->pict_type));
-     }
- }
- /* check for new output on any of the filtergraphs */
- static int poll_filters(void)
- {
-     AVFilterBufferRef *picref;
-     AVFrame *filtered_frame = NULL;
-     int i, ret, ret_all;
-     unsigned nb_success = 1, av_uninit(nb_eof);
-     int64_t frame_pts;
-     while (1) {
-         /* Reap all buffers present in the buffer sinks */
-         for (i = 0; i < nb_output_streams; i++) {
-             OutputStream *ost = output_streams[i];
-             OutputFile    *of = output_files[ost->file_index];
-             int ret = 0;
-             if (!ost->filter)
-                 continue;
-             if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) {
-                 return AVERROR(ENOMEM);
-             } else
-                 avcodec_get_frame_defaults(ost->filtered_frame);
-             filtered_frame = ost->filtered_frame;
-             while (1) {
-                 ret = av_buffersink_get_buffer_ref(ost->filter->filter, &picref,
-                                                    AV_BUFFERSINK_FLAG_NO_REQUEST);
-                 if (ret < 0) {
-                     if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
-                         char buf[256];
-                         av_strerror(ret, buf, sizeof(buf));
-                         av_log(NULL, AV_LOG_WARNING,
-                                "Error in av_buffersink_get_buffer_ref(): %s\n", buf);
-                     }
-                     break;
-                 }
-                 frame_pts = AV_NOPTS_VALUE;
-                 if (picref->pts != AV_NOPTS_VALUE) {
-                     filtered_frame->pts = frame_pts = av_rescale_q(picref->pts,
-                                                     ost->filter->filter->inputs[0]->time_base,
-                                                     ost->st->codec->time_base) -
-                                         av_rescale_q(of->start_time,
-                                                     AV_TIME_BASE_Q,
-                                                     ost->st->codec->time_base);
-                     if (of->start_time && filtered_frame->pts < 0) {
-                         avfilter_unref_buffer(picref);
-                         continue;
-                     }
-                 }
-                 //if (ost->source_index >= 0)
-                 //    *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold
-                 switch (ost->filter->filter->inputs[0]->type) {
-                 case AVMEDIA_TYPE_VIDEO:
-                     avfilter_copy_buf_props(filtered_frame, picref);
-                     filtered_frame->pts = frame_pts;
-                     if (!ost->frame_aspect_ratio)
-                         ost->st->codec->sample_aspect_ratio = picref->video->sample_aspect_ratio;
-                     do_video_out(of->ctx, ost, filtered_frame,
-                                  same_quant ? ost->last_quality :
-                                               ost->st->codec->global_quality);
-                     break;
-                 case AVMEDIA_TYPE_AUDIO:
-                     avfilter_copy_buf_props(filtered_frame, picref);
-                     filtered_frame->pts = frame_pts;
-                     do_audio_out(of->ctx, ost, filtered_frame);
-                     break;
-                 default:
-                     // TODO support subtitle filters
-                     av_assert0(0);
-                 }
-                 avfilter_unref_buffer(picref);
-             }
-         }
-         if (!nb_success) /* from last round */
-             break;
-         /* Request frames through all the graphs */
-         ret_all = nb_success = nb_eof = 0;
-         for (i = 0; i < nb_filtergraphs; i++) {
-             ret = avfilter_graph_request_oldest(filtergraphs[i]->graph);
-             if (!ret) {
-                 nb_success++;
-             } else if (ret == AVERROR_EOF) {
-                 nb_eof++;
-             } else if (ret != AVERROR(EAGAIN)) {
-                 char buf[256];
-                 av_strerror(ret, buf, sizeof(buf));
-                 av_log(NULL, AV_LOG_WARNING,
-                        "Error in request_frame(): %s\n", buf);
-                 ret_all = ret;
-             }
-         }
-         /* Try again if anything succeeded */
-     }
-     return nb_eof == nb_filtergraphs ? AVERROR_EOF : ret_all;
- }
- static void print_report(int is_last_report, int64_t timer_start, int64_t cur_time)
- {
-     char buf[1024];
-     AVBPrint buf_script;
-     OutputStream *ost;
-     AVFormatContext *oc;
-     int64_t total_size;
-     AVCodecContext *enc;
-     int frame_number, vid, i;
-     double bitrate;
-     int64_t pts = INT64_MAX;
-     static int64_t last_time = -1;
-     static int qp_histogram[52];
-     int hours, mins, secs, us;
-     if (!print_stats && !is_last_report && !progress_avio)
-         return;
-     if (!is_last_report) {
-         if (last_time == -1) {
-             last_time = cur_time;
-             return;
-         }
-         if ((cur_time - last_time) < 500000)
-             return;
-         last_time = cur_time;
-     }
-     oc = output_files[0]->ctx;
-     total_size = avio_size(oc->pb);
-     if (total_size < 0) { // FIXME improve avio_size() so it works with non seekable output too
-         total_size = avio_tell(oc->pb);
-         if (total_size < 0)
-             total_size = 0;
-     }
-     buf[0] = '\0';
-     vid = 0;
-     av_bprint_init(&buf_script, 0, 1);
-     for (i = 0; i < nb_output_streams; i++) {
-         float q = -1;
-         ost = output_streams[i];
-         enc = ost->st->codec;
-         if (!ost->stream_copy && enc->coded_frame)
-             q = enc->coded_frame->quality / (float)FF_QP2LAMBDA;
-         if (vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) {
-             snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "q=%2.1f ", q);
-             av_bprintf(&buf_script, "stream_%d_%d_q=%.1f\n",
-                        ost->file_index, ost->index, q);
-         }
-         if (!vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) {
-             float fps, t = (cur_time-timer_start) / 1000000.0;
-             frame_number = ost->frame_number;
-             fps = t > 1 ? frame_number / t : 0;
-             snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "frame=%5d fps=%3.*f q=%3.1f ",
-                      frame_number, fps < 9.95, fps, q);
-             av_bprintf(&buf_script, "frame=%d\n", frame_number);
-             av_bprintf(&buf_script, "fps=%.1f\n", fps);
-             av_bprintf(&buf_script, "stream_%d_%d_q=%.1f\n",
-                        ost->file_index, ost->index, q);
-             if (is_last_report)
-                 snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "L");
-             if (qp_hist) {
-                 int j;
-                 int qp = lrintf(q);
-                 if (qp >= 0 && qp < FF_ARRAY_ELEMS(qp_histogram))
-                     qp_histogram[qp]++;
-                 for (j = 0; j < 32; j++)
-                     snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%X", (int)lrintf(log(qp_histogram[j] + 1) / log(2)));
-             }
-             if (enc->flags&CODEC_FLAG_PSNR) {
-                 int j;
-                 double error, error_sum = 0;
-                 double scale, scale_sum = 0;
-                 double p;
-                 char type[3] = { 'Y','U','V' };
-                 snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "PSNR=");
-                 for (j = 0; j < 3; j++) {
-                     if (is_last_report) {
-                         error = enc->error[j];
-                         scale = enc->width * enc->height * 255.0 * 255.0 * frame_number;
-                     } else {
-                         error = enc->coded_frame->error[j];
-                         scale = enc->width * enc->height * 255.0 * 255.0;
-                     }
-                     if (j)
-                         scale /= 4;
-                     error_sum += error;
-                     scale_sum += scale;
-                     p = psnr(error / scale);
-                     snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%c:%2.2f ", type[j], p);
-                     av_bprintf(&buf_script, "stream_%d_%d_psnr_%c=%2.2f\n",
-                                ost->file_index, ost->index, type[i] | 32, p);
-                 }
-                 p = psnr(error_sum / scale_sum);
-                 snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "*:%2.2f ", psnr(error_sum / scale_sum));
-                 av_bprintf(&buf_script, "stream_%d_%d_psnr_all=%2.2f\n",
-                            ost->file_index, ost->index, p);
-             }
-             vid = 1;
-         }
-         /* compute min output value */
-         pts = FFMIN(pts, av_rescale_q(ost->st->pts.val,
-                                       ost->st->time_base, AV_TIME_BASE_Q));
-     }
-     secs = pts / AV_TIME_BASE;
-     us = pts % AV_TIME_BASE;
-     mins = secs / 60;
-     secs %= 60;
-     hours = mins / 60;
-     mins %= 60;
-     bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0;
-     snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-              "size=%8.0fkB time=", total_size / 1024.0);
-     snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-              "%02d:%02d:%02d.%02d ", hours, mins, secs,
-              (100 * us) / AV_TIME_BASE);
-     snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-              "bitrate=%6.1fkbits/s", bitrate);
-     av_bprintf(&buf_script, "total_size=%"PRId64"\n", total_size);
-     av_bprintf(&buf_script, "out_time_ms=%"PRId64"\n", pts);
-     av_bprintf(&buf_script, "out_time=%02d:%02d:%02d.%06d\n",
-                hours, mins, secs, us);
-     if (nb_frames_dup || nb_frames_drop)
-         snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
-                 nb_frames_dup, nb_frames_drop);
-     av_bprintf(&buf_script, "dup_frames=%d\n", nb_frames_dup);
-     av_bprintf(&buf_script, "drop_frames=%d\n", nb_frames_drop);
-     if (print_stats || is_last_report) {
-     av_log(NULL, AV_LOG_INFO, "%s    \r", buf);
-     fflush(stderr);
-     }
-     if (progress_avio) {
-         av_bprintf(&buf_script, "progress=%s\n",
-                    is_last_report ? "end" : "continue");
-         avio_write(progress_avio, buf_script.str,
-                    FFMIN(buf_script.len, buf_script.size - 1));
-         avio_flush(progress_avio);
-         av_bprint_finalize(&buf_script, NULL);
-         if (is_last_report) {
-             avio_close(progress_avio);
-             progress_avio = NULL;
-         }
-     }
-     if (is_last_report) {
-         int64_t raw= audio_size + video_size + subtitle_size + extra_size;
-         av_log(NULL, AV_LOG_INFO, "\n");
-         av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB subtitle:%1.0f global headers:%1.0fkB muxing overhead %f%%\n",
-                video_size / 1024.0,
-                audio_size / 1024.0,
-                subtitle_size / 1024.0,
-                extra_size / 1024.0,
-                100.0 * (total_size - raw) / raw
-         );
-         if(video_size + audio_size + subtitle_size + extra_size == 0){
-             av_log(NULL, AV_LOG_WARNING, "Output file is empty, nothing was encoded (check -ss / -t / -frames parameters if used)\n");
-         }
-     }
- }
- static void flush_encoders(void)
- {
-     int i, ret;
-     for (i = 0; i < nb_output_streams; i++) {
-         OutputStream   *ost = output_streams[i];
-         AVCodecContext *enc = ost->st->codec;
-         AVFormatContext *os = output_files[ost->file_index]->ctx;
-         int stop_encoding = 0;
-         if (!ost->encoding_needed)
-             continue;
-         if (ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO && enc->frame_size <= 1)
-             continue;
-         if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE) && enc->codec->id == AV_CODEC_ID_RAWVIDEO)
-             continue;
-         for (;;) {
-             int (*encode)(AVCodecContext*, AVPacket*, const AVFrame*, int*) = NULL;
-             const char *desc;
-             int64_t *size;
-             switch (ost->st->codec->codec_type) {
-             case AVMEDIA_TYPE_AUDIO:
-                 encode = avcodec_encode_audio2;
-                 desc   = "Audio";
-                 size   = &audio_size;
-                 break;
-             case AVMEDIA_TYPE_VIDEO:
-                 encode = avcodec_encode_video2;
-                 desc   = "Video";
-                 size   = &video_size;
-                 break;
-             default:
-                 stop_encoding = 1;
-             }
-             if (encode) {
-                 AVPacket pkt;
-                 int got_packet;
-                 av_init_packet(&pkt);
-                 pkt.data = NULL;
-                 pkt.size = 0;
-                 update_benchmark(NULL);
-                 ret = encode(enc, &pkt, NULL, &got_packet);
-                 update_benchmark("flush %s %d.%d", desc, ost->file_index, ost->index);
-                 if (ret < 0) {
-                     av_log(NULL, AV_LOG_FATAL, "%s encoding failed\n", desc);
-                     exit_program(1);
-                 }
-                 *size += pkt.size;
-                 if (ost->logfile && enc->stats_out) {
-                     fprintf(ost->logfile, "%s", enc->stats_out);
-                 }
-                 if (!got_packet) {
-                     stop_encoding = 1;
-                     break;
-                 }
-                 if (pkt.pts != AV_NOPTS_VALUE)
-                     pkt.pts = av_rescale_q(pkt.pts, enc->time_base, ost->st->time_base);
-                 if (pkt.dts != AV_NOPTS_VALUE)
-                     pkt.dts = av_rescale_q(pkt.dts, enc->time_base, ost->st->time_base);
-                 write_frame(os, &pkt, ost);
-             }
-             if (stop_encoding)
-                 break;
-         }
-     }
- }
- /*
-  * Check whether a packet from ist should be written into ost at this time
-  */
- static int check_output_constraints(InputStream *ist, OutputStream *ost)
- {
-     OutputFile *of = output_files[ost->file_index];
-     int ist_index  = input_files[ist->file_index]->ist_index + ist->st->index;
-     if (ost->source_index != ist_index)
-         return 0;
-     if (of->start_time && ist->pts < of->start_time)
-         return 0;
-     return 1;
- }
- static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *pkt)
- {
-     OutputFile *of = output_files[ost->file_index];
-     int64_t ost_tb_start_time = av_rescale_q(of->start_time, AV_TIME_BASE_Q, ost->st->time_base);
-     AVPicture pict;
-     AVPacket opkt;
-     av_init_packet(&opkt);
-     if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) &&
-         !ost->copy_initial_nonkeyframes)
-         return;
-     if (of->recording_time != INT64_MAX &&
-         ist->pts >= of->recording_time + of->start_time) {
-         ost->is_past_recording_time = 1;
-         return;
-     }
-     /* force the input stream PTS */
-     if (ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
-         audio_size += pkt->size;
-     else if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-         video_size += pkt->size;
-         ost->sync_opts++;
-     } else if (ost->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
-         subtitle_size += pkt->size;
-     }
-     if (pkt->pts != AV_NOPTS_VALUE)
-         opkt.pts = av_rescale_q(pkt->pts, ist->st->time_base, ost->st->time_base) - ost_tb_start_time;
-     else
-         opkt.pts = AV_NOPTS_VALUE;
-     if (pkt->dts == AV_NOPTS_VALUE)
-         opkt.dts = av_rescale_q(ist->dts, AV_TIME_BASE_Q, ost->st->time_base);
-     else
-         opkt.dts = av_rescale_q(pkt->dts, ist->st->time_base, ost->st->time_base);
-     opkt.dts -= ost_tb_start_time;
-     opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->st->time_base);
-     opkt.flags    = pkt->flags;
-     // FIXME remove the following 2 lines they shall be replaced by the bitstream filters
-     if (  ost->st->codec->codec_id != AV_CODEC_ID_H264
-        && ost->st->codec->codec_id != AV_CODEC_ID_MPEG1VIDEO
-        && ost->st->codec->codec_id != AV_CODEC_ID_MPEG2VIDEO
-        && ost->st->codec->codec_id != AV_CODEC_ID_VC1
-        ) {
-         if (av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, pkt->data, pkt->size, pkt->flags & AV_PKT_FLAG_KEY))
-             opkt.destruct = av_destruct_packet;
-     } else {
-         opkt.data = pkt->data;
-         opkt.size = pkt->size;
-     }
-     if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
-         /* store AVPicture in AVPacket, as expected by the output format */
-         avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, ost->st->codec->width, ost->st->codec->height);
-         opkt.data = (uint8_t *)&pict;
-         opkt.size = sizeof(AVPicture);
-         opkt.flags |= AV_PKT_FLAG_KEY;
-     }
-     write_frame(of->ctx, &opkt, ost);
-     ost->st->codec->frame_number++;
-     av_free_packet(&opkt);
- }
- static void rate_emu_sleep(InputStream *ist)
- {
-     if (input_files[ist->file_index]->rate_emu) {
-         int64_t pts = av_rescale(ist->dts, 1000000, AV_TIME_BASE);
-         int64_t now = av_gettime() - ist->start;
-         if (pts > now)
-             av_usleep(pts - now);
-     }
- }
- static int guess_input_channel_layout(InputStream *ist)
- {
-     AVCodecContext *dec = ist->st->codec;
-     if (!dec->channel_layout) {
-         char layout_name[256];
-         dec->channel_layout = av_get_default_channel_layout(dec->channels);
-         if (!dec->channel_layout)
-             return 0;
-         av_get_channel_layout_string(layout_name, sizeof(layout_name),
-                                      dec->channels, dec->channel_layout);
-         av_log(NULL, AV_LOG_WARNING, "Guessed Channel Layout for  Input Stream "
-                "#%d.%d : %s\n", ist->file_index, ist->st->index, layout_name);
-     }
-     return 1;
- }
- static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
- {
-     AVFrame *decoded_frame;
-     AVCodecContext *avctx = ist->st->codec;
-     int i, ret, resample_changed;
-     AVRational decoded_frame_tb;
-     if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
-         return AVERROR(ENOMEM);
-     else
-         avcodec_get_frame_defaults(ist->decoded_frame);
-     decoded_frame = ist->decoded_frame;
-     update_benchmark(NULL);
-     ret = avcodec_decode_audio4(avctx, decoded_frame, got_output, pkt);
-     update_benchmark("decode_audio %d.%d", ist->file_index, ist->st->index);
-     if (ret < 0) {
-         return ret;
-     }
-     if (avctx->sample_rate <= 0) {
-         av_log(avctx, AV_LOG_ERROR, "Sample rate %d invalid\n", avctx->sample_rate);
-         return AVERROR_INVALIDDATA;
-     }
-     if (!*got_output) {
-         /* no audio frame */
-         if (!pkt->size)
-             for (i = 0; i < ist->nb_filters; i++)
-                 av_buffersrc_add_ref(ist->filters[i]->filter, NULL,
-                                      AV_BUFFERSRC_FLAG_NO_COPY);
-         return ret;
-     }
- #if 1
-     /* increment next_dts to use for the case where the input stream does not
-        have timestamps or there are multiple frames in the packet */
-     ist->next_pts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) /
-                      avctx->sample_rate;
-     ist->next_dts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) /
-                      avctx->sample_rate;
- #endif
-     rate_emu_sleep(ist);
-     resample_changed = ist->resample_sample_fmt     != decoded_frame->format         ||
-                        ist->resample_channels       != avctx->channels               ||
-                        ist->resample_channel_layout != decoded_frame->channel_layout ||
-                        ist->resample_sample_rate    != decoded_frame->sample_rate;
-     if (resample_changed) {
-         char layout1[64], layout2[64];
-         if (!guess_input_channel_layout(ist)) {
-             av_log(NULL, AV_LOG_FATAL, "Unable to find default channel "
-                    "layout for Input Stream #%d.%d\n", ist->file_index,
-                    ist->st->index);
-             exit_program(1);
-         }
-         decoded_frame->channel_layout = avctx->channel_layout;
-         av_get_channel_layout_string(layout1, sizeof(layout1), ist->resample_channels,
-                                      ist->resample_channel_layout);
-         av_get_channel_layout_string(layout2, sizeof(layout2), avctx->channels,
-                                      decoded_frame->channel_layout);
-         av_log(NULL, AV_LOG_INFO,
-                "Input stream #%d:%d frame changed from rate:%d fmt:%s ch:%d chl:%s to rate:%d fmt:%s ch:%d chl:%s\n",
-                ist->file_index, ist->st->index,
-                ist->resample_sample_rate,  av_get_sample_fmt_name(ist->resample_sample_fmt),
-                ist->resample_channels, layout1,
-                decoded_frame->sample_rate, av_get_sample_fmt_name(decoded_frame->format),
-                avctx->channels, layout2);
-         ist->resample_sample_fmt     = decoded_frame->format;
-         ist->resample_sample_rate    = decoded_frame->sample_rate;
-         ist->resample_channel_layout = decoded_frame->channel_layout;
-         ist->resample_channels       = avctx->channels;
-         for (i = 0; i < nb_filtergraphs; i++)
-             if (ist_in_filtergraph(filtergraphs[i], ist)) {
-                 FilterGraph *fg = filtergraphs[i];
-                 int j;
-                 if (configure_filtergraph(fg) < 0) {
-                     av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
-                     exit_program(1);
-                 }
-                 for (j = 0; j < fg->nb_outputs; j++) {
-                     OutputStream *ost = fg->outputs[j]->ost;
-                     if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
-                         !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
-                         av_buffersink_set_frame_size(ost->filter->filter,
-                                                      ost->st->codec->frame_size);
-                 }
-             }
-     }
-     /* if the decoder provides a pts, use it instead of the last packet pts.
-        the decoder could be delaying output by a packet or more. */
-     if (decoded_frame->pts != AV_NOPTS_VALUE) {
-         ist->dts = ist->next_dts = ist->pts = ist->next_pts = av_rescale_q(decoded_frame->pts, avctx->time_base, AV_TIME_BASE_Q);
-         decoded_frame_tb   = avctx->time_base;
-     } else if (decoded_frame->pkt_pts != AV_NOPTS_VALUE) {
-         decoded_frame->pts = decoded_frame->pkt_pts;
-         pkt->pts           = AV_NOPTS_VALUE;
-         decoded_frame_tb   = ist->st->time_base;
-     } else if (pkt->pts != AV_NOPTS_VALUE) {
-         decoded_frame->pts = pkt->pts;
-         pkt->pts           = AV_NOPTS_VALUE;
-         decoded_frame_tb   = ist->st->time_base;
-     }else {
-         decoded_frame->pts = ist->dts;
-         decoded_frame_tb   = AV_TIME_BASE_Q;
-     }
-     if (decoded_frame->pts != AV_NOPTS_VALUE)
-         decoded_frame->pts = av_rescale_q(decoded_frame->pts,
-                                           decoded_frame_tb,
-                                           (AVRational){1, ist->st->codec->sample_rate});
-     for (i = 0; i < ist->nb_filters; i++)
-         av_buffersrc_add_frame(ist->filters[i]->filter, decoded_frame, 0);
-     decoded_frame->pts = AV_NOPTS_VALUE;
-     return ret;
- }
- static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
- {
-     AVFrame *decoded_frame;
-     void *buffer_to_free = NULL;
-     int i, ret = 0, resample_changed;
-     int64_t best_effort_timestamp;
-     AVRational *frame_sample_aspect;
-     float quality;
-     if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
-         return AVERROR(ENOMEM);
-     else
-         avcodec_get_frame_defaults(ist->decoded_frame);
-     decoded_frame = ist->decoded_frame;
-     pkt->dts  = av_rescale_q(ist->dts, AV_TIME_BASE_Q, ist->st->time_base);
-     update_benchmark(NULL);
-     ret = avcodec_decode_video2(ist->st->codec,
-                                 decoded_frame, got_output, pkt);
-     update_benchmark("decode_video %d.%d", ist->file_index, ist->st->index);
-     if (ret < 0)
-         return ret;
-     quality = same_quant ? decoded_frame->quality : 0;
-     if (!*got_output) {
-         /* no picture yet */
-         if (!pkt->size)
-             for (i = 0; i < ist->nb_filters; i++)
-                 av_buffersrc_add_ref(ist->filters[i]->filter, NULL, AV_BUFFERSRC_FLAG_NO_COPY);
-         return ret;
-     }
-     if(ist->top_field_first>=0)
-         decoded_frame->top_field_first = ist->top_field_first;
-     best_effort_timestamp= av_frame_get_best_effort_timestamp(decoded_frame);
-     if(best_effort_timestamp != AV_NOPTS_VALUE)
-         ist->next_pts = ist->pts = av_rescale_q(decoded_frame->pts = best_effort_timestamp, ist->st->time_base, AV_TIME_BASE_Q);
-     if (debug_ts) {
-         av_log(NULL, AV_LOG_INFO, "decoder -> ist_index:%d type:video "
-                 "frame_pts:%s frame_pts_time:%s best_effort_ts:%"PRId64" best_effort_ts_time:%s keyframe:%d frame_type:%d \n",
-                 ist->st->index, av_ts2str(decoded_frame->pts),
-                 av_ts2timestr(decoded_frame->pts, &ist->st->time_base),
-                 best_effort_timestamp,
-                 av_ts2timestr(best_effort_timestamp, &ist->st->time_base),
-                 decoded_frame->key_frame, decoded_frame->pict_type);
-     }
-     pkt->size = 0;
-     pre_process_video_frame(ist, (AVPicture *)decoded_frame, &buffer_to_free);
-     rate_emu_sleep(ist);
-     if (ist->st->sample_aspect_ratio.num)
-         decoded_frame->sample_aspect_ratio = ist->st->sample_aspect_ratio;
-     resample_changed = ist->resample_width   != decoded_frame->width  ||
-                        ist->resample_height  != decoded_frame->height ||
-                        ist->resample_pix_fmt != decoded_frame->format;
-     if (resample_changed) {
-         av_log(NULL, AV_LOG_INFO,
-                "Input stream #%d:%d frame changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s\n",
-                ist->file_index, ist->st->index,
-                ist->resample_width,  ist->resample_height,  av_get_pix_fmt_name(ist->resample_pix_fmt),
-                decoded_frame->width, decoded_frame->height, av_get_pix_fmt_name(decoded_frame->format));
-         ist->resample_width   = decoded_frame->width;
-         ist->resample_height  = decoded_frame->height;
-         ist->resample_pix_fmt = decoded_frame->format;
-         for (i = 0; i < nb_filtergraphs; i++)
-             if (ist_in_filtergraph(filtergraphs[i], ist) &&
-                 configure_filtergraph(filtergraphs[i]) < 0) {
-                 av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
-                 exit_program(1);
-             }
-     }
-     frame_sample_aspect= av_opt_ptr(avcodec_get_frame_class(), decoded_frame, "sample_aspect_ratio");
-     for (i = 0; i < ist->nb_filters; i++) {
-         int changed =      ist->st->codec->width   != ist->filters[i]->filter->outputs[0]->w
-                         || ist->st->codec->height  != ist->filters[i]->filter->outputs[0]->h
-                         || ist->st->codec->pix_fmt != ist->filters[i]->filter->outputs[0]->format;
-         // XXX what an ugly hack
-         if (ist->filters[i]->graph->nb_outputs == 1)
-             ist->filters[i]->graph->outputs[0]->ost->last_quality = quality;
-         if (!frame_sample_aspect->num)
-             *frame_sample_aspect = ist->st->sample_aspect_ratio;
-         if (ist->dr1 && decoded_frame->type==FF_BUFFER_TYPE_USER && !changed) {
-             FrameBuffer      *buf = decoded_frame->opaque;
-             AVFilterBufferRef *fb = avfilter_get_video_buffer_ref_from_arrays(
-                                         decoded_frame->data, decoded_frame->linesize,
-                                         AV_PERM_READ | AV_PERM_PRESERVE,
-                                         ist->st->codec->width, ist->st->codec->height,
-                                         ist->st->codec->pix_fmt);
-             avfilter_copy_frame_props(fb, decoded_frame);
-             fb->buf->priv           = buf;
-             fb->buf->free           = filter_release_buffer;
-             av_assert0(buf->refcount>0);
-             buf->refcount++;
-             av_buffersrc_add_ref(ist->filters[i]->filter, fb,
-                                  AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT |
-                                  AV_BUFFERSRC_FLAG_NO_COPY);
-         } else
-         if(av_buffersrc_add_frame(ist->filters[i]->filter, decoded_frame, 0)<0) {
-             av_log(NULL, AV_LOG_FATAL, "Failed to inject frame into filter network\n");
-             exit_program(1);
-         }
-     }
-     av_free(buffer_to_free);
-     return ret;
- }
- static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
- {
-     AVSubtitle subtitle;
-     int i, ret = avcodec_decode_subtitle2(ist->st->codec,
-                                           &subtitle, got_output, pkt);
-     if (ret < 0 || !*got_output) {
-         if (!pkt->size)
-             sub2video_flush(ist);
-         return ret;
-     }
-     rate_emu_sleep(ist);
-     sub2video_update(ist, &subtitle, pkt->pts);
-     for (i = 0; i < nb_output_streams; i++) {
-         OutputStream *ost = output_streams[i];
-         if (!check_output_constraints(ist, ost) || !ost->encoding_needed)
-             continue;
-         do_subtitle_out(output_files[ost->file_index]->ctx, ost, ist, &subtitle, pkt->pts);
-     }
-     avsubtitle_free(&subtitle);
-     return ret;
- }
- /* pkt = NULL means EOF (needed to flush decoder buffers) */
- static int output_packet(InputStream *ist, const AVPacket *pkt)
- {
-     int ret = 0, i;
-     int got_output;
-     AVPacket avpkt;
-     if (!ist->saw_first_ts) {
-         ist->dts = ist->st->avg_frame_rate.num ? - ist->st->codec->has_b_frames * AV_TIME_BASE / av_q2d(ist->st->avg_frame_rate) : 0;
-         ist->pts = 0;
-         if (pkt != NULL && pkt->pts != AV_NOPTS_VALUE && !ist->decoding_needed) {
-             ist->dts += av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q);
-             ist->pts = ist->dts; //unused but better to set it to a value thats not totally wrong
-         }
-         ist->saw_first_ts = 1;
-     }
-     if (ist->next_dts == AV_NOPTS_VALUE)
-         ist->next_dts = ist->dts;
-     if (ist->next_pts == AV_NOPTS_VALUE)
-         ist->next_pts = ist->pts;
-     if (pkt == NULL) {
-         /* EOF handling */
-         av_init_packet(&avpkt);
-         avpkt.data = NULL;
-         avpkt.size = 0;
-         goto handle_eof;
-     } else {
-         avpkt = *pkt;
-     }
-     if (pkt->dts != AV_NOPTS_VALUE) {
-         ist->next_dts = ist->dts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
-         if (ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || !ist->decoding_needed)
-             ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
-     }
-     // while we have more to decode or while the decoder did output something on EOF
-     while (ist->decoding_needed && (avpkt.size > 0 || (!pkt && got_output))) {
-         int duration;
-     handle_eof:
-         ist->pts = ist->next_pts;
-         ist->dts = ist->next_dts;
-         if (avpkt.size && avpkt.size != pkt->size) {
-             av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING,
-                    "Multiple frames in a packet from stream %d\n", pkt->stream_index);
-             ist->showed_multi_packet_warning = 1;
-         }
-         switch (ist->st->codec->codec_type) {
-         case AVMEDIA_TYPE_AUDIO:
-             ret = decode_audio    (ist, &avpkt, &got_output);
-             break;
-         case AVMEDIA_TYPE_VIDEO:
-             ret = decode_video    (ist, &avpkt, &got_output);
-             if (avpkt.duration) {
-                 duration = av_rescale_q(avpkt.duration, ist->st->time_base, AV_TIME_BASE_Q);
-             } else if(ist->st->codec->time_base.num != 0 && ist->st->codec->time_base.den != 0) {
-                 int ticks= ist->st->parser ? ist->st->parser->repeat_pict+1 : ist->st->codec->ticks_per_frame;
-                 duration = ((int64_t)AV_TIME_BASE *
-                                 ist->st->codec->time_base.num * ticks) /
-                                 ist->st->codec->time_base.den;
-             } else
-                 duration = 0;
-             if(ist->dts != AV_NOPTS_VALUE && duration) {
-                 ist->next_dts += duration;
-             }else
-                 ist->next_dts = AV_NOPTS_VALUE;
-             if (got_output)
-                 ist->next_pts += duration; //FIXME the duration is not correct in some cases
-             break;
-         case AVMEDIA_TYPE_SUBTITLE:
-             ret = transcode_subtitles(ist, &avpkt, &got_output);
-             break;
-         default:
-             return -1;
-         }
-         if (ret < 0)
-             return ret;
-         avpkt.dts=
-         avpkt.pts= AV_NOPTS_VALUE;
-         // touch data and size only if not EOF
-         if (pkt) {
-             if(ist->st->codec->codec_type != AVMEDIA_TYPE_AUDIO)
-                 ret = avpkt.size;
-             avpkt.data += ret;
-             avpkt.size -= ret;
-         }
-         if (!got_output) {
-             continue;
-         }
-     }
-     /* handle stream copy */
-     if (!ist->decoding_needed) {
-         rate_emu_sleep(ist);
-         ist->dts = ist->next_dts;
-         switch (ist->st->codec->codec_type) {
-         case AVMEDIA_TYPE_AUDIO:
-             ist->next_dts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) /
-                              ist->st->codec->sample_rate;
-             break;
-         case AVMEDIA_TYPE_VIDEO:
-             if (pkt->duration) {
-                 ist->next_dts += av_rescale_q(pkt->duration, ist->st->time_base, AV_TIME_BASE_Q);
-             } else if(ist->st->codec->time_base.num != 0) {
-                 int ticks= ist->st->parser ? ist->st->parser->repeat_pict + 1 : ist->st->codec->ticks_per_frame;
-                 ist->next_dts += ((int64_t)AV_TIME_BASE *
-                                   ist->st->codec->time_base.num * ticks) /
-                                   ist->st->codec->time_base.den;
-             }
-             break;
-         }
-         ist->pts = ist->dts;
-         ist->next_pts = ist->next_dts;
-     }
-     for (i = 0; pkt && i < nb_output_streams; i++) {
-         OutputStream *ost = output_streams[i];
-         if (!check_output_constraints(ist, ost) || ost->encoding_needed)
-             continue;
-         do_streamcopy(ist, ost, pkt);
-     }
-     return 0;
- }
- static void print_sdp(void)
- {
-     char sdp[2048];
-     int i;
-     AVFormatContext **avc = av_malloc(sizeof(*avc) * nb_output_files);
-     if (!avc)
-         exit_program(1);
-     for (i = 0; i < nb_output_files; i++)
-         avc[i] = output_files[i]->ctx;
-     av_sdp_create(avc, nb_output_files, sdp, sizeof(sdp));
-     printf("SDP:\n%s\n", sdp);
-     fflush(stdout);
-     av_freep(&avc);
- }
- static int init_input_stream(int ist_index, char *error, int error_len)
- {
-     InputStream *ist = input_streams[ist_index];
-     if (ist->decoding_needed) {
-         AVCodec *codec = ist->dec;
-         if (!codec) {
-             snprintf(error, error_len, "Decoder (codec %s) not found for input stream #%d:%d",
-                     avcodec_get_name(ist->st->codec->codec_id), ist->file_index, ist->st->index);
-             return AVERROR(EINVAL);
-         }
-         ist->dr1 = (codec->capabilities & CODEC_CAP_DR1) && !do_deinterlace;
-         if (codec->type == AVMEDIA_TYPE_VIDEO && ist->dr1) {
-             ist->st->codec->get_buffer     = codec_get_buffer;
-             ist->st->codec->release_buffer = codec_release_buffer;
-             ist->st->codec->opaque         = &ist->buffer_pool;
-         }
-         if (!av_dict_get(ist->opts, "threads", NULL, 0))
-             av_dict_set(&ist->opts, "threads", "auto", 0);
-         if (avcodec_open2(ist->st->codec, codec, &ist->opts) < 0) {
-             snprintf(error, error_len, "Error while opening decoder for input stream #%d:%d",
-                     ist->file_index, ist->st->index);
-             return AVERROR(EINVAL);
-         }
-         assert_codec_experimental(ist->st->codec, 0);
-         assert_avoptions(ist->opts);
-     }
-     ist->next_pts = AV_NOPTS_VALUE;
-     ist->next_dts = AV_NOPTS_VALUE;
-     ist->is_start = 1;
-     return 0;
- }
- static InputStream *get_input_stream(OutputStream *ost)
- {
-     if (ost->source_index >= 0)
-         return input_streams[ost->source_index];
-     return NULL;
- }
- static void parse_forced_key_frames(char *kf, OutputStream *ost,
-                                     AVCodecContext *avctx)
- {
-     char *p;
-     int n = 1, i;
-     int64_t t;
-     for (p = kf; *p; p++)
-         if (*p == ',')
-             n++;
-     ost->forced_kf_count = n;
-     ost->forced_kf_pts   = av_malloc(sizeof(*ost->forced_kf_pts) * n);
-     if (!ost->forced_kf_pts) {
-         av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
-         exit_program(1);
-     }
-     p = kf;
-     for (i = 0; i < n; i++) {
-         char *next = strchr(p, ',');
-         if (next)
-             *next++ = 0;
-         t = parse_time_or_die("force_key_frames", p, 1);
-         ost->forced_kf_pts[i] = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base);
-         p = next;
-     }
- }
- static void report_new_stream(int input_index, AVPacket *pkt)
- {
-     InputFile *file = input_files[input_index];
-     AVStream *st = file->ctx->streams[pkt->stream_index];
-     if (pkt->stream_index < file->nb_streams_warn)
-         return;
-     av_log(file->ctx, AV_LOG_WARNING,
-            "New %s stream %d:%d at pos:%"PRId64" and DTS:%ss\n",
-            av_get_media_type_string(st->codec->codec_type),
-            input_index, pkt->stream_index,
-            pkt->pos, av_ts2timestr(pkt->dts, &st->time_base));
-     file->nb_streams_warn = pkt->stream_index + 1;
- }
- static int transcode_init(void)
- {
-     int ret = 0, i, j, k;
-     AVFormatContext *oc;
-     AVCodecContext *codec, *icodec = NULL;
-     OutputStream *ost;
-     InputStream *ist;
-     char error[1024];
-     int want_sdp = 1;
-     /* init framerate emulation */
-     for (i = 0; i < nb_input_files; i++) {
-         InputFile *ifile = input_files[i];
-         if (ifile->rate_emu)
-             for (j = 0; j < ifile->nb_streams; j++)
-                 input_streams[j + ifile->ist_index]->start = av_gettime();
-     }
-     /* output stream init */
-     for (i = 0; i < nb_output_files; i++) {
-         oc = output_files[i]->ctx;
-         if (!oc->nb_streams && !(oc->oformat->flags & AVFMT_NOSTREAMS)) {
-             av_dump_format(oc, i, oc->filename, 1);
-             av_log(NULL, AV_LOG_ERROR, "Output file #%d does not contain any stream\n", i);
-             return AVERROR(EINVAL);
-         }
-     }
-     /* init complex filtergraphs */
-     for (i = 0; i < nb_filtergraphs; i++)
-         if ((ret = avfilter_graph_config(filtergraphs[i]->graph, NULL)) < 0)
-             return ret;
-     /* for each output stream, we compute the right encoding parameters */
-     for (i = 0; i < nb_output_streams; i++) {
-         ost = output_streams[i];
-         oc  = output_files[ost->file_index]->ctx;
-         ist = get_input_stream(ost);
-         if (ost->attachment_filename)
-             continue;
-         codec  = ost->st->codec;
-         if (ist) {
-             icodec = ist->st->codec;
-             ost->st->disposition          = ist->st->disposition;
-             codec->bits_per_raw_sample    = icodec->bits_per_raw_sample;
-             codec->chroma_sample_location = icodec->chroma_sample_location;
-         }
-         if (ost->stream_copy) {
-             uint64_t extra_size;
-             av_assert0(ist && !ost->filter);
-             extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE;
-             if (extra_size > INT_MAX) {
-                 return AVERROR(EINVAL);
-             }
-             /* if stream_copy is selected, no need to decode or encode */
-             codec->codec_id   = icodec->codec_id;
-             codec->codec_type = icodec->codec_type;
-             if (!codec->codec_tag) {
-                 if (!oc->oformat->codec_tag ||
-                      av_codec_get_id (oc->oformat->codec_tag, icodec->codec_tag) == codec->codec_id ||
-                      av_codec_get_tag(oc->oformat->codec_tag, icodec->codec_id) <= 0)
-                     codec->codec_tag = icodec->codec_tag;
-             }
-             codec->bit_rate       = icodec->bit_rate;
-             codec->rc_max_rate    = icodec->rc_max_rate;
-             codec->rc_buffer_size = icodec->rc_buffer_size;
-             codec->field_order    = icodec->field_order;
-             codec->extradata      = av_mallocz(extra_size);
-             if (!codec->extradata) {
-                 return AVERROR(ENOMEM);
-             }
-             memcpy(codec->extradata, icodec->extradata, icodec->extradata_size);
-             codec->extradata_size= icodec->extradata_size;
-             codec->bits_per_coded_sample  = icodec->bits_per_coded_sample;
-             codec->time_base = ist->st->time_base;
-             /*
-              * Avi is a special case here because it supports variable fps but
-              * having the fps and timebase differe significantly adds quite some
-              * overhead
-              */
-             if(!strcmp(oc->oformat->name, "avi")) {
-                 if ( copy_tb<0 && av_q2d(ist->st->r_frame_rate) >= av_q2d(ist->st->avg_frame_rate)
-                                && 0.5/av_q2d(ist->st->r_frame_rate) > av_q2d(ist->st->time_base)
-                                && 0.5/av_q2d(ist->st->r_frame_rate) > av_q2d(icodec->time_base)
-                                && av_q2d(ist->st->time_base) < 1.0/500 && av_q2d(icodec->time_base) < 1.0/500
-                      || copy_tb==2){
-                     codec->time_base.num = ist->st->r_frame_rate.den;
-                     codec->time_base.den = 2*ist->st->r_frame_rate.num;
-                     codec->ticks_per_frame = 2;
-                 } else if (   copy_tb<0 && av_q2d(icodec->time_base)*icodec->ticks_per_frame > 2*av_q2d(ist->st->time_base)
-                                  && av_q2d(ist->st->time_base) < 1.0/500
-                     || copy_tb==0){
-                     codec->time_base = icodec->time_base;
-                     codec->time_base.num *= icodec->ticks_per_frame;
-                     codec->time_base.den *= 2;
-                     codec->ticks_per_frame = 2;
-                 }
-             } else if(!(oc->oformat->flags & AVFMT_VARIABLE_FPS)
-                       && strcmp(oc->oformat->name, "mov") && strcmp(oc->oformat->name, "mp4") && strcmp(oc->oformat->name, "3gp")
-                       && strcmp(oc->oformat->name, "3g2") && strcmp(oc->oformat->name, "psp") && strcmp(oc->oformat->name, "ipod")
-             ) {
-                 if(   copy_tb<0 && av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base)
-                                 && av_q2d(ist->st->time_base) < 1.0/500
-                    || copy_tb==0){
-                     codec->time_base = icodec->time_base;
-                     codec->time_base.num *= icodec->ticks_per_frame;
-                 }
-             }
-             if(ost->frame_rate.num)
-                 codec->time_base = av_inv_q(ost->frame_rate);
-             av_reduce(&codec->time_base.num, &codec->time_base.den,
-                         codec->time_base.num, codec->time_base.den, INT_MAX);
-             switch (codec->codec_type) {
-             case AVMEDIA_TYPE_AUDIO:
-                 if (audio_volume != 256) {
-                     av_log(NULL, AV_LOG_FATAL, "-acodec copy and -vol are incompatible (frames are not decoded)\n");
-                     exit_program(1);
-                 }
-                 codec->channel_layout     = icodec->channel_layout;
-                 codec->sample_rate        = icodec->sample_rate;
-                 codec->channels           = icodec->channels;
-                 codec->frame_size         = icodec->frame_size;
-                 codec->audio_service_type = icodec->audio_service_type;
-                 codec->block_align        = icodec->block_align;
-                 if((codec->block_align == 1 || codec->block_align == 1152) && codec->codec_id == AV_CODEC_ID_MP3)
-                     codec->block_align= 0;
-                 if(codec->codec_id == AV_CODEC_ID_AC3)
-                     codec->block_align= 0;
-                 break;
-             case AVMEDIA_TYPE_VIDEO:
-                 codec->pix_fmt            = icodec->pix_fmt;
-                 codec->width              = icodec->width;
-                 codec->height             = icodec->height;
-                 codec->has_b_frames       = icodec->has_b_frames;
-                 if (!codec->sample_aspect_ratio.num) {
-                     codec->sample_aspect_ratio   =
-                     ost->st->sample_aspect_ratio =
-                         ist->st->sample_aspect_ratio.num ? ist->st->sample_aspect_ratio :
-                         ist->st->codec->sample_aspect_ratio.num ?
-                         ist->st->codec->sample_aspect_ratio : (AVRational){0, 1};
-                 }
-                 ost->st->avg_frame_rate = ist->st->avg_frame_rate;
-                 break;
-             case AVMEDIA_TYPE_SUBTITLE:
-                 codec->width  = icodec->width;
-                 codec->height = icodec->height;
-                 break;
-             case AVMEDIA_TYPE_DATA:
-             case AVMEDIA_TYPE_ATTACHMENT:
-                 break;
-             default:
-                 abort();
-             }
-         } else {
-             if (!ost->enc)
-                 ost->enc = avcodec_find_encoder(codec->codec_id);
-             if (!ost->enc) {
-                 /* should only happen when a default codec is not present. */
-                 snprintf(error, sizeof(error), "Encoder (codec %s) not found for output stream #%d:%d",
-                          avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index);
-                 ret = AVERROR(EINVAL);
-                 goto dump_format;
-             }
-             if (ist)
-                 ist->decoding_needed = 1;
-             ost->encoding_needed = 1;
-             if (!ost->filter &&
-                 (codec->codec_type == AVMEDIA_TYPE_VIDEO ||
-                  codec->codec_type == AVMEDIA_TYPE_AUDIO)) {
-                     FilterGraph *fg;
-                     fg = init_simple_filtergraph(ist, ost);
-                     if (configure_filtergraph(fg)) {
-                         av_log(NULL, AV_LOG_FATAL, "Error opening filters!\n");
-                         exit(1);
-                     }
-             }
-             if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-                 if (ost->filter && !ost->frame_rate.num)
-                     ost->frame_rate = av_buffersink_get_frame_rate(ost->filter->filter);
-                 if (ist && !ost->frame_rate.num)
-                     ost->frame_rate = ist->st->r_frame_rate.num ? ist->st->r_frame_rate : (AVRational){25, 1};
- //                    ost->frame_rate = ist->st->avg_frame_rate.num ? ist->st->avg_frame_rate : (AVRational){25, 1};
-                 if (ost->enc && ost->enc->supported_framerates && !ost->force_fps) {
-                     int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
-                     ost->frame_rate = ost->enc->supported_framerates[idx];
-                 }
-             }
-             switch (codec->codec_type) {
-             case AVMEDIA_TYPE_AUDIO:
-                 codec->sample_fmt     = ost->filter->filter->inputs[0]->format;
-                 codec->sample_rate    = ost->filter->filter->inputs[0]->sample_rate;
-                 codec->channel_layout = ost->filter->filter->inputs[0]->channel_layout;
-                 codec->channels       = av_get_channel_layout_nb_channels(codec->channel_layout);
-                 codec->time_base      = (AVRational){ 1, codec->sample_rate };
-                 break;
-             case AVMEDIA_TYPE_VIDEO:
-                 codec->time_base = av_inv_q(ost->frame_rate);
-                 if (ost->filter && !(codec->time_base.num && codec->time_base.den))
-                     codec->time_base = ost->filter->filter->inputs[0]->time_base;
-                 if (   av_q2d(codec->time_base) < 0.001 && video_sync_method != VSYNC_PASSTHROUGH
-                    && (video_sync_method == VSYNC_CFR || (video_sync_method == VSYNC_AUTO && !(oc->oformat->flags & AVFMT_VARIABLE_FPS)))){
-                     av_log(oc, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n"
-                                                "Please consider specifying a lower framerate, a different muxer or -vsync 2\n");
-                 }
-                 for (j = 0; j < ost->forced_kf_count; j++)
-                     ost->forced_kf_pts[j] = av_rescale_q(ost->forced_kf_pts[j],
-                                                          AV_TIME_BASE_Q,
-                                                          codec->time_base);
-                 codec->width  = ost->filter->filter->inputs[0]->w;
-                 codec->height = ost->filter->filter->inputs[0]->h;
-                 codec->sample_aspect_ratio = ost->st->sample_aspect_ratio =
-                     ost->frame_aspect_ratio ? // overridden by the -aspect cli option
-                     av_d2q(ost->frame_aspect_ratio * codec->height/codec->width, 255) :
-                     ost->filter->filter->inputs[0]->sample_aspect_ratio;
-                 codec->pix_fmt = ost->filter->filter->inputs[0]->format;
-                 if (!icodec ||
-                     codec->width   != icodec->width  ||
-                     codec->height  != icodec->height ||
-                     codec->pix_fmt != icodec->pix_fmt) {
-                     codec->bits_per_raw_sample = frame_bits_per_raw_sample;
-                 }
-                 if (ost->forced_keyframes)
-                     parse_forced_key_frames(ost->forced_keyframes, ost,
-                                             ost->st->codec);
-                 break;
-             case AVMEDIA_TYPE_SUBTITLE:
-                 codec->time_base = (AVRational){1, 1000};
-                 break;
-             default:
-                 abort();
-                 break;
+             frame_number = ost->frame_number;
 -            snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "frame=%5d fps=%3d q=%3.1f ",
 -                     frame_number, (t > 1) ? (int)(frame_number / t + 0.5) : 0, q);
++            fps = t > 1 ? frame_number / t : 0;
++            snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "frame=%5d fps=%3.*f q=%3.1f ",
++                     frame_number, fps < 9.95, fps, q);
++            av_bprintf(&buf_script, "frame=%d\n", frame_number);
++            av_bprintf(&buf_script, "fps=%.1f\n", fps);
++            av_bprintf(&buf_script, "stream_%d_%d_q=%.1f\n",
++                       ost->file_index, ost->index, q);
+             if (is_last_report)
+                 snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "L");
+             if (qp_hist) {
+                 int j;
+                 int qp = lrintf(q);
+                 if (qp >= 0 && qp < FF_ARRAY_ELEMS(qp_histogram))
+                     qp_histogram[qp]++;
+                 for (j = 0; j < 32; j++)
+                     snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%X", (int)lrintf(log(qp_histogram[j] + 1) / log(2)));
              }
-             /* two pass mode */
-             if (codec->flags & (CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2)) {
-                 char logfilename[1024];
-                 FILE *f;
-                 snprintf(logfilename, sizeof(logfilename), "%s-%d.log",
-                          pass_logfilename_prefix ? pass_logfilename_prefix : DEFAULT_PASS_LOGFILENAME_PREFIX,
-                          i);
-                 if (!strcmp(ost->enc->name, "libx264")) {
-                     av_dict_set(&ost->opts, "stats", logfilename, AV_DICT_DONT_OVERWRITE);
-                 } else {
-                     if (codec->flags & CODEC_FLAG_PASS2) {
-                         char  *logbuffer;
-                         size_t logbuffer_size;
-                         if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
-                             av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n",
-                                    logfilename);
-                             exit_program(1);
-                         }
-                         codec->stats_in = logbuffer;
-                     }
-                     if (codec->flags & CODEC_FLAG_PASS1) {
-                         f = fopen(logfilename, "wb");
-                         if (!f) {
-                             av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n",
-                                 logfilename, strerror(errno));
-                             exit_program(1);
-                         }
-                         ost->logfile = f;
+             if (enc->flags&CODEC_FLAG_PSNR) {
+                 int j;
+                 double error, error_sum = 0;
+                 double scale, scale_sum = 0;
++                double p;
+                 char type[3] = { 'Y','U','V' };
+                 snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "PSNR=");
+                 for (j = 0; j < 3; j++) {
+                     if (is_last_report) {
+                         error = enc->error[j];
+                         scale = enc->width * enc->height * 255.0 * 255.0 * frame_number;
+                     } else {
+                         error = enc->coded_frame->error[j];
+                         scale = enc->width * enc->height * 255.0 * 255.0;
                      }
-                 }
-             }
-         }
-     }
-     /* open each encoder */
-     for (i = 0; i < nb_output_streams; i++) {
-         ost = output_streams[i];
-         if (ost->encoding_needed) {
-             AVCodec      *codec = ost->enc;
-             AVCodecContext *dec = NULL;
-             if ((ist = get_input_stream(ost)))
-                 dec = ist->st->codec;
-             if (dec && dec->subtitle_header) {
-                 /* ASS code assumes this buffer is null terminated so add extra byte. */
-                 ost->st->codec->subtitle_header = av_mallocz(dec->subtitle_header_size + 1);
-                 if (!ost->st->codec->subtitle_header) {
-                     ret = AVERROR(ENOMEM);
-                     goto dump_format;
-                 }
-                 memcpy(ost->st->codec->subtitle_header, dec->subtitle_header, dec->subtitle_header_size);
-                 ost->st->codec->subtitle_header_size = dec->subtitle_header_size;
-             }
-             if (!av_dict_get(ost->opts, "threads", NULL, 0))
-                 av_dict_set(&ost->opts, "threads", "auto", 0);
-             if (avcodec_open2(ost->st->codec, codec, &ost->opts) < 0) {
-                 snprintf(error, sizeof(error), "Error while opening encoder for output stream #%d:%d - maybe incorrect parameters such as bit_rate, rate, width or height",
-                         ost->file_index, ost->index);
-                 ret = AVERROR(EINVAL);
-                 goto dump_format;
-             }
-             if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
-                 !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
-                 av_buffersink_set_frame_size(ost->filter->filter,
-                                              ost->st->codec->frame_size);
-             assert_codec_experimental(ost->st->codec, 1);
-             assert_avoptions(ost->opts);
-             if (ost->st->codec->bit_rate && ost->st->codec->bit_rate < 1000)
-                 av_log(NULL, AV_LOG_WARNING, "The bitrate parameter is set too low."
-                                              " It takes bits/s as argument, not kbits/s\n");
-             extra_size += ost->st->codec->extradata_size;
-             if (ost->st->codec->me_threshold)
-                 input_streams[ost->source_index]->st->codec->debug |= FF_DEBUG_MV;
+                     if (j)
+                         scale /= 4;
+                     error_sum += error;
+                     scale_sum += scale;
 -                    snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%c:%2.2f ", type[j], psnr(error / scale));
++                    p = psnr(error / scale);
++                    snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%c:%2.2f ", type[j], p);
++                    av_bprintf(&buf_script, "stream_%d_%d_psnr_%c=%2.2f\n",
++                               ost->file_index, ost->index, type[i] | 32, p);
+                 }
++                p = psnr(error_sum / scale_sum);
+                 snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "*:%2.2f ", psnr(error_sum / scale_sum));
++                av_bprintf(&buf_script, "stream_%d_%d_psnr_all=%2.2f\n",
++                           ost->file_index, ost->index, p);
+             }
+             vid = 1;
          }
 -        pts = (double)ost->st->pts.val * av_q2d(ost->st->time_base);
 -        if ((pts < ti1) && (pts > 0))
 -            ti1 = pts;
+         /* compute min output value */
++        pts = FFMIN(pts, av_rescale_q(ost->st->pts.val,
++                                      ost->st->time_base, AV_TIME_BASE_Q));
      }
 -    if (ti1 < 0.01)
 -        ti1 = 0.01;
  
-     /* init input streams */
-     for (i = 0; i < nb_input_streams; i++)
-         if ((ret = init_input_stream(i, error, sizeof(error))) < 0)
-             goto dump_format;
 -    bitrate = (double)(total_size * 8) / ti1 / 1000.0;
++    secs = pts / AV_TIME_BASE;
++    us = pts % AV_TIME_BASE;
++    mins = secs / 60;
++    secs %= 60;
++    hours = mins / 60;
++    mins %= 60;
 +
-     /* discard unused programs */
-     for (i = 0; i < nb_input_files; i++) {
-         InputFile *ifile = input_files[i];
-         for (j = 0; j < ifile->ctx->nb_programs; j++) {
-             AVProgram *p = ifile->ctx->programs[j];
-             int discard  = AVDISCARD_ALL;
++    bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0;
  
-             for (k = 0; k < p->nb_stream_indexes; k++)
-                 if (!input_streams[ifile->ist_index + p->stream_index[k]]->discard) {
-                     discard = AVDISCARD_DEFAULT;
-                     break;
-                 }
-             p->discard = discard;
-         }
+     snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
 -            "size=%8.0fkB time=%0.2f bitrate=%6.1fkbits/s",
 -            (double)total_size / 1024, ti1, bitrate);
++             "size=%8.0fkB time=", total_size / 1024.0);
++    snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
++             "%02d:%02d:%02d.%02d ", hours, mins, secs,
++             (100 * us) / AV_TIME_BASE);
++    snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
++             "bitrate=%6.1fkbits/s", bitrate);
++    av_bprintf(&buf_script, "total_size=%"PRId64"\n", total_size);
++    av_bprintf(&buf_script, "out_time_ms=%"PRId64"\n", pts);
++    av_bprintf(&buf_script, "out_time=%02d:%02d:%02d.%06d\n",
++               hours, mins, secs, us);
+     if (nb_frames_dup || nb_frames_drop)
+         snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
+                 nb_frames_dup, nb_frames_drop);
++    av_bprintf(&buf_script, "dup_frames=%d\n", nb_frames_dup);
++    av_bprintf(&buf_script, "drop_frames=%d\n", nb_frames_drop);
++    if (print_stats || is_last_report) {
+     av_log(NULL, AV_LOG_INFO, "%s    \r", buf);
+     fflush(stderr);
 +    }
 +
-     /* open files and write file headers */
-     for (i = 0; i < nb_output_files; i++) {
-         oc = output_files[i]->ctx;
-         oc->interrupt_callback = int_cb;
-         if ((ret = avformat_write_header(oc, &output_files[i]->opts)) < 0) {
-             char errbuf[128];
-             const char *errbuf_ptr = errbuf;
-             if (av_strerror(ret, errbuf, sizeof(errbuf)) < 0)
-                 errbuf_ptr = strerror(AVUNERROR(ret));
-             snprintf(error, sizeof(error), "Could not write header for output file #%d (incorrect codec parameters ?): %s", i, errbuf_ptr);
-             ret = AVERROR(EINVAL);
-             goto dump_format;
-         }
- //         assert_avoptions(output_files[i]->opts);
-         if (strcmp(oc->oformat->name, "rtp")) {
-             want_sdp = 0;
++    if (progress_avio) {
++        av_bprintf(&buf_script, "progress=%s\n",
++                   is_last_report ? "end" : "continue");
++        avio_write(progress_avio, buf_script.str,
++                   FFMIN(buf_script.len, buf_script.size - 1));
++        avio_flush(progress_avio);
++        av_bprint_finalize(&buf_script, NULL);
++        if (is_last_report) {
++            avio_close(progress_avio);
++            progress_avio = NULL;
 +        }
 +    }
  
-  dump_format:
-     /* dump the file output parameters - cannot be done before in case
-        of stream copy */
-     for (i = 0; i < nb_output_files; i++) {
-         av_dump_format(output_files[i]->ctx, i, output_files[i]->ctx->filename, 1);
+     if (is_last_report) {
 -        int64_t raw= audio_size + video_size + extra_size;
++        int64_t raw= audio_size + video_size + subtitle_size + extra_size;
+         av_log(NULL, AV_LOG_INFO, "\n");
 -        av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n",
++        av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB subtitle:%1.0f global headers:%1.0fkB muxing overhead %f%%\n",
+                video_size / 1024.0,
+                audio_size / 1024.0,
++               subtitle_size / 1024.0,
+                extra_size / 1024.0,
+                100.0 * (total_size - raw) / raw
+         );
++        if(video_size + audio_size + subtitle_size + extra_size == 0){
++            av_log(NULL, AV_LOG_WARNING, "Output file is empty, nothing was encoded (check -ss / -t / -frames parameters if used)\n");
++        }
      }
+ }
  
-     /* dump the stream mapping */
-     av_log(NULL, AV_LOG_INFO, "Stream mapping:\n");
-     for (i = 0; i < nb_input_streams; i++) {
-         ist = input_streams[i];
+ static void flush_encoders(void)
+ {
+     int i, ret;
  
-         for (j = 0; j < ist->nb_filters; j++) {
-             if (ist->filters[j]->graph->graph_desc) {
-                 av_log(NULL, AV_LOG_INFO, "  Stream #%d:%d (%s) -> %s",
-                        ist->file_index, ist->st->index, ist->dec ? ist->dec->name : "?",
-                        ist->filters[j]->name);
-                 if (nb_filtergraphs > 1)
-                     av_log(NULL, AV_LOG_INFO, " (graph %d)", ist->filters[j]->graph->index);
-                 av_log(NULL, AV_LOG_INFO, "\n");
+     for (i = 0; i < nb_output_streams; i++) {
+         OutputStream   *ost = output_streams[i];
+         AVCodecContext *enc = ost->st->codec;
+         AVFormatContext *os = output_files[ost->file_index]->ctx;
+         int stop_encoding = 0;
+         if (!ost->encoding_needed)
+             continue;
+         if (ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO && enc->frame_size <= 1)
+             continue;
+         if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE) && enc->codec->id == AV_CODEC_ID_RAWVIDEO)
+             continue;
+         for (;;) {
+             int (*encode)(AVCodecContext*, AVPacket*, const AVFrame*, int*) = NULL;
+             const char *desc;
+             int64_t *size;
+             switch (ost->st->codec->codec_type) {
+             case AVMEDIA_TYPE_AUDIO:
+                 encode = avcodec_encode_audio2;
+                 desc   = "Audio";
+                 size   = &audio_size;
+                 break;
+             case AVMEDIA_TYPE_VIDEO:
+                 encode = avcodec_encode_video2;
+                 desc   = "Video";
+                 size   = &video_size;
+                 break;
+             default:
+                 stop_encoding = 1;
+             }
+             if (encode) {
+                 AVPacket pkt;
+                 int got_packet;
+                 av_init_packet(&pkt);
+                 pkt.data = NULL;
+                 pkt.size = 0;
++                update_benchmark(NULL);
+                 ret = encode(enc, &pkt, NULL, &got_packet);
++                update_benchmark("flush %s %d.%d", desc, ost->file_index, ost->index);
+                 if (ret < 0) {
+                     av_log(NULL, AV_LOG_FATAL, "%s encoding failed\n", desc);
+                     exit_program(1);
+                 }
 -                *size += ret;
++                *size += pkt.size;
+                 if (ost->logfile && enc->stats_out) {
+                     fprintf(ost->logfile, "%s", enc->stats_out);
+                 }
+                 if (!got_packet) {
+                     stop_encoding = 1;
+                     break;
+                 }
+                 if (pkt.pts != AV_NOPTS_VALUE)
+                     pkt.pts = av_rescale_q(pkt.pts, enc->time_base, ost->st->time_base);
+                 if (pkt.dts != AV_NOPTS_VALUE)
+                     pkt.dts = av_rescale_q(pkt.dts, enc->time_base, ost->st->time_base);
+                 write_frame(os, &pkt, ost);
              }
+             if (stop_encoding)
+                 break;
          }
      }
+ }
  
-     for (i = 0; i < nb_output_streams; i++) {
-         ost = output_streams[i];
+ /*
+  * Check whether a packet from ist should be written into ost at this time
+  */
+ static int check_output_constraints(InputStream *ist, OutputStream *ost)
+ {
+     OutputFile *of = output_files[ost->file_index];
+     int ist_index  = input_files[ist->file_index]->ist_index + ist->st->index;
  
-         if (ost->attachment_filename) {
-             /* an attached file */
-             av_log(NULL, AV_LOG_INFO, "  File %s -> Stream #%d:%d\n",
-                    ost->attachment_filename, ost->file_index, ost->index);
-             continue;
-         }
+     if (ost->source_index != ist_index)
+         return 0;
  
-         if (ost->filter && ost->filter->graph->graph_desc) {
-             /* output from a complex graph */
-             av_log(NULL, AV_LOG_INFO, "  %s", ost->filter->name);
-             if (nb_filtergraphs > 1)
-                 av_log(NULL, AV_LOG_INFO, " (graph %d)", ost->filter->graph->index);
 -    if (of->start_time && ist->last_dts < of->start_time)
++    if (of->start_time && ist->pts < of->start_time)
+         return 0;
  
-             av_log(NULL, AV_LOG_INFO, " -> Stream #%d:%d (%s)\n", ost->file_index,
-                    ost->index, ost->enc ? ost->enc->name : "?");
-             continue;
-         }
+     return 1;
+ }
  
-         av_log(NULL, AV_LOG_INFO, "  Stream #%d:%d -> #%d:%d",
-                input_streams[ost->source_index]->file_index,
-                input_streams[ost->source_index]->st->index,
-                ost->file_index,
-                ost->index);
-         if (ost->sync_ist != input_streams[ost->source_index])
-             av_log(NULL, AV_LOG_INFO, " [sync #%d:%d]",
-                    ost->sync_ist->file_index,
-                    ost->sync_ist->st->index);
-         if (ost->stream_copy)
-             av_log(NULL, AV_LOG_INFO, " (copy)");
-         else
-             av_log(NULL, AV_LOG_INFO, " (%s -> %s)", input_streams[ost->source_index]->dec ?
-                    input_streams[ost->source_index]->dec->name : "?",
-                    ost->enc ? ost->enc->name : "?");
-         av_log(NULL, AV_LOG_INFO, "\n");
-     }
+ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *pkt)
+ {
+     OutputFile *of = output_files[ost->file_index];
+     int64_t ost_tb_start_time = av_rescale_q(of->start_time, AV_TIME_BASE_Q, ost->st->time_base);
++    AVPicture pict;
+     AVPacket opkt;
  
-     if (ret) {
-         av_log(NULL, AV_LOG_ERROR, "%s\n", error);
-         return ret;
+     av_init_packet(&opkt);
+     if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) &&
+         !ost->copy_initial_nonkeyframes)
+         return;
+     if (of->recording_time != INT64_MAX &&
 -        ist->last_dts >= of->recording_time + of->start_time) {
++        ist->pts >= of->recording_time + of->start_time) {
+         ost->is_past_recording_time = 1;
+         return;
      }
  
-     if (want_sdp) {
-         print_sdp();
+     /* force the input stream PTS */
+     if (ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+         audio_size += pkt->size;
+     else if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+         video_size += pkt->size;
+         ost->sync_opts++;
++    } else if (ost->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
++        subtitle_size += pkt->size;
      }
  
-     return 0;
- }
- /**
-  * @return 1 if there are still streams where more output is wanted,
-  *         0 otherwise
-  */
- static int need_output(void)
- {
-     int i;
+     if (pkt->pts != AV_NOPTS_VALUE)
+         opkt.pts = av_rescale_q(pkt->pts, ist->st->time_base, ost->st->time_base) - ost_tb_start_time;
+     else
+         opkt.pts = AV_NOPTS_VALUE;
  
-     for (i = 0; i < nb_output_streams; i++) {
-         OutputStream *ost    = output_streams[i];
-         OutputFile *of       = output_files[ost->file_index];
-         AVFormatContext *os  = output_files[ost->file_index]->ctx;
+     if (pkt->dts == AV_NOPTS_VALUE)
 -        opkt.dts = av_rescale_q(ist->last_dts, AV_TIME_BASE_Q, ost->st->time_base);
++        opkt.dts = av_rescale_q(ist->dts, AV_TIME_BASE_Q, ost->st->time_base);
+     else
+         opkt.dts = av_rescale_q(pkt->dts, ist->st->time_base, ost->st->time_base);
+     opkt.dts -= ost_tb_start_time;
  
-         if (ost->is_past_recording_time ||
-             (os->pb && avio_tell(os->pb) >= of->limit_filesize))
-             continue;
-         if (ost->frame_number >= ost->max_frames) {
-             int j;
-             for (j = 0; j < of->ctx->nb_streams; j++)
-                 output_streams[of->ost_index + j]->is_past_recording_time = 1;
-             continue;
-         }
+     opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->st->time_base);
+     opkt.flags    = pkt->flags;
  
-         return 1;
+     // FIXME remove the following 2 lines they shall be replaced by the bitstream filters
+     if (  ost->st->codec->codec_id != AV_CODEC_ID_H264
+        && ost->st->codec->codec_id != AV_CODEC_ID_MPEG1VIDEO
+        && ost->st->codec->codec_id != AV_CODEC_ID_MPEG2VIDEO
+        && ost->st->codec->codec_id != AV_CODEC_ID_VC1
+        ) {
+         if (av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, pkt->data, pkt->size, pkt->flags & AV_PKT_FLAG_KEY))
+             opkt.destruct = av_destruct_packet;
+     } else {
+         opkt.data = pkt->data;
+         opkt.size = pkt->size;
      }
  
-     return 0;
- }
++    if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
++        /* store AVPicture in AVPacket, as expected by the output format */
++        avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, ost->st->codec->width, ost->st->codec->height);
++        opkt.data = (uint8_t *)&pict;
++        opkt.size = sizeof(AVPicture);
++        opkt.flags |= AV_PKT_FLAG_KEY;
++    }
 +
- static int input_acceptable(InputStream *ist)
- {
-     av_assert1(!ist->discard);
-     return !input_files[ist->file_index]->unavailable &&
-            !input_files[ist->file_index]->eof_reached;
+     write_frame(of->ctx, &opkt, ost);
+     ost->st->codec->frame_number++;
+     av_free_packet(&opkt);
  }
  
- static int find_graph_input(FilterGraph *graph)
+ static void rate_emu_sleep(InputStream *ist)
  {
-     int i, nb_req_max = 0, file_index = -1;
-     for (i = 0; i < graph->nb_inputs; i++) {
-         int nb_req = av_buffersrc_get_nb_failed_requests(graph->inputs[i]->filter);
-         if (nb_req > nb_req_max) {
-             InputStream *ist = graph->inputs[i]->ist;
-             if (input_acceptable(ist)) {
-                 nb_req_max = nb_req;
-                 file_index = ist->file_index;
-             }
-         }
+     if (input_files[ist->file_index]->rate_emu) {
 -        int64_t pts = av_rescale(ist->last_dts, 1000000, AV_TIME_BASE);
++        int64_t pts = av_rescale(ist->dts, 1000000, AV_TIME_BASE);
+         int64_t now = av_gettime() - ist->start;
+         if (pts > now)
+             av_usleep(pts - now);
      }
-     return file_index;
  }
  
- /**
-  * Select the input file to read from.
-  *
-  * @return  >=0 index of the input file to use;
-  *          -1  if no file is acceptable;
-  *          -2  to read from filters without reading from a file
-  */
- static int select_input_file(void)
+ int guess_input_channel_layout(InputStream *ist)
  {
-     int i, ret, nb_active_out = nb_output_streams, ost_index = -1;
-     int64_t opts_min;
-     OutputStream *ost;
-     AVFilterBufferRef *dummy;
+     AVCodecContext *dec = ist->st->codec;
  
-     for (i = 0; i < nb_output_streams; i++)
-         nb_active_out -= output_streams[i]->unavailable =
-             output_streams[i]->is_past_recording_time;
-     while (nb_active_out) {
-         opts_min = INT64_MAX;
-         ost_index = -1;
-         for (i = 0; i < nb_output_streams; i++) {
-             OutputStream *ost = output_streams[i];
-             int64_t opts = av_rescale_q(ost->st->cur_dts, ost->st->time_base,
-                                         AV_TIME_BASE_Q);
-             if (!ost->unavailable && opts < opts_min) {
-                 opts_min  = opts;
-                 ost_index = i;
-             }
-         }
-         if (ost_index < 0)
-             return -1;
+     if (!dec->channel_layout) {
+         char layout_name[256];
  
-         ost = output_streams[ost_index];
-         if (ost->source_index >= 0) {
-             /* ost is directly connected to an input */
-             InputStream *ist = input_streams[ost->source_index];
-             if (input_acceptable(ist))
-                 return ist->file_index;
-         } else {
-             /* ost is connected to a complex filtergraph */
-             av_assert1(ost->filter);
-             ret = av_buffersink_get_buffer_ref(ost->filter->filter, &dummy,
-                                                AV_BUFFERSINK_FLAG_PEEK);
-             if (ret >= 0)
-                 return -2;
-             ret = find_graph_input(ost->filter->graph);
-             if (ret >= 0)
-                 return ret;
-         }
-         ost->unavailable = 1;
-         nb_active_out--;
+         dec->channel_layout = av_get_default_channel_layout(dec->channels);
+         if (!dec->channel_layout)
+             return 0;
+         av_get_channel_layout_string(layout_name, sizeof(layout_name),
+                                      dec->channels, dec->channel_layout);
+         av_log(NULL, AV_LOG_WARNING, "Guessed Channel Layout for  Input Stream "
+                "#%d.%d : %s\n", ist->file_index, ist->st->index, layout_name);
      }
-     return -1;
+     return 1;
  }
  
- static int check_keyboard_interaction(int64_t cur_time)
+ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
  {
-     int i, ret, key;
-     static int64_t last_time;
-     if (received_nb_signals)
-         return AVERROR_EXIT;
-     /* read_key() returns 0 on EOF */
-     if(cur_time - last_time >= 100000 && !run_as_daemon){
-         key =  read_key();
-         last_time = cur_time;
-     }else
-         key = -1;
-     if (key == 'q')
-         return AVERROR_EXIT;
-     if (key == '+') av_log_set_level(av_log_get_level()+10);
-     if (key == '-') av_log_set_level(av_log_get_level()-10);
-     if (key == 's') qp_hist     ^= 1;
-     if (key == 'h'){
-         if (do_hex_dump){
-             do_hex_dump = do_pkt_dump = 0;
-         } else if(do_pkt_dump){
-             do_hex_dump = 1;
-         } else
-             do_pkt_dump = 1;
-         av_log_set_level(AV_LOG_DEBUG);
-     }
-     if (key == 'c' || key == 'C'){
-         char buf[4096], target[64], command[256], arg[256] = {0};
-         double time;
-         int k, n = 0;
-         fprintf(stderr, "\nEnter command: <target> <time> <command>[ <argument>]\n");
-         i = 0;
-         while ((k = read_key()) != '\n' && k != '\r' && i < sizeof(buf)-1)
-             if (k > 0)
-                 buf[i++] = k;
-         buf[i] = 0;
-         if (k > 0 &&
-             (n = sscanf(buf, "%63[^ ] %lf %255[^ ] %255[^\n]", target, &time, command, arg)) >= 3) {
-             av_log(NULL, AV_LOG_DEBUG, "Processing command target:%s time:%f command:%s arg:%s",
-                    target, time, command, arg);
-             for (i = 0; i < nb_filtergraphs; i++) {
-                 FilterGraph *fg = filtergraphs[i];
-                 if (fg->graph) {
-                     if (time < 0) {
-                         ret = avfilter_graph_send_command(fg->graph, target, command, arg, buf, sizeof(buf),
-                                                           key == 'c' ? AVFILTER_CMD_FLAG_ONE : 0);
-                         fprintf(stderr, "Command reply for stream %d: ret:%d res:%s\n", i, ret, buf);
-                     } else {
-                         ret = avfilter_graph_queue_command(fg->graph, target, command, arg, 0, time);
-                     }
-                 }
-             }
-         } else {
-             av_log(NULL, AV_LOG_ERROR,
-                    "Parse error, at least 3 arguments were expected, "
-                    "only %d given in string '%s'\n", n, buf);
-         }
+     AVFrame *decoded_frame;
+     AVCodecContext *avctx = ist->st->codec;
 -    int bps = av_get_bytes_per_sample(ist->st->codec->sample_fmt);
+     int i, ret, resample_changed;
++    AVRational decoded_frame_tb;
+     if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
+         return AVERROR(ENOMEM);
+     else
+         avcodec_get_frame_defaults(ist->decoded_frame);
+     decoded_frame = ist->decoded_frame;
++    update_benchmark(NULL);
+     ret = avcodec_decode_audio4(avctx, decoded_frame, got_output, pkt);
++    update_benchmark("decode_audio %d.%d", ist->file_index, ist->st->index);
+     if (ret < 0) {
+         return ret;
      }
-     if (key == 'd' || key == 'D'){
-         int debug=0;
-         if(key == 'D') {
-             debug = input_streams[0]->st->codec->debug<<1;
-             if(!debug) debug = 1;
-             while(debug & (FF_DEBUG_DCT_COEFF|FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) //unsupported, would just crash
-                 debug += debug;
-         }else
-             if(scanf("%d", &debug)!=1)
-                 fprintf(stderr,"error parsing debug value\n");
-         for(i=0;i<nb_input_streams;i++) {
-             input_streams[i]->st->codec->debug = debug;
-         }
-         for(i=0;i<nb_output_streams;i++) {
-             OutputStream *ost = output_streams[i];
-             ost->st->codec->debug = debug;
-         }
-         if(debug) av_log_set_level(AV_LOG_DEBUG);
-         fprintf(stderr,"debug=%d\n", debug);
++    if (avctx->sample_rate <= 0) {
++        av_log(avctx, AV_LOG_ERROR, "Sample rate %d invalid\n", avctx->sample_rate);
++        return AVERROR_INVALIDDATA;
 +    }
-     if (key == '?'){
-         fprintf(stderr, "key    function\n"
-                         "?      show this help\n"
-                         "+      increase verbosity\n"
-                         "-      decrease verbosity\n"
-                         "c      Send command to filtergraph\n"
-                         "D      cycle through available debug modes\n"
-                         "h      dump packets/hex press to cycle through the 3 states\n"
-                         "q      quit\n"
-                         "s      Show QP histogram\n"
-         );
+     if (!*got_output) {
+         /* no audio frame */
+         if (!pkt->size)
+             for (i = 0; i < ist->nb_filters; i++)
 -                av_buffersrc_buffer(ist->filters[i]->filter, NULL);
++                av_buffersrc_add_ref(ist->filters[i]->filter, NULL,
++                                     AV_BUFFERSRC_FLAG_NO_COPY);
+         return ret;
      }
-     return 0;
- }
  
- #if HAVE_PTHREADS
- static void *input_thread(void *arg)
- {
-     InputFile *f = arg;
-     int ret = 0;
 -    /* if the decoder provides a pts, use it instead of the last packet pts.
 -       the decoder could be delaying output by a packet or more. */
 -    if (decoded_frame->pts != AV_NOPTS_VALUE)
 -        ist->next_dts = decoded_frame->pts;
 -    else if (pkt->pts != AV_NOPTS_VALUE) {
 -        decoded_frame->pts = pkt->pts;
 -        pkt->pts           = AV_NOPTS_VALUE;
 -    }
 -
 -    // preprocess audio (volume)
 -    if (audio_volume != 256) {
 -        int decoded_data_size = decoded_frame->nb_samples * avctx->channels * bps;
 -        void *samples = decoded_frame->data[0];
 -        switch (avctx->sample_fmt) {
 -        case AV_SAMPLE_FMT_U8:
 -        {
 -            uint8_t *volp = samples;
 -            for (i = 0; i < (decoded_data_size / sizeof(*volp)); i++) {
 -                int v = (((*volp - 128) * audio_volume + 128) >> 8) + 128;
 -                *volp++ = av_clip_uint8(v);
 -            }
 -            break;
 -        }
 -        case AV_SAMPLE_FMT_S16:
 -        {
 -            int16_t *volp = samples;
 -            for (i = 0; i < (decoded_data_size / sizeof(*volp)); i++) {
 -                int v = ((*volp) * audio_volume + 128) >> 8;
 -                *volp++ = av_clip_int16(v);
 -            }
 -            break;
 -        }
 -        case AV_SAMPLE_FMT_S32:
 -        {
 -            int32_t *volp = samples;
 -            for (i = 0; i < (decoded_data_size / sizeof(*volp)); i++) {
 -                int64_t v = (((int64_t)*volp * audio_volume + 128) >> 8);
 -                *volp++ = av_clipl_int32(v);
 -            }
 -            break;
 -        }
 -        case AV_SAMPLE_FMT_FLT:
 -        {
 -            float *volp = samples;
 -            float scale = audio_volume / 256.f;
 -            for (i = 0; i < (decoded_data_size / sizeof(*volp)); i++) {
 -                *volp++ *= scale;
 -            }
 -            break;
 -        }
 -        case AV_SAMPLE_FMT_DBL:
 -        {
 -            double *volp = samples;
 -            double scale = audio_volume / 256.;
 -            for (i = 0; i < (decoded_data_size / sizeof(*volp)); i++) {
 -                *volp++ *= scale;
 -            }
 -            break;
 -        }
 -        default:
 -            av_log(NULL, AV_LOG_FATAL,
 -                   "Audio volume adjustment on sample format %s is not supported.\n",
 -                   av_get_sample_fmt_name(ist->st->codec->sample_fmt));
 -            exit_program(1);
 -        }
 -    }
++#if 1
++    /* increment next_dts to use for the case where the input stream does not
++       have timestamps or there are multiple frames in the packet */
++    ist->next_pts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) /
++                     avctx->sample_rate;
++    ist->next_dts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) /
++                     avctx->sample_rate;
++#endif
  
-     while (!transcoding_finished && ret >= 0) {
-         AVPacket pkt;
-         ret = av_read_frame(f->ctx, &pkt);
+     rate_emu_sleep(ist);
  
-         if (ret == AVERROR(EAGAIN)) {
-             av_usleep(10000);
-             ret = 0;
-             continue;
-         } else if (ret < 0)
-             break;
+     resample_changed = ist->resample_sample_fmt     != decoded_frame->format         ||
+                        ist->resample_channels       != avctx->channels               ||
+                        ist->resample_channel_layout != decoded_frame->channel_layout ||
+                        ist->resample_sample_rate    != decoded_frame->sample_rate;
+     if (resample_changed) {
+         char layout1[64], layout2[64];
  
-         pthread_mutex_lock(&f->fifo_lock);
-         while (!av_fifo_space(f->fifo))
-             pthread_cond_wait(&f->fifo_cond, &f->fifo_lock);
+         if (!guess_input_channel_layout(ist)) {
+             av_log(NULL, AV_LOG_FATAL, "Unable to find default channel "
+                    "layout for Input Stream #%d.%d\n", ist->file_index,
+                    ist->st->index);
+             exit_program(1);
+         }
+         decoded_frame->channel_layout = avctx->channel_layout;
  
-         av_dup_packet(&pkt);
-         av_fifo_generic_write(f->fifo, &pkt, sizeof(pkt), NULL);
+         av_get_channel_layout_string(layout1, sizeof(layout1), ist->resample_channels,
+                                      ist->resample_channel_layout);
+         av_get_channel_layout_string(layout2, sizeof(layout2), avctx->channels,
+                                      decoded_frame->channel_layout);
  
-         pthread_mutex_unlock(&f->fifo_lock);
+         av_log(NULL, AV_LOG_INFO,
+                "Input stream #%d:%d frame changed from rate:%d fmt:%s ch:%d chl:%s to rate:%d fmt:%s ch:%d chl:%s\n",
+                ist->file_index, ist->st->index,
+                ist->resample_sample_rate,  av_get_sample_fmt_name(ist->resample_sample_fmt),
+                ist->resample_channels, layout1,
+                decoded_frame->sample_rate, av_get_sample_fmt_name(decoded_frame->format),
+                avctx->channels, layout2);
+         ist->resample_sample_fmt     = decoded_frame->format;
+         ist->resample_sample_rate    = decoded_frame->sample_rate;
+         ist->resample_channel_layout = decoded_frame->channel_layout;
+         ist->resample_channels       = avctx->channels;
+         for (i = 0; i < nb_filtergraphs; i++)
 -            if (ist_in_filtergraph(filtergraphs[i], ist) &&
 -                configure_filtergraph(filtergraphs[i]) < 0) {
 -                av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
 -                exit_program(1);
++            if (ist_in_filtergraph(filtergraphs[i], ist)) {
++                FilterGraph *fg = filtergraphs[i];
++                int j;
++                if (configure_filtergraph(fg) < 0) {
++                    av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
++                    exit_program(1);
++                }
++                for (j = 0; j < fg->nb_outputs; j++) {
++                    OutputStream *ost = fg->outputs[j]->ost;
++                    if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
++                        !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
++                        av_buffersink_set_frame_size(ost->filter->filter,
++                                                     ost->st->codec->frame_size);
++                }
+             }
      }
  
-     f->finished = 1;
-     return NULL;
++    /* if the decoder provides a pts, use it instead of the last packet pts.
++       the decoder could be delaying output by a packet or more. */
++    if (decoded_frame->pts != AV_NOPTS_VALUE) {
++        ist->dts = ist->next_dts = ist->pts = ist->next_pts = av_rescale_q(decoded_frame->pts, avctx->time_base, AV_TIME_BASE_Q);
++        decoded_frame_tb   = avctx->time_base;
++    } else if (decoded_frame->pkt_pts != AV_NOPTS_VALUE) {
++        decoded_frame->pts = decoded_frame->pkt_pts;
++        pkt->pts           = AV_NOPTS_VALUE;
++        decoded_frame_tb   = ist->st->time_base;
++    } else if (pkt->pts != AV_NOPTS_VALUE) {
++        decoded_frame->pts = pkt->pts;
++        pkt->pts           = AV_NOPTS_VALUE;
++        decoded_frame_tb   = ist->st->time_base;
++    }else {
++        decoded_frame->pts = ist->dts;
++        decoded_frame_tb   = AV_TIME_BASE_Q;
++    }
+     if (decoded_frame->pts != AV_NOPTS_VALUE)
+         decoded_frame->pts = av_rescale_q(decoded_frame->pts,
 -                                          ist->st->time_base,
++                                          decoded_frame_tb,
+                                           (AVRational){1, ist->st->codec->sample_rate});
+     for (i = 0; i < ist->nb_filters; i++)
 -        av_buffersrc_write_frame(ist->filters[i]->filter, decoded_frame);
++        av_buffersrc_add_frame(ist->filters[i]->filter, decoded_frame, 0);
++
++    decoded_frame->pts = AV_NOPTS_VALUE;
+     return ret;
  }
  
- static void free_input_threads(void)
+ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
  {
-     int i;
-     if (nb_input_files == 1)
-         return;
+     AVFrame *decoded_frame;
+     void *buffer_to_free = NULL;
+     int i, ret = 0, resample_changed;
++    int64_t best_effort_timestamp;
++    AVRational *frame_sample_aspect;
+     float quality;
  
-     transcoding_finished = 1;
+     if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
+         return AVERROR(ENOMEM);
+     else
+         avcodec_get_frame_defaults(ist->decoded_frame);
+     decoded_frame = ist->decoded_frame;
++    pkt->dts  = av_rescale_q(ist->dts, AV_TIME_BASE_Q, ist->st->time_base);
  
-     for (i = 0; i < nb_input_files; i++) {
-         InputFile *f = input_files[i];
-         AVPacket pkt;
++    update_benchmark(NULL);
+     ret = avcodec_decode_video2(ist->st->codec,
+                                 decoded_frame, got_output, pkt);
++    update_benchmark("decode_video %d.%d", ist->file_index, ist->st->index);
+     if (ret < 0)
+         return ret;
  
-         if (!f->fifo || f->joined)
-             continue;
+     quality = same_quant ? decoded_frame->quality : 0;
+     if (!*got_output) {
+         /* no picture yet */
+         if (!pkt->size)
+             for (i = 0; i < ist->nb_filters; i++)
 -                av_buffersrc_buffer(ist->filters[i]->filter, NULL);
++                av_buffersrc_add_ref(ist->filters[i]->filter, NULL, AV_BUFFERSRC_FLAG_NO_COPY);
+         return ret;
+     }
 -    decoded_frame->pts = guess_correct_pts(&ist->pts_ctx, decoded_frame->pkt_pts,
 -                                           decoded_frame->pkt_dts);
 +
-         pthread_mutex_lock(&f->fifo_lock);
-         while (av_fifo_size(f->fifo)) {
-             av_fifo_generic_read(f->fifo, &pkt, sizeof(pkt), NULL);
-             av_free_packet(&pkt);
-         }
-         pthread_cond_signal(&f->fifo_cond);
-         pthread_mutex_unlock(&f->fifo_lock);
++    if(ist->top_field_first>=0)
++        decoded_frame->top_field_first = ist->top_field_first;
 +
-         pthread_join(f->thread, NULL);
-         f->joined = 1;
++    best_effort_timestamp= av_frame_get_best_effort_timestamp(decoded_frame);
++    if(best_effort_timestamp != AV_NOPTS_VALUE)
++        ist->next_pts = ist->pts = av_rescale_q(decoded_frame->pts = best_effort_timestamp, ist->st->time_base, AV_TIME_BASE_Q);
 +
-         while (av_fifo_size(f->fifo)) {
-             av_fifo_generic_read(f->fifo, &pkt, sizeof(pkt), NULL);
-             av_free_packet(&pkt);
-         }
-         av_fifo_free(f->fifo);
++    if (debug_ts) {
++        av_log(NULL, AV_LOG_INFO, "decoder -> ist_index:%d type:video "
++                "frame_pts:%s frame_pts_time:%s best_effort_ts:%"PRId64" best_effort_ts_time:%s keyframe:%d frame_type:%d \n",
++                ist->st->index, av_ts2str(decoded_frame->pts),
++                av_ts2timestr(decoded_frame->pts, &ist->st->time_base),
++                best_effort_timestamp,
++                av_ts2timestr(best_effort_timestamp, &ist->st->time_base),
++                decoded_frame->key_frame, decoded_frame->pict_type);
 +    }
- }
 +
- static int init_input_threads(void)
- {
-     int i, ret;
+     pkt->size = 0;
+     pre_process_video_frame(ist, (AVPicture *)decoded_frame, &buffer_to_free);
  
-     if (nb_input_files == 1)
-         return 0;
+     rate_emu_sleep(ist);
  
-     for (i = 0; i < nb_input_files; i++) {
-         InputFile *f = input_files[i];
+     if (ist->st->sample_aspect_ratio.num)
+         decoded_frame->sample_aspect_ratio = ist->st->sample_aspect_ratio;
  
-         if (!(f->fifo = av_fifo_alloc(8*sizeof(AVPacket))))
-             return AVERROR(ENOMEM);
+     resample_changed = ist->resample_width   != decoded_frame->width  ||
+                        ist->resample_height  != decoded_frame->height ||
+                        ist->resample_pix_fmt != decoded_frame->format;
+     if (resample_changed) {
+         av_log(NULL, AV_LOG_INFO,
+                "Input stream #%d:%d frame changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s\n",
+                ist->file_index, ist->st->index,
+                ist->resample_width,  ist->resample_height,  av_get_pix_fmt_name(ist->resample_pix_fmt),
+                decoded_frame->width, decoded_frame->height, av_get_pix_fmt_name(decoded_frame->format));
  
-         pthread_mutex_init(&f->fifo_lock, NULL);
-         pthread_cond_init (&f->fifo_cond, NULL);
+         ist->resample_width   = decoded_frame->width;
+         ist->resample_height  = decoded_frame->height;
+         ist->resample_pix_fmt = decoded_frame->format;
  
-         if ((ret = pthread_create(&f->thread, NULL, input_thread, f)))
-             return AVERROR(ret);
+         for (i = 0; i < nb_filtergraphs; i++)
+             if (ist_in_filtergraph(filtergraphs[i], ist) &&
+                 configure_filtergraph(filtergraphs[i]) < 0) {
+                 av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
+                 exit_program(1);
+             }
      }
-     return 0;
- }
  
- static int get_input_packet_mt(InputFile *f, AVPacket *pkt)
- {
-     int ret = 0;
++    frame_sample_aspect= av_opt_ptr(avcodec_get_frame_class(), decoded_frame, "sample_aspect_ratio");
+     for (i = 0; i < ist->nb_filters; i++) {
++        int changed =      ist->st->codec->width   != ist->filters[i]->filter->outputs[0]->w
++                        || ist->st->codec->height  != ist->filters[i]->filter->outputs[0]->h
++                        || ist->st->codec->pix_fmt != ist->filters[i]->filter->outputs[0]->format;
+         // XXX what an ugly hack
+         if (ist->filters[i]->graph->nb_outputs == 1)
+             ist->filters[i]->graph->outputs[0]->ost->last_quality = quality;
  
-     pthread_mutex_lock(&f->fifo_lock);
 -        if (ist->st->codec->codec->capabilities & CODEC_CAP_DR1) {
++        if (!frame_sample_aspect->num)
++            *frame_sample_aspect = ist->st->sample_aspect_ratio;
++        if (ist->dr1 && decoded_frame->type==FF_BUFFER_TYPE_USER && !changed) {
+             FrameBuffer      *buf = decoded_frame->opaque;
+             AVFilterBufferRef *fb = avfilter_get_video_buffer_ref_from_arrays(
+                                         decoded_frame->data, decoded_frame->linesize,
+                                         AV_PERM_READ | AV_PERM_PRESERVE,
+                                         ist->st->codec->width, ist->st->codec->height,
+                                         ist->st->codec->pix_fmt);
  
-     if (av_fifo_size(f->fifo)) {
-         av_fifo_generic_read(f->fifo, pkt, sizeof(*pkt), NULL);
-         pthread_cond_signal(&f->fifo_cond);
-     } else {
-         if (f->finished)
-             ret = AVERROR_EOF;
-         else
-             ret = AVERROR(EAGAIN);
-     }
+             avfilter_copy_frame_props(fb, decoded_frame);
+             fb->buf->priv           = buf;
+             fb->buf->free           = filter_release_buffer;
++            av_assert0(buf->refcount>0);
+             buf->refcount++;
 -            av_buffersrc_buffer(ist->filters[i]->filter, fb);
++            av_buffersrc_add_ref(ist->filters[i]->filter, fb,
++                                 AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT |
++                                 AV_BUFFERSRC_FLAG_NO_COPY);
+         } else
 -            av_buffersrc_write_frame(ist->filters[i]->filter, decoded_frame);
++        if(av_buffersrc_add_frame(ist->filters[i]->filter, decoded_frame, 0)<0) {
++            av_log(NULL, AV_LOG_FATAL, "Failed to inject frame into filter network\n");
++            exit_program(1);
++        }
 +
-     pthread_mutex_unlock(&f->fifo_lock);
+     }
  
+     av_free(buffer_to_free);
      return ret;
  }
- #endif
- static int get_input_packet(InputFile *f, AVPacket *pkt)
- {
- #if HAVE_PTHREADS
-     if (nb_input_files > 1)
-         return get_input_packet_mt(f, pkt);
- #endif
-     return av_read_frame(f->ctx, pkt);
- }
  
- /*
-  * The following code is the main loop of the file converter
-  */
- static int transcode(void)
+ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
  {
-     int ret, i;
-     AVFormatContext *is, *os;
-     OutputStream *ost;
-     InputStream *ist;
-     int no_packet_count = 0;
-     int64_t timer_start;
-     ret = transcode_init();
-     if (ret < 0)
-         goto fail;
-     if (stdin_interaction) {
-         av_log(NULL, AV_LOG_INFO, "Press [q] to stop, [?] for help\n");
+     AVSubtitle subtitle;
+     int i, ret = avcodec_decode_subtitle2(ist->st->codec,
+                                           &subtitle, got_output, pkt);
 -    if (ret < 0)
 -        return ret;
 -    if (!*got_output)
++    if (ret < 0 || !*got_output) {
++        if (!pkt->size)
++            sub2video_flush(ist);
+         return ret;
 +    }
  
-     timer_start = av_gettime();
- #if HAVE_PTHREADS
-     if ((ret = init_input_threads()) < 0)
-         goto fail;
- #endif
-     for (; received_sigterm == 0;) {
-         int file_index, ist_index;
-         AVPacket pkt;
-         int64_t cur_time= av_gettime();
-         /* if 'q' pressed, exits */
-         if (stdin_interaction)
-             if (check_keyboard_interaction(cur_time) < 0)
-                 break;
-         /* check if there's any stream where output is still needed */
-         if (!need_output()) {
-             av_log(NULL, AV_LOG_VERBOSE, "No more output streams to write to, finishing.\n");
-             break;
-         }
+     rate_emu_sleep(ist);
  
-         /* select the stream that we must read now */
-         file_index = select_input_file();
-         /* if none, if is finished */
-         if (file_index == -2) {
-             poll_filters() ;
-             continue;
-         }
-         if (file_index < 0) {
-             if (no_packet_count) {
-                 no_packet_count = 0;
-                 for (i = 0; i < nb_input_files; i++)
-                     input_files[i]->unavailable = 0;
-                 av_usleep(10000);
-                 continue;
-             }
-             av_log(NULL, AV_LOG_VERBOSE, "No more inputs to read from, finishing.\n");
-             break;
-         }
++    sub2video_update(ist, &subtitle, pkt->pts);
 +
-         is  = input_files[file_index]->ctx;
-         ret = get_input_packet(input_files[file_index], &pkt);
+     for (i = 0; i < nb_output_streams; i++) {
+         OutputStream *ost = output_streams[i];
  
-         if (ret == AVERROR(EAGAIN)) {
-             input_files[file_index]->unavailable = 1;
-             no_packet_count++;
+         if (!check_output_constraints(ist, ost) || !ost->encoding_needed)
              continue;
-         }
-         if (ret < 0) {
-             if (ret != AVERROR_EOF) {
-                 print_error(is->filename, ret);
-                 if (exit_on_error)
-                     exit_program(1);
-             }
-             input_files[file_index]->eof_reached = 1;
-             for (i = 0; i < input_files[file_index]->nb_streams; i++) {
-                 ist = input_streams[input_files[file_index]->ist_index + i];
-                 if (ist->decoding_needed)
-                     output_packet(ist, NULL);
-                 poll_filters();
-             }
  
-             if (opt_shortest)
-                 break;
-             else
-                 continue;
-         }
+         do_subtitle_out(output_files[ost->file_index]->ctx, ost, ist, &subtitle, pkt->pts);
+     }
  
-         no_packet_count = 0;
-         for (i = 0; i < nb_input_files; i++)
-             input_files[i]->unavailable = 0;
+     avsubtitle_free(&subtitle);
+     return ret;
+ }
  
-         if (do_pkt_dump) {
-             av_pkt_dump_log2(NULL, AV_LOG_DEBUG, &pkt, do_hex_dump,
-                              is->streams[pkt.stream_index]);
-         }
-         /* the following test is needed in case new streams appear
-            dynamically in stream : we ignore them */
-         if (pkt.stream_index >= input_files[file_index]->nb_streams) {
-             report_new_stream(file_index, &pkt);
-             goto discard_packet;
-         }
-         ist_index = input_files[file_index]->ist_index + pkt.stream_index;
-         ist = input_streams[ist_index];
-         if (ist->discard)
-             goto discard_packet;
+ /* pkt = NULL means EOF (needed to flush decoder buffers) */
+ static int output_packet(InputStream *ist, const AVPacket *pkt)
+ {
 -    int i;
++    int ret = 0, i;
+     int got_output;
 +
-         if(!ist->wrap_correction_done && input_files[file_index]->ctx->start_time != AV_NOPTS_VALUE && ist->st->pts_wrap_bits < 64){
-             uint64_t stime = av_rescale_q(input_files[file_index]->ctx->start_time, AV_TIME_BASE_Q, ist->st->time_base);
-             uint64_t stime2= stime + (1LL<<ist->st->pts_wrap_bits);
-             ist->wrap_correction_done = 1;
-             if(pkt.dts != AV_NOPTS_VALUE && pkt.dts > stime && pkt.dts - stime > stime2 - pkt.dts) {
-                 pkt.dts -= 1LL<<ist->st->pts_wrap_bits;
-                 ist->wrap_correction_done = 0;
-             }
-             if(pkt.pts != AV_NOPTS_VALUE && pkt.pts > stime && pkt.pts - stime > stime2 - pkt.pts) {
-                 pkt.pts -= 1LL<<ist->st->pts_wrap_bits;
-                 ist->wrap_correction_done = 0;
-             }
+     AVPacket avpkt;
++    if (!ist->saw_first_ts) {
++        ist->dts = ist->st->avg_frame_rate.num ? - ist->st->codec->has_b_frames * AV_TIME_BASE / av_q2d(ist->st->avg_frame_rate) : 0;
++        ist->pts = 0;
++        if (pkt != NULL && pkt->pts != AV_NOPTS_VALUE && !ist->decoding_needed) {
++            ist->dts += av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q);
++            ist->pts = ist->dts; //unused but better to set it to a value thats not totally wrong
 +        }
++        ist->saw_first_ts = 1;
++    }
  
-         if (pkt.dts != AV_NOPTS_VALUE)
-             pkt.dts += av_rescale_q(input_files[ist->file_index]->ts_offset, AV_TIME_BASE_Q, ist->st->time_base);
-         if (pkt.pts != AV_NOPTS_VALUE)
-             pkt.pts += av_rescale_q(input_files[ist->file_index]->ts_offset, AV_TIME_BASE_Q, ist->st->time_base);
+     if (ist->next_dts == AV_NOPTS_VALUE)
 -        ist->next_dts = ist->last_dts;
++        ist->next_dts = ist->dts;
++    if (ist->next_pts == AV_NOPTS_VALUE)
++        ist->next_pts = ist->pts;
  
-         if (pkt.pts != AV_NOPTS_VALUE)
-             pkt.pts *= ist->ts_scale;
-         if (pkt.dts != AV_NOPTS_VALUE)
-             pkt.dts *= ist->ts_scale;
+     if (pkt == NULL) {
+         /* EOF handling */
+         av_init_packet(&avpkt);
+         avpkt.data = NULL;
+         avpkt.size = 0;
+         goto handle_eof;
+     } else {
+         avpkt = *pkt;
+     }
  
-         if (debug_ts) {
-             av_log(NULL, AV_LOG_INFO, "demuxer -> ist_index:%d type:%s "
-                     "next_dts:%s next_dts_time:%s next_pts:%s next_pts_time:%s  pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s off:%"PRId64"\n",
-                     ist_index, av_get_media_type_string(ist->st->codec->codec_type),
-                     av_ts2str(ist->next_dts), av_ts2timestr(ist->next_dts, &AV_TIME_BASE_Q),
-                     av_ts2str(ist->next_pts), av_ts2timestr(ist->next_pts, &AV_TIME_BASE_Q),
-                     av_ts2str(pkt.pts), av_ts2timestr(pkt.pts, &ist->st->time_base),
-                     av_ts2str(pkt.dts), av_ts2timestr(pkt.dts, &ist->st->time_base),
-                     input_files[ist->file_index]->ts_offset);
-         }
 -    if (pkt->dts != AV_NOPTS_VALUE)
 -        ist->next_dts = ist->last_dts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
++    if (pkt->dts != AV_NOPTS_VALUE) {
++        ist->next_dts = ist->dts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
++        if (ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || !ist->decoding_needed)
++            ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
++    }
  
-         if (pkt.dts != AV_NOPTS_VALUE && ist->next_dts != AV_NOPTS_VALUE && !copy_ts) {
-             int64_t pkt_dts = av_rescale_q(pkt.dts, ist->st->time_base, AV_TIME_BASE_Q);
-             int64_t delta   = pkt_dts - ist->next_dts;
-             if (is->iformat->flags & AVFMT_TS_DISCONT) {
-             if(delta < -1LL*dts_delta_threshold*AV_TIME_BASE ||
-                 (delta > 1LL*dts_delta_threshold*AV_TIME_BASE &&
-                  ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) ||
-                 pkt_dts+1<ist->pts){
-                 input_files[ist->file_index]->ts_offset -= delta;
-                 av_log(NULL, AV_LOG_DEBUG,
-                        "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n",
-                        delta, input_files[ist->file_index]->ts_offset);
-                 pkt.dts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
-                 if (pkt.pts != AV_NOPTS_VALUE)
-                     pkt.pts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
-             }
-             } else {
-                 if ( delta < -1LL*dts_error_threshold*AV_TIME_BASE ||
-                     (delta > 1LL*dts_error_threshold*AV_TIME_BASE && ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) ||
-                      pkt_dts+1<ist->pts){
-                     av_log(NULL, AV_LOG_WARNING, "DTS %"PRId64", next:%"PRId64" st:%d invalid dropping\n", pkt.dts, ist->next_dts, pkt.stream_index);
-                     pkt.dts = AV_NOPTS_VALUE;
-                 }
-                 if (pkt.pts != AV_NOPTS_VALUE){
-                     int64_t pkt_pts = av_rescale_q(pkt.pts, ist->st->time_base, AV_TIME_BASE_Q);
-                     delta   = pkt_pts - ist->next_dts;
-                     if ( delta < -1LL*dts_error_threshold*AV_TIME_BASE ||
-                         (delta > 1LL*dts_error_threshold*AV_TIME_BASE && ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) ||
-                         pkt_pts+1<ist->pts) {
-                         av_log(NULL, AV_LOG_WARNING, "PTS %"PRId64", next:%"PRId64" invalid dropping st:%d\n", pkt.pts, ist->next_dts, pkt.stream_index);
-                         pkt.pts = AV_NOPTS_VALUE;
-                     }
-                 }
-             }
-         }
+     // while we have more to decode or while the decoder did output something on EOF
+     while (ist->decoding_needed && (avpkt.size > 0 || (!pkt && got_output))) {
 -        int ret = 0;
++        int duration;
+     handle_eof:
  
-         sub2video_heartbeat(ist, pkt.pts);
 -        ist->last_dts = ist->next_dts;
++        ist->pts = ist->next_pts;
++        ist->dts = ist->next_dts;
  
-         // fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size);
-         if ((ret = output_packet(ist, &pkt)) < 0 ||
-             ((ret = poll_filters()) < 0 && ret != AVERROR_EOF)) {
-             char buf[128];
-             av_strerror(ret, buf, sizeof(buf));
-             av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d: %s\n",
-                    ist->file_index, ist->st->index, buf);
-             if (exit_on_error)
-                 exit_program(1);
-             av_free_packet(&pkt);
-             continue;
+         if (avpkt.size && avpkt.size != pkt->size) {
+             av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING,
+                    "Multiple frames in a packet from stream %d\n", pkt->stream_index);
+             ist->showed_multi_packet_warning = 1;
          }
  
-     discard_packet:
-         av_free_packet(&pkt);
+         switch (ist->st->codec->codec_type) {
+         case AVMEDIA_TYPE_AUDIO:
+             ret = decode_audio    (ist, &avpkt, &got_output);
+             break;
+         case AVMEDIA_TYPE_VIDEO:
+             ret = decode_video    (ist, &avpkt, &got_output);
 -            if (avpkt.duration)
 -                ist->next_dts += av_rescale_q(avpkt.duration, ist->st->time_base, AV_TIME_BASE_Q);
 -            else if (ist->st->avg_frame_rate.num)
 -                ist->next_dts += av_rescale_q(1, av_inv_q(ist->st->avg_frame_rate),
 -                                              AV_TIME_BASE_Q);
 -            else if (ist->st->codec->time_base.num != 0) {
 -                int ticks      = ist->st->parser ? ist->st->parser->repeat_pict + 1 :
 -                                                   ist->st->codec->ticks_per_frame;
 -                ist->next_dts += av_rescale_q(ticks, ist->st->codec->time_base, AV_TIME_BASE_Q);
 -            }
++            if (avpkt.duration) {
++                duration = av_rescale_q(avpkt.duration, ist->st->time_base, AV_TIME_BASE_Q);
++            } else if(ist->st->codec->time_base.num != 0 && ist->st->codec->time_base.den != 0) {
++                int ticks= ist->st->parser ? ist->st->parser->repeat_pict+1 : ist->st->codec->ticks_per_frame;
++                duration = ((int64_t)AV_TIME_BASE *
++                                ist->st->codec->time_base.num * ticks) /
++                                ist->st->codec->time_base.den;
++            } else
++                duration = 0;
 +
-         /* dump report by using the output first video and audio streams */
-         print_report(0, timer_start, cur_time);
-     }
- #if HAVE_PTHREADS
-     free_input_threads();
- #endif
++            if(ist->dts != AV_NOPTS_VALUE && duration) {
++                ist->next_dts += duration;
++            }else
++                ist->next_dts = AV_NOPTS_VALUE;
 +
-     /* at the end of stream, we must flush the decoder buffers */
-     for (i = 0; i < nb_input_streams; i++) {
-         ist = input_streams[i];
-         if (!input_files[ist->file_index]->eof_reached && ist->decoding_needed) {
-             output_packet(ist, NULL);
++            if (got_output)
++                ist->next_pts += duration; //FIXME the duration is not correct in some cases
+             break;
+         case AVMEDIA_TYPE_SUBTITLE:
+             ret = transcode_subtitles(ist, &avpkt, &got_output);
+             break;
+         default:
+             return -1;
          }
-     }
-     poll_filters();
-     flush_encoders();
-     term_exit();
  
-     /* write the trailer if needed and close file */
-     for (i = 0; i < nb_output_files; i++) {
-         os = output_files[i]->ctx;
-         av_write_trailer(os);
-     }
+         if (ret < 0)
+             return ret;
 +
-     /* dump report by using the first video and audio streams */
-     print_report(1, timer_start, av_gettime());
++        avpkt.dts=
++        avpkt.pts= AV_NOPTS_VALUE;
 +
-     /* close each encoder */
-     for (i = 0; i < nb_output_streams; i++) {
-         ost = output_streams[i];
-         if (ost->encoding_needed) {
-             av_freep(&ost->st->codec->stats_in);
-             avcodec_close(ost->st->codec);
+         // touch data and size only if not EOF
+         if (pkt) {
++            if(ist->st->codec->codec_type != AVMEDIA_TYPE_AUDIO)
++                ret = avpkt.size;
+             avpkt.data += ret;
+             avpkt.size -= ret;
          }
-     }
-     /* close each decoder */
-     for (i = 0; i < nb_input_streams; i++) {
-         ist = input_streams[i];
-         if (ist->decoding_needed) {
-             avcodec_close(ist->st->codec);
+         if (!got_output) {
+             continue;
          }
      }
  
-     /* finished ! */
-     ret = 0;
-  fail:
- #if HAVE_PTHREADS
-     free_input_threads();
- #endif
-     if (output_streams) {
-         for (i = 0; i < nb_output_streams; i++) {
-             ost = output_streams[i];
-             if (ost) {
-                 if (ost->stream_copy)
-                     av_freep(&ost->st->codec->extradata);
-                 if (ost->logfile) {
-                     fclose(ost->logfile);
-                     ost->logfile = NULL;
-                 }
-                 av_freep(&ost->st->codec->subtitle_header);
-                 av_free(ost->forced_kf_pts);
-                 av_dict_free(&ost->opts);
+     /* handle stream copy */
+     if (!ist->decoding_needed) {
+         rate_emu_sleep(ist);
 -        ist->last_dts = ist->next_dts;
++        ist->dts = ist->next_dts;
+         switch (ist->st->codec->codec_type) {
+         case AVMEDIA_TYPE_AUDIO:
+             ist->next_dts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) /
+                              ist->st->codec->sample_rate;
+             break;
+         case AVMEDIA_TYPE_VIDEO:
 -            if (ist->st->codec->time_base.num != 0) {
 -                int ticks = ist->st->parser ? ist->st->parser->repeat_pict + 1 : ist->st->codec->ticks_per_frame;
++            if (pkt->duration) {
++                ist->next_dts += av_rescale_q(pkt->duration, ist->st->time_base, AV_TIME_BASE_Q);
++            } else if(ist->st->codec->time_base.num != 0) {
++                int ticks= ist->st->parser ? ist->st->parser->repeat_pict + 1 : ist->st->codec->ticks_per_frame;
+                 ist->next_dts += ((int64_t)AV_TIME_BASE *
+                                   ist->st->codec->time_base.num * ticks) /
+                                   ist->st->codec->time_base.den;
              }
+             break;
          }
++        ist->pts = ist->dts;
++        ist->next_pts = ist->next_dts;
      }
-     return ret;
- }
- static int opt_frame_crop(const char *opt, const char *arg)
- {
-     av_log(NULL, AV_LOG_FATAL, "Option '%s' has been removed, use the crop filter instead\n", opt);
-     return AVERROR(EINVAL);
- }
+     for (i = 0; pkt && i < nb_output_streams; i++) {
+         OutputStream *ost = output_streams[i];
  
- static int opt_pad(const char *opt, const char *arg)
- {
-     av_log(NULL, AV_LOG_FATAL, "Option '%s' has been removed, use the pad filter instead\n", opt);
-     return -1;
- }
+         if (!check_output_constraints(ist, ost) || ost->encoding_needed)
+             continue;
  
- static int opt_video_channel(const char *opt, const char *arg)
- {
-     av_log(NULL, AV_LOG_WARNING, "This option is deprecated, use -channel.\n");
-     return opt_default("channel", arg);
- }
+         do_streamcopy(ist, ost, pkt);
+     }
  
- static int opt_video_standard(const char *opt, const char *arg)
- {
-     av_log(NULL, AV_LOG_WARNING, "This option is deprecated, use -standard.\n");
-     return opt_default("standard", arg);
+     return 0;
  }
  
- static int opt_audio_codec(OptionsContext *o, const char *opt, const char *arg)
+ static void print_sdp(void)
  {
-     audio_codec_name = arg;
-     return parse_option(o, "codec:a", arg, options);
- }
+     char sdp[2048];
+     int i;
+     AVFormatContext **avc = av_malloc(sizeof(*avc) * nb_output_files);
  
- static int opt_video_codec(OptionsContext *o, const char *opt, const char *arg)
- {
-     video_codec_name = arg;
-     return parse_option(o, "codec:v", arg, options);
- }
+     if (!avc)
+         exit_program(1);
+     for (i = 0; i < nb_output_files; i++)
+         avc[i] = output_files[i]->ctx;
  
- static int opt_subtitle_codec(OptionsContext *o, const char *opt, const char *arg)
- {
-     subtitle_codec_name = arg;
-     return parse_option(o, "codec:s", arg, options);
+     av_sdp_create(avc, nb_output_files, sdp, sizeof(sdp));
+     printf("SDP:\n%s\n", sdp);
+     fflush(stdout);
+     av_freep(&avc);
  }
  
- static int opt_data_codec(OptionsContext *o, const char *opt, const char *arg)
+ static int init_input_stream(int ist_index, char *error, int error_len)
  {
-     return parse_option(o, "codec:d", arg, options);
- }
 -    int i;
+     InputStream *ist = input_streams[ist_index];
 +
- static int opt_map(OptionsContext *o, const char *opt, const char *arg)
- {
-     StreamMap *m = NULL;
-     int i, negative = 0, file_idx;
-     int sync_file_idx = -1, sync_stream_idx = 0;
-     char *p, *sync;
-     char *map;
-     if (*arg == '-') {
-         negative = 1;
-         arg++;
-     }
-     map = av_strdup(arg);
-     /* parse sync stream first, just pick first matching stream */
-     if (sync = strchr(map, ',')) {
-         *sync = 0;
-         sync_file_idx = strtol(sync + 1, &sync, 0);
-         if (sync_file_idx >= nb_input_files || sync_file_idx < 0) {
-             av_log(NULL, AV_LOG_FATAL, "Invalid sync file index: %d.\n", sync_file_idx);
-             exit_program(1);
-         }
-         if (*sync)
-             sync++;
-         for (i = 0; i < input_files[sync_file_idx]->nb_streams; i++)
-             if (check_stream_specifier(input_files[sync_file_idx]->ctx,
-                                        input_files[sync_file_idx]->ctx->streams[i], sync) == 1) {
-                 sync_stream_idx = i;
-                 break;
-             }
-         if (i == input_files[sync_file_idx]->nb_streams) {
-             av_log(NULL, AV_LOG_FATAL, "Sync stream specification in map %s does not "
-                                        "match any streams.\n", arg);
-             exit_program(1);
+     if (ist->decoding_needed) {
+         AVCodec *codec = ist->dec;
+         if (!codec) {
 -            snprintf(error, error_len, "Decoder (codec id %d) not found for input stream #%d:%d",
 -                    ist->st->codec->codec_id, ist->file_index, ist->st->index);
++            snprintf(error, error_len, "Decoder (codec %s) not found for input stream #%d:%d",
++                    avcodec_get_name(ist->st->codec->codec_id), ist->file_index, ist->st->index);
+             return AVERROR(EINVAL);
          }
-     }
  
-     if (map[0] == '[') {
-         /* this mapping refers to lavfi output */
-         const char *c = map + 1;
-         o->stream_maps = grow_array(o->stream_maps, sizeof(*o->stream_maps),
-                                     &o->nb_stream_maps, o->nb_stream_maps + 1);
-         m = &o->stream_maps[o->nb_stream_maps - 1];
-         m->linklabel = av_get_token(&c, "]");
-         if (!m->linklabel) {
-             av_log(NULL, AV_LOG_ERROR, "Invalid output link label: %s.\n", map);
-             exit_program(1);
 -        /* update requested sample format for the decoder based on the
 -           corresponding encoder sample format */
 -        for (i = 0; i < nb_output_streams; i++) {
 -            OutputStream *ost = output_streams[i];
 -            if (ost->source_index == ist_index) {
 -                update_sample_fmt(ist->st->codec, codec, ost->st->codec);
 -                break;
 -            }
 -        }
 -
 -        if (codec->type == AVMEDIA_TYPE_VIDEO && codec->capabilities & CODEC_CAP_DR1) {
++        ist->dr1 = (codec->capabilities & CODEC_CAP_DR1) && !do_deinterlace;
++        if (codec->type == AVMEDIA_TYPE_VIDEO && ist->dr1) {
+             ist->st->codec->get_buffer     = codec_get_buffer;
+             ist->st->codec->release_buffer = codec_release_buffer;
+             ist->st->codec->opaque         = &ist->buffer_pool;
          }
-     } else {
-         file_idx = strtol(map, &p, 0);
-         if (file_idx >= nb_input_files || file_idx < 0) {
-             av_log(NULL, AV_LOG_FATAL, "Invalid input file index: %d.\n", file_idx);
-             exit_program(1);
+         if (!av_dict_get(ist->opts, "threads", NULL, 0))
+             av_dict_set(&ist->opts, "threads", "auto", 0);
+         if (avcodec_open2(ist->st->codec, codec, &ist->opts) < 0) {
+             snprintf(error, error_len, "Error while opening decoder for input stream #%d:%d",
+                     ist->file_index, ist->st->index);
+             return AVERROR(EINVAL);
          }
-         if (negative)
-             /* disable some already defined maps */
-             for (i = 0; i < o->nb_stream_maps; i++) {
-                 m = &o->stream_maps[i];
-                 if (file_idx == m->file_index &&
-                     check_stream_specifier(input_files[m->file_index]->ctx,
-                                            input_files[m->file_index]->ctx->streams[m->stream_index],
-                                            *p == ':' ? p + 1 : p) > 0)
-                     m->disabled = 1;
-             }
-         else
-             for (i = 0; i < input_files[file_idx]->nb_streams; i++) {
-                 if (check_stream_specifier(input_files[file_idx]->ctx, input_files[file_idx]->ctx->streams[i],
-                             *p == ':' ? p + 1 : p) <= 0)
-                     continue;
-                 o->stream_maps = grow_array(o->stream_maps, sizeof(*o->stream_maps),
-                                             &o->nb_stream_maps, o->nb_stream_maps + 1);
-                 m = &o->stream_maps[o->nb_stream_maps - 1];
-                 m->file_index   = file_idx;
-                 m->stream_index = i;
-                 if (sync_file_idx >= 0) {
-                     m->sync_file_index   = sync_file_idx;
-                     m->sync_stream_index = sync_stream_idx;
-                 } else {
-                     m->sync_file_index   = file_idx;
-                     m->sync_stream_index = i;
-                 }
-             }
+         assert_codec_experimental(ist->st->codec, 0);
+         assert_avoptions(ist->opts);
      }
  
-     if (!m) {
-         av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n", arg);
-         exit_program(1);
-     }
 -    ist->last_dts = ist->st->avg_frame_rate.num ? - ist->st->codec->has_b_frames * AV_TIME_BASE / av_q2d(ist->st->avg_frame_rate) : 0;
++    ist->next_pts = AV_NOPTS_VALUE;
+     ist->next_dts = AV_NOPTS_VALUE;
 -    init_pts_correction(&ist->pts_ctx);
+     ist->is_start = 1;
  
-     av_freep(&map);
      return 0;
  }
  
- static int opt_attach(OptionsContext *o, const char *opt, const char *arg)
+ static InputStream *get_input_stream(OutputStream *ost)
  {
-     o->attachments = grow_array(o->attachments, sizeof(*o->attachments),
-                                 &o->nb_attachments, o->nb_attachments + 1);
-     o->attachments[o->nb_attachments - 1] = arg;
-     return 0;
+     if (ost->source_index >= 0)
+         return input_streams[ost->source_index];
 -
 -    if (ost->filter) {
 -        FilterGraph *fg = ost->filter->graph;
 -        int i;
 -
 -        for (i = 0; i < fg->nb_inputs; i++)
 -            if (fg->inputs[i]->ist->st->codec->codec_type == ost->st->codec->codec_type)
 -                return fg->inputs[i]->ist;
 -    }
 -
+     return NULL;
  }
  
- static int opt_map_channel(OptionsContext *o, const char *opt, const char *arg)
+ static void parse_forced_key_frames(char *kf, OutputStream *ost,
+                                     AVCodecContext *avctx)
  {
-     int n;
-     AVStream *st;
-     AudioChannelMap *m;
-     o->audio_channel_maps =
-         grow_array(o->audio_channel_maps, sizeof(*o->audio_channel_maps),
-                    &o->nb_audio_channel_maps, o->nb_audio_channel_maps + 1);
-     m = &o->audio_channel_maps[o->nb_audio_channel_maps - 1];
-     /* muted channel syntax */
-     n = sscanf(arg, "%d:%d.%d", &m->channel_idx, &m->ofile_idx, &m->ostream_idx);
-     if ((n == 1 || n == 3) && m->channel_idx == -1) {
-         m->file_idx = m->stream_idx = -1;
-         if (n == 1)
-             m->ofile_idx = m->ostream_idx = -1;
-         return 0;
-     }
-     /* normal syntax */
-     n = sscanf(arg, "%d.%d.%d:%d.%d",
-                &m->file_idx,  &m->stream_idx, &m->channel_idx,
-                &m->ofile_idx, &m->ostream_idx);
+     char *p;
+     int n = 1, i;
+     int64_t t;
  
-     if (n != 3 && n != 5) {
-         av_log(NULL, AV_LOG_FATAL, "Syntax error, mapchan usage: "
-                "[file.stream.channel|-1][:syncfile:syncstream]\n");
+     for (p = kf; *p; p++)
+         if (*p == ',')
+             n++;
+     ost->forced_kf_count = n;
+     ost->forced_kf_pts   = av_malloc(sizeof(*ost->forced_kf_pts) * n);
+     if (!ost->forced_kf_pts) {
+         av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
          exit_program(1);
      }
  
-     if (n != 5) // only file.stream.channel specified
-         m->ofile_idx = m->ostream_idx = -1;
+     p = kf;
+     for (i = 0; i < n; i++) {
+         char *next = strchr(p, ',');
  
-     /* check input */
-     if (m->file_idx < 0 || m->file_idx >= nb_input_files) {
-         av_log(NULL, AV_LOG_FATAL, "mapchan: invalid input file index: %d\n",
-                m->file_idx);
-         exit_program(1);
-     }
-     if (m->stream_idx < 0 ||
-         m->stream_idx >= input_files[m->file_idx]->nb_streams) {
-         av_log(NULL, AV_LOG_FATAL, "mapchan: invalid input file stream index #%d.%d\n",
-                m->file_idx, m->stream_idx);
-         exit_program(1);
-     }
-     st = input_files[m->file_idx]->ctx->streams[m->stream_idx];
-     if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO) {
-         av_log(NULL, AV_LOG_FATAL, "mapchan: stream #%d.%d is not an audio stream.\n",
-                m->file_idx, m->stream_idx);
-         exit_program(1);
-     }
-     if (m->channel_idx < 0 || m->channel_idx >= st->codec->channels) {
-         av_log(NULL, AV_LOG_FATAL, "mapchan: invalid audio channel #%d.%d.%d\n",
-                m->file_idx, m->stream_idx, m->channel_idx);
-         exit_program(1);
+         if (next)
+             *next++ = 0;
+         t = parse_time_or_die("force_key_frames", p, 1);
+         ost->forced_kf_pts[i] = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base);
+         p = next;
      }
-     return 0;
  }
  
- /**
-  * Parse a metadata specifier in arg.
-  * @param type metadata type is written here -- g(lobal)/s(tream)/c(hapter)/p(rogram)
-  * @param index for type c/p, chapter/program index is written here
-  * @param stream_spec for type s, the stream specifier is written here
-  */
- static void parse_meta_type(char *arg, char *type, int *index, const char **stream_spec)
++static void report_new_stream(int input_index, AVPacket *pkt)
 +{
-     if (*arg) {
-         *type = *arg;
-         switch (*arg) {
-         case 'g':
-             break;
-         case 's':
-             if (*(++arg) && *arg != ':') {
-                 av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", arg);
-                 exit_program(1);
-             }
-             *stream_spec = *arg == ':' ? arg + 1 : "";
-             break;
-         case 'c':
-         case 'p':
-             if (*(++arg) == ':')
-                 *index = strtol(++arg, NULL, 0);
-             break;
-         default:
-             av_log(NULL, AV_LOG_FATAL, "Invalid metadata type %c.\n", *arg);
-             exit_program(1);
-         }
-     } else
-         *type = 'g';
++    InputFile *file = input_files[input_index];
++    AVStream *st = file->ctx->streams[pkt->stream_index];
++
++    if (pkt->stream_index < file->nb_streams_warn)
++        return;
++    av_log(file->ctx, AV_LOG_WARNING,
++           "New %s stream %d:%d at pos:%"PRId64" and DTS:%ss\n",
++           av_get_media_type_string(st->codec->codec_type),
++           input_index, pkt->stream_index,
++           pkt->pos, av_ts2timestr(pkt->dts, &st->time_base));
++    file->nb_streams_warn = pkt->stream_index + 1;
 +}
 +
- static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFormatContext *ic, OptionsContext *o)
- {
-     AVDictionary **meta_in = NULL;
-     AVDictionary **meta_out = NULL;
-     int i, ret = 0;
-     char type_in, type_out;
-     const char *istream_spec = NULL, *ostream_spec = NULL;
-     int idx_in = 0, idx_out = 0;
-     parse_meta_type(inspec,  &type_in,  &idx_in,  &istream_spec);
-     parse_meta_type(outspec, &type_out, &idx_out, &ostream_spec);
-     if (!ic) {
-         if (type_out == 'g' || !*outspec)
-             o->metadata_global_manual = 1;
-         if (type_out == 's' || !*outspec)
-             o->metadata_streams_manual = 1;
-         if (type_out == 'c' || !*outspec)
-             o->metadata_chapters_manual = 1;
-         return 0;
-     }
+ static int transcode_init(void)
+ {
+     int ret = 0, i, j, k;
+     AVFormatContext *oc;
 -    AVCodecContext *codec, *icodec;
++    AVCodecContext *codec, *icodec = NULL;
+     OutputStream *ost;
+     InputStream *ist;
+     char error[1024];
+     int want_sdp = 1;
  
-     if (type_in == 'g' || type_out == 'g')
-         o->metadata_global_manual = 1;
-     if (type_in == 's' || type_out == 's')
-         o->metadata_streams_manual = 1;
-     if (type_in == 'c' || type_out == 'c')
-         o->metadata_chapters_manual = 1;
- #define METADATA_CHECK_INDEX(index, nb_elems, desc)\
-     if ((index) < 0 || (index) >= (nb_elems)) {\
-         av_log(NULL, AV_LOG_FATAL, "Invalid %s index %d while processing metadata maps.\n",\
-                 (desc), (index));\
-         exit_program(1);\
+     /* init framerate emulation */
+     for (i = 0; i < nb_input_files; i++) {
+         InputFile *ifile = input_files[i];
+         if (ifile->rate_emu)
+             for (j = 0; j < ifile->nb_streams; j++)
+                 input_streams[j + ifile->ist_index]->start = av_gettime();
      }
  
- #define SET_DICT(type, meta, context, index)\
-         switch (type) {\
-         case 'g':\
-             meta = &context->metadata;\
-             break;\
-         case 'c':\
-             METADATA_CHECK_INDEX(index, context->nb_chapters, "chapter")\
-             meta = &context->chapters[index]->metadata;\
-             break;\
-         case 'p':\
-             METADATA_CHECK_INDEX(index, context->nb_programs, "program")\
-             meta = &context->programs[index]->metadata;\
-             break;\
-         default: av_assert0(0);\
-         }\
-     SET_DICT(type_in, meta_in, ic, idx_in);
-     SET_DICT(type_out, meta_out, oc, idx_out);
-     /* for input streams choose first matching stream */
-     if (type_in == 's') {
-         for (i = 0; i < ic->nb_streams; i++) {
-             if ((ret = check_stream_specifier(ic, ic->streams[i], istream_spec)) > 0) {
-                 meta_in = &ic->streams[i]->metadata;
-                 break;
-             } else if (ret < 0)
-                 exit_program(1);
-         }
-         if (!meta_in) {
-             av_log(NULL, AV_LOG_FATAL, "Stream specifier %s does not match  any streams.\n", istream_spec);
-             exit_program(1);
+     /* output stream init */
+     for (i = 0; i < nb_output_files; i++) {
+         oc = output_files[i]->ctx;
+         if (!oc->nb_streams && !(oc->oformat->flags & AVFMT_NOSTREAMS)) {
+             av_dump_format(oc, i, oc->filename, 1);
+             av_log(NULL, AV_LOG_ERROR, "Output file #%d does not contain any stream\n", i);
+             return AVERROR(EINVAL);
          }
      }
  
-     if (type_out == 's') {
-         for (i = 0; i < oc->nb_streams; i++) {
-             if ((ret = check_stream_specifier(oc, oc->streams[i], ostream_spec)) > 0) {
-                 meta_out = &oc->streams[i]->metadata;
-                 av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE);
-             } else if (ret < 0)
-                 exit_program(1);
-         }
-     } else
-         av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE);
+     /* init complex filtergraphs */
+     for (i = 0; i < nb_filtergraphs; i++)
+         if ((ret = avfilter_graph_config(filtergraphs[i]->graph, NULL)) < 0)
+             return ret;
  
-     return 0;
- }
+     /* for each output stream, we compute the right encoding parameters */
+     for (i = 0; i < nb_output_streams; i++) {
+         ost = output_streams[i];
+         oc  = output_files[ost->file_index]->ctx;
+         ist = get_input_stream(ost);
  
- static int opt_recording_timestamp(OptionsContext *o, const char *opt, const char *arg)
- {
-     char buf[128];
-     int64_t recording_timestamp = parse_time_or_die(opt, arg, 0) / 1E6;
-     struct tm time = *gmtime((time_t*)&recording_timestamp);
-     strftime(buf, sizeof(buf), "creation_time=%FT%T%z", &time);
-     parse_option(o, "metadata", buf, options);
-     av_log(NULL, AV_LOG_WARNING, "%s is deprecated, set the 'creation_time' metadata "
-                                  "tag instead.\n", opt);
-     return 0;
- }
+         if (ost->attachment_filename)
+             continue;
  
- static AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder)
- {
-     const char *codec_string = encoder ? "encoder" : "decoder";
-     AVCodec *codec;
+         codec  = ost->st->codec;
  
-     codec = encoder ?
-         avcodec_find_encoder_by_name(name) :
-         avcodec_find_decoder_by_name(name);
-     if (!codec) {
-         av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name);
-         exit_program(1);
-     }
-     if (codec->type != type) {
-         av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, name);
-         exit_program(1);
-     }
-     return codec;
- }
+         if (ist) {
+             icodec = ist->st->codec;
  
- static AVCodec *choose_decoder(OptionsContext *o, AVFormatContext *s, AVStream *st)
- {
-     char *codec_name = NULL;
-     MATCH_PER_STREAM_OPT(codec_names, str, codec_name, s, st);
-     if (codec_name) {
-         AVCodec *codec = find_codec_or_die(codec_name, st->codec->codec_type, 0);
-         st->codec->codec_id = codec->id;
-         return codec;
-     } else
-         return avcodec_find_decoder(st->codec->codec_id);
- }
+             ost->st->disposition          = ist->st->disposition;
+             codec->bits_per_raw_sample    = icodec->bits_per_raw_sample;
+             codec->chroma_sample_location = icodec->chroma_sample_location;
+         }
  
- /**
-  * Add all the streams from the given input file to the global
-  * list of input streams.
-  */
- static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
- {
-     int i;
-     char *next, *codec_tag = NULL;
+         if (ost->stream_copy) {
+             uint64_t extra_size;
  
-     for (i = 0; i < ic->nb_streams; i++) {
-         AVStream *st = ic->streams[i];
-         AVCodecContext *dec = st->codec;
-         InputStream *ist = av_mallocz(sizeof(*ist));
-         char *framerate = NULL;
+             av_assert0(ist && !ost->filter);
  
-         if (!ist)
-             exit_program(1);
+             extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE;
  
-         input_streams = grow_array(input_streams, sizeof(*input_streams), &nb_input_streams, nb_input_streams + 1);
-         input_streams[nb_input_streams - 1] = ist;
+             if (extra_size > INT_MAX) {
+                 return AVERROR(EINVAL);
+             }
  
-         ist->st = st;
-         ist->file_index = nb_input_files;
-         ist->discard = 1;
-         st->discard  = AVDISCARD_ALL;
-         ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st, choose_decoder(o, ic, st));
+             /* if stream_copy is selected, no need to decode or encode */
+             codec->codec_id   = icodec->codec_id;
+             codec->codec_type = icodec->codec_type;
  
-         ist->ts_scale = 1.0;
-         MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st);
+             if (!codec->codec_tag) {
+                 if (!oc->oformat->codec_tag ||
+                      av_codec_get_id (oc->oformat->codec_tag, icodec->codec_tag) == codec->codec_id ||
+                      av_codec_get_tag(oc->oformat->codec_tag, icodec->codec_id) <= 0)
+                     codec->codec_tag = icodec->codec_tag;
+             }
  
-         MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, ic, st);
-         if (codec_tag) {
-             uint32_t tag = strtol(codec_tag, &next, 0);
-             if (*next)
-                 tag = AV_RL32(codec_tag);
-             st->codec->codec_tag = tag;
-         }
+             codec->bit_rate       = icodec->bit_rate;
+             codec->rc_max_rate    = icodec->rc_max_rate;
+             codec->rc_buffer_size = icodec->rc_buffer_size;
+             codec->field_order    = icodec->field_order;
+             codec->extradata      = av_mallocz(extra_size);
+             if (!codec->extradata) {
+                 return AVERROR(ENOMEM);
+             }
+             memcpy(codec->extradata, icodec->extradata, icodec->extradata_size);
 -            codec->extradata_size = icodec->extradata_size;
 -            if (!copy_tb) {
 -                codec->time_base      = icodec->time_base;
 -                codec->time_base.num *= icodec->ticks_per_frame;
 -                av_reduce(&codec->time_base.num, &codec->time_base.den,
 -                          codec->time_base.num, codec->time_base.den, INT_MAX);
 -            } else
 -                codec->time_base = ist->st->time_base;
++            codec->extradata_size= icodec->extradata_size;
++            codec->bits_per_coded_sample  = icodec->bits_per_coded_sample;
 +
-         ist->dec = choose_decoder(o, ic, st);
++            codec->time_base = ist->st->time_base;
++            /*
++             * Avi is a special case here because it supports variable fps but
++             * having the fps and timebase differe significantly adds quite some
++             * overhead
++             */
++            if(!strcmp(oc->oformat->name, "avi")) {
++                if ( copy_tb<0 && av_q2d(ist->st->r_frame_rate) >= av_q2d(ist->st->avg_frame_rate)
++                               && 0.5/av_q2d(ist->st->r_frame_rate) > av_q2d(ist->st->time_base)
++                               && 0.5/av_q2d(ist->st->r_frame_rate) > av_q2d(icodec->time_base)
++                               && av_q2d(ist->st->time_base) < 1.0/500 && av_q2d(icodec->time_base) < 1.0/500
++                     || copy_tb==2){
++                    codec->time_base.num = ist->st->r_frame_rate.den;
++                    codec->time_base.den = 2*ist->st->r_frame_rate.num;
++                    codec->ticks_per_frame = 2;
++                } else if (   copy_tb<0 && av_q2d(icodec->time_base)*icodec->ticks_per_frame > 2*av_q2d(ist->st->time_base)
++                                 && av_q2d(ist->st->time_base) < 1.0/500
++                    || copy_tb==0){
++                    codec->time_base = icodec->time_base;
++                    codec->time_base.num *= icodec->ticks_per_frame;
++                    codec->time_base.den *= 2;
++                    codec->ticks_per_frame = 2;
++                }
++            } else if(!(oc->oformat->flags & AVFMT_VARIABLE_FPS)
++                      && strcmp(oc->oformat->name, "mov") && strcmp(oc->oformat->name, "mp4") && strcmp(oc->oformat->name, "3gp")
++                      && strcmp(oc->oformat->name, "3g2") && strcmp(oc->oformat->name, "psp") && strcmp(oc->oformat->name, "ipod")
++            ) {
++                if(   copy_tb<0 && av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base)
++                                && av_q2d(ist->st->time_base) < 1.0/500
++                   || copy_tb==0){
++                    codec->time_base = icodec->time_base;
++                    codec->time_base.num *= icodec->ticks_per_frame;
++                }
++            }
 +
-         switch (dec->codec_type) {
-         case AVMEDIA_TYPE_VIDEO:
-             if(!ist->dec)
-                 ist->dec = avcodec_find_decoder(dec->codec_id);
-             if (dec->lowres) {
-                 dec->flags |= CODEC_FLAG_EMU_EDGE;
++            if(ost->frame_rate.num)
++                codec->time_base = av_inv_q(ost->frame_rate);
++
++            av_reduce(&codec->time_base.num, &codec->time_base.den,
++                        codec->time_base.num, codec->time_base.den, INT_MAX);
+             switch (codec->codec_type) {
+             case AVMEDIA_TYPE_AUDIO:
+                 if (audio_volume != 256) {
+                     av_log(NULL, AV_LOG_FATAL, "-acodec copy and -vol are incompatible (frames are not decoded)\n");
+                     exit_program(1);
+                 }
+                 codec->channel_layout     = icodec->channel_layout;
+                 codec->sample_rate        = icodec->sample_rate;
+                 codec->channels           = icodec->channels;
+                 codec->frame_size         = icodec->frame_size;
+                 codec->audio_service_type = icodec->audio_service_type;
+                 codec->block_align        = icodec->block_align;
++                if((codec->block_align == 1 || codec->block_align == 1152) && codec->codec_id == AV_CODEC_ID_MP3)
++                    codec->block_align= 0;
++                if(codec->codec_id == AV_CODEC_ID_AC3)
++                    codec->block_align= 0;
+                 break;
+             case AVMEDIA_TYPE_VIDEO:
+                 codec->pix_fmt            = icodec->pix_fmt;
+                 codec->width              = icodec->width;
+                 codec->height             = icodec->height;
+                 codec->has_b_frames       = icodec->has_b_frames;
+                 if (!codec->sample_aspect_ratio.num) {
+                     codec->sample_aspect_ratio   =
+                     ost->st->sample_aspect_ratio =
+                         ist->st->sample_aspect_ratio.num ? ist->st->sample_aspect_ratio :
+                         ist->st->codec->sample_aspect_ratio.num ?
+                         ist->st->codec->sample_aspect_ratio : (AVRational){0, 1};
+                 }
++                ost->st->avg_frame_rate = ist->st->avg_frame_rate;
+                 break;
+             case AVMEDIA_TYPE_SUBTITLE:
+                 codec->width  = icodec->width;
+                 codec->height = icodec->height;
+                 break;
+             case AVMEDIA_TYPE_DATA:
+             case AVMEDIA_TYPE_ATTACHMENT:
+                 break;
+             default:
+                 abort();
+             }
+         } else {
++            if (!ost->enc)
++                ost->enc = avcodec_find_encoder(codec->codec_id);
+             if (!ost->enc) {
+                 /* should only happen when a default codec is not present. */
 -                snprintf(error, sizeof(error), "Automatic encoder selection "
 -                         "failed for output stream #%d:%d. Default encoder for "
 -                         "format %s is probably disabled. Please choose an "
 -                         "encoder manually.\n", ost->file_index, ost->index,
 -                         oc->oformat->name);
++                snprintf(error, sizeof(error), "Encoder (codec %s) not found for output stream #%d:%d",
++                         avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index);
+                 ret = AVERROR(EINVAL);
+                 goto dump_format;
              }
  
-             ist->resample_height  = dec->height;
-             ist->resample_width   = dec->width;
-             ist->resample_pix_fmt = dec->pix_fmt;
+             if (ist)
+                 ist->decoding_needed = 1;
+             ost->encoding_needed = 1;
  
-             MATCH_PER_STREAM_OPT(frame_rates, str, framerate, ic, st);
-             if (framerate && av_parse_video_rate(&ist->framerate,
-                                                  framerate) < 0) {
-                 av_log(NULL, AV_LOG_ERROR, "Error parsing framerate %s.\n",
-                        framerate);
-                 exit_program(1);
 -            /*
 -             * We want CFR output if and only if one of those is true:
 -             * 1) user specified output framerate with -r
 -             * 2) user specified -vsync cfr
 -             * 3) output format is CFR and the user didn't force vsync to
 -             *    something else than CFR
 -             *
 -             * in such a case, set ost->frame_rate
 -             */
 -            if (codec->codec_type == AVMEDIA_TYPE_VIDEO &&
 -                !ost->frame_rate.num && ist &&
 -                (video_sync_method ==  VSYNC_CFR ||
 -                 (video_sync_method ==  VSYNC_AUTO &&
 -                  !(oc->oformat->flags & (AVFMT_NOTIMESTAMPS | AVFMT_VARIABLE_FPS))))) {
 -                ost->frame_rate = ist->st->avg_frame_rate.num ? ist->st->avg_frame_rate : (AVRational){25, 1};
 -                if (ost->enc && ost->enc->supported_framerates && !ost->force_fps) {
 -                    int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
 -                    ost->frame_rate = ost->enc->supported_framerates[idx];
 -                }
 -            }
 -
+             if (!ost->filter &&
+                 (codec->codec_type == AVMEDIA_TYPE_VIDEO ||
+                  codec->codec_type == AVMEDIA_TYPE_AUDIO)) {
+                     FilterGraph *fg;
+                     fg = init_simple_filtergraph(ist, ost);
+                     if (configure_filtergraph(fg)) {
+                         av_log(NULL, AV_LOG_FATAL, "Error opening filters!\n");
+                         exit(1);
+                     }
              }
  
-             ist->top_field_first = -1;
-             MATCH_PER_STREAM_OPT(top_field_first, i, ist->top_field_first, ic, st);
++            if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
++                if (ost->filter && !ost->frame_rate.num)
++                    ost->frame_rate = av_buffersink_get_frame_rate(ost->filter->filter);
++                if (ist && !ost->frame_rate.num)
++                    ost->frame_rate = ist->st->r_frame_rate.num ? ist->st->r_frame_rate : (AVRational){25, 1};
++//                    ost->frame_rate = ist->st->avg_frame_rate.num ? ist->st->avg_frame_rate : (AVRational){25, 1};
++                if (ost->enc && ost->enc->supported_framerates && !ost->force_fps) {
++                    int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
++                    ost->frame_rate = ost->enc->supported_framerates[idx];
++                }
++            }
 +
-             break;
-         case AVMEDIA_TYPE_AUDIO:
-             guess_input_channel_layout(ist);
+             switch (codec->codec_type) {
+             case AVMEDIA_TYPE_AUDIO:
+                 codec->sample_fmt     = ost->filter->filter->inputs[0]->format;
+                 codec->sample_rate    = ost->filter->filter->inputs[0]->sample_rate;
+                 codec->channel_layout = ost->filter->filter->inputs[0]->channel_layout;
+                 codec->channels       = av_get_channel_layout_nb_channels(codec->channel_layout);
+                 codec->time_base      = (AVRational){ 1, codec->sample_rate };
+                 break;
+             case AVMEDIA_TYPE_VIDEO:
 -                codec->time_base = ost->filter->filter->inputs[0]->time_base;
++                codec->time_base = av_inv_q(ost->frame_rate);
++                if (ost->filter && !(codec->time_base.num && codec->time_base.den))
++                    codec->time_base = ost->filter->filter->inputs[0]->time_base;
++                if (   av_q2d(codec->time_base) < 0.001 && video_sync_method != VSYNC_PASSTHROUGH
++                   && (video_sync_method == VSYNC_CFR || (video_sync_method == VSYNC_AUTO && !(oc->oformat->flags & AVFMT_VARIABLE_FPS)))){
++                    av_log(oc, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n"
++                                               "Please consider specifying a lower framerate, a different muxer or -vsync 2\n");
++                }
++                for (j = 0; j < ost->forced_kf_count; j++)
++                    ost->forced_kf_pts[j] = av_rescale_q(ost->forced_kf_pts[j],
++                                                         AV_TIME_BASE_Q,
++                                                         codec->time_base);
+                 codec->width  = ost->filter->filter->inputs[0]->w;
+                 codec->height = ost->filter->filter->inputs[0]->h;
+                 codec->sample_aspect_ratio = ost->st->sample_aspect_ratio =
+                     ost->frame_aspect_ratio ? // overridden by the -aspect cli option
+                     av_d2q(ost->frame_aspect_ratio * codec->height/codec->width, 255) :
+                     ost->filter->filter->inputs[0]->sample_aspect_ratio;
+                 codec->pix_fmt = ost->filter->filter->inputs[0]->format;
 -                if (codec->width   != icodec->width  ||
++                if (!icodec ||
++                    codec->width   != icodec->width  ||
+                     codec->height  != icodec->height ||
+                     codec->pix_fmt != icodec->pix_fmt) {
 -                    codec->bits_per_raw_sample = 0;
++                    codec->bits_per_raw_sample = frame_bits_per_raw_sample;
+                 }
  
-             ist->resample_sample_fmt     = dec->sample_fmt;
-             ist->resample_sample_rate    = dec->sample_rate;
-             ist->resample_channels       = dec->channels;
-             ist->resample_channel_layout = dec->channel_layout;
+                 if (ost->forced_keyframes)
+                     parse_forced_key_frames(ost->forced_keyframes, ost,
+                                             ost->st->codec);
+                 break;
+             case AVMEDIA_TYPE_SUBTITLE:
+                 codec->time_base = (AVRational){1, 1000};
+                 break;
+             default:
+                 abort();
+                 break;
+             }
+             /* two pass mode */
 -            if ((codec->flags & (CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2))) {
++            if (codec->flags & (CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2)) {
+                 char logfilename[1024];
+                 FILE *f;
  
-             break;
-         case AVMEDIA_TYPE_DATA:
-         case AVMEDIA_TYPE_SUBTITLE:
-             if(!ist->dec)
-                 ist->dec = avcodec_find_decoder(dec->codec_id);
-             break;
-         case AVMEDIA_TYPE_ATTACHMENT:
-         case AVMEDIA_TYPE_UNKNOWN:
-             break;
-         default:
-             abort();
+                 snprintf(logfilename, sizeof(logfilename), "%s-%d.log",
+                          pass_logfilename_prefix ? pass_logfilename_prefix : DEFAULT_PASS_LOGFILENAME_PREFIX,
+                          i);
+                 if (!strcmp(ost->enc->name, "libx264")) {
+                     av_dict_set(&ost->opts, "stats", logfilename, AV_DICT_DONT_OVERWRITE);
+                 } else {
 -                    if (codec->flags & CODEC_FLAG_PASS1) {
 -                        f = fopen(logfilename, "wb");
 -                        if (!f) {
 -                            av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n",
 -                                   logfilename, strerror(errno));
 -                            exit_program(1);
 -                        }
 -                        ost->logfile = f;
 -                    } else {
++                    if (codec->flags & CODEC_FLAG_PASS2) {
+                         char  *logbuffer;
+                         size_t logbuffer_size;
+                         if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
+                             av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n",
+                                    logfilename);
+                             exit_program(1);
+                         }
+                         codec->stats_in = logbuffer;
+                     }
++                    if (codec->flags & CODEC_FLAG_PASS1) {
++                        f = fopen(logfilename, "wb");
++                        if (!f) {
++                            av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n",
++                                logfilename, strerror(errno));
++                            exit_program(1);
++                        }
++                        ost->logfile = f;
++                    }
+                 }
+             }
          }
      }
- }
  
- static void assert_file_overwrite(const char *filename)
- {
-     if ((!file_overwrite || no_file_overwrite) &&
-         (strchr(filename, ':') == NULL || filename[1] == ':' ||
-          av_strstart(filename, "file:", NULL))) {
-         if (avio_check(filename, 0) == 0) {
-             if (stdin_interaction && (!no_file_overwrite || file_overwrite)) {
-                 fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
-                 fflush(stderr);
-                 term_exit();
-                 signal(SIGINT, SIG_DFL);
-                 if (!read_yesno()) {
-                     av_log(NULL, AV_LOG_FATAL, "Not overwriting - exiting\n");
-                     exit_program(1);
+     /* open each encoder */
+     for (i = 0; i < nb_output_streams; i++) {
+         ost = output_streams[i];
+         if (ost->encoding_needed) {
+             AVCodec      *codec = ost->enc;
+             AVCodecContext *dec = NULL;
+             if ((ist = get_input_stream(ost)))
+                 dec = ist->st->codec;
+             if (dec && dec->subtitle_header) {
 -                ost->st->codec->subtitle_header = av_malloc(dec->subtitle_header_size);
++                /* ASS code assumes this buffer is null terminated so add extra byte. */
++                ost->st->codec->subtitle_header = av_mallocz(dec->subtitle_header_size + 1);
+                 if (!ost->st->codec->subtitle_header) {
+                     ret = AVERROR(ENOMEM);
+                     goto dump_format;
                  }
-                 term_init();
+                 memcpy(ost->st->codec->subtitle_header, dec->subtitle_header, dec->subtitle_header_size);
+                 ost->st->codec->subtitle_header_size = dec->subtitle_header_size;
              }
-             else {
-                 av_log(NULL, AV_LOG_FATAL, "File '%s' already exists. Exiting.\n", filename);
-                 exit_program(1);
+             if (!av_dict_get(ost->opts, "threads", NULL, 0))
+                 av_dict_set(&ost->opts, "threads", "auto", 0);
+             if (avcodec_open2(ost->st->codec, codec, &ost->opts) < 0) {
+                 snprintf(error, sizeof(error), "Error while opening encoder for output stream #%d:%d - maybe incorrect parameters such as bit_rate, rate, width or height",
+                         ost->file_index, ost->index);
+                 ret = AVERROR(EINVAL);
+                 goto dump_format;
              }
-         }
-     }
- }
- static void dump_attachment(AVStream *st, const char *filename)
- {
-     int ret;
-     AVIOContext *out = NULL;
-     AVDictionaryEntry *e;
++            if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
++                !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
++                av_buffersink_set_frame_size(ost->filter->filter,
++                                             ost->st->codec->frame_size);
+             assert_codec_experimental(ost->st->codec, 1);
+             assert_avoptions(ost->opts);
+             if (ost->st->codec->bit_rate && ost->st->codec->bit_rate < 1000)
+                 av_log(NULL, AV_LOG_WARNING, "The bitrate parameter is set too low."
 -                                             "It takes bits/s as argument, not kbits/s\n");
++                                             " It takes bits/s as argument, not kbits/s\n");
+             extra_size += ost->st->codec->extradata_size;
  
-     if (!st->codec->extradata_size) {
-         av_log(NULL, AV_LOG_WARNING, "No extradata to dump in stream #%d:%d.\n",
-                nb_input_files - 1, st->index);
-         return;
-     }
-     if (!*filename && (e = av_dict_get(st->metadata, "filename", NULL, 0)))
-         filename = e->value;
-     if (!*filename) {
-         av_log(NULL, AV_LOG_FATAL, "No filename specified and no 'filename' tag"
-                "in stream #%d:%d.\n", nb_input_files - 1, st->index);
-         exit_program(1);
+             if (ost->st->codec->me_threshold)
+                 input_streams[ost->source_index]->st->codec->debug |= FF_DEBUG_MV;
+         }
      }
  
-     assert_file_overwrite(filename);
-     if ((ret = avio_open2(&out, filename, AVIO_FLAG_WRITE, &int_cb, NULL)) < 0) {
-         av_log(NULL, AV_LOG_FATAL, "Could not open file %s for writing.\n",
-                filename);
-         exit_program(1);
-     }
+     /* init input streams */
+     for (i = 0; i < nb_input_streams; i++)
+         if ((ret = init_input_stream(i, error, sizeof(error))) < 0)
+             goto dump_format;
  
-     avio_write(out, st->codec->extradata, st->codec->extradata_size);
-     avio_flush(out);
-     avio_close(out);
- }
+     /* discard unused programs */
+     for (i = 0; i < nb_input_files; i++) {
+         InputFile *ifile = input_files[i];
+         for (j = 0; j < ifile->ctx->nb_programs; j++) {
+             AVProgram *p = ifile->ctx->programs[j];
+             int discard  = AVDISCARD_ALL;
  
- static int opt_input_file(OptionsContext *o, const char *opt, const char *filename)
- {
-     AVFormatContext *ic;
-     AVInputFormat *file_iformat = NULL;
-     int err, i, ret;
-     int64_t timestamp;
-     uint8_t buf[128];
-     AVDictionary **opts;
-     int orig_nb_streams;                     // number of streams before avformat_find_stream_info
-     if (o->format) {
-         if (!(file_iformat = av_find_input_format(o->format))) {
-             av_log(NULL, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format);
-             exit_program(1);
+             for (k = 0; k < p->nb_stream_indexes; k++)
+                 if (!input_streams[ifile->ist_index + p->stream_index[k]]->discard) {
+                     discard = AVDISCARD_DEFAULT;
+                     break;
+                 }
+             p->discard = discard;
          }
      }
  
-     if (!strcmp(filename, "-"))
-         filename = "pipe:";
-     stdin_interaction &= strncmp(filename, "pipe:", 5) &&
-                          strcmp(filename, "/dev/stdin");
-     /* get default parameters from command line */
-     ic = avformat_alloc_context();
-     if (!ic) {
-         print_error(filename, AVERROR(ENOMEM));
-         exit_program(1);
-     }
-     if (o->nb_audio_sample_rate) {
-         snprintf(buf, sizeof(buf), "%d", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i);
-         av_dict_set(&format_opts, "sample_rate", buf, 0);
-     }
-     if (o->nb_audio_channels) {
-         /* because we set audio_channels based on both the "ac" and
-          * "channel_layout" options, we need to check that the specified
-          * demuxer actually has the "channels" option before setting it */
-         if (file_iformat && file_iformat->priv_class &&
-             av_opt_find(&file_iformat->priv_class, "channels", NULL, 0,
-                         AV_OPT_SEARCH_FAKE_OBJ)) {
-             snprintf(buf, sizeof(buf), "%d",
-                      o->audio_channels[o->nb_audio_channels - 1].u.i);
-             av_dict_set(&format_opts, "channels", buf, 0);
+     /* open files and write file headers */
+     for (i = 0; i < nb_output_files; i++) {
+         oc = output_files[i]->ctx;
+         oc->interrupt_callback = int_cb;
+         if ((ret = avformat_write_header(oc, &output_files[i]->opts)) < 0) {
+             char errbuf[128];
+             const char *errbuf_ptr = errbuf;
+             if (av_strerror(ret, errbuf, sizeof(errbuf)) < 0)
+                 errbuf_ptr = strerror(AVUNERROR(ret));
+             snprintf(error, sizeof(error), "Could not write header for output file #%d (incorrect codec parameters ?): %s", i, errbuf_ptr);
+             ret = AVERROR(EINVAL);
+             goto dump_format;
          }
-     }
-     if (o->nb_frame_rates) {
-         /* set the format-level framerate option;
-          * this is important for video grabbers, e.g. x11 */
-         if (file_iformat && file_iformat->priv_class &&
-             av_opt_find(&file_iformat->priv_class, "framerate", NULL, 0,
-                         AV_OPT_SEARCH_FAKE_OBJ)) {
-             av_dict_set(&format_opts, "framerate",
-                         o->frame_rates[o->nb_frame_rates - 1].u.str, 0);
 -        assert_avoptions(output_files[i]->opts);
++//         assert_avoptions(output_files[i]->opts);
+         if (strcmp(oc->oformat->name, "rtp")) {
+             want_sdp = 0;
          }
      }
-     if (o->nb_frame_sizes) {
-         av_dict_set(&format_opts, "video_size", o->frame_sizes[o->nb_frame_sizes - 1].u.str, 0);
-     }
-     if (o->nb_frame_pix_fmts)
-         av_dict_set(&format_opts, "pixel_format", o->frame_pix_fmts[o->nb_frame_pix_fmts - 1].u.str, 0);
-     ic->video_codec_id   = video_codec_name ?
-         find_codec_or_die(video_codec_name   , AVMEDIA_TYPE_VIDEO   , 0)->id : AV_CODEC_ID_NONE;
-     ic->audio_codec_id   = audio_codec_name ?
-         find_codec_or_die(audio_codec_name   , AVMEDIA_TYPE_AUDIO   , 0)->id : AV_CODEC_ID_NONE;
-     ic->subtitle_codec_id= subtitle_codec_name ?
-         find_codec_or_die(subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, 0)->id : AV_CODEC_ID_NONE;
-     ic->flags |= AVFMT_FLAG_NONBLOCK;
-     ic->interrupt_callback = int_cb;
-     /* open the input file with generic avformat function */
-     err = avformat_open_input(&ic, filename, file_iformat, &format_opts);
-     if (err < 0) {
-         print_error(filename, err);
-         exit_program(1);
-     }
-     assert_avoptions(format_opts);
-     /* apply forced codec ids */
-     for (i = 0; i < ic->nb_streams; i++)
-         choose_decoder(o, ic, ic->streams[i]);
  
-     /* Set AVCodecContext options for avformat_find_stream_info */
-     opts = setup_find_stream_info_opts(ic, codec_opts);
-     orig_nb_streams = ic->nb_streams;
-     /* If not enough info to get the stream parameters, we decode the
-        first frames to get it. (used in mpeg case for example) */
-     ret = avformat_find_stream_info(ic, opts);
-     if (ret < 0) {
-         av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename);
-         avformat_close_input(&ic);
-         exit_program(1);
+  dump_format:
+     /* dump the file output parameters - cannot be done before in case
+        of stream copy */
+     for (i = 0; i < nb_output_files; i++) {
+         av_dump_format(output_files[i]->ctx, i, output_files[i]->ctx->filename, 1);
      }
  
-     timestamp = o->start_time;
-     /* add the stream start time */
-     if (ic->start_time != AV_NOPTS_VALUE)
-         timestamp += ic->start_time;
+     /* dump the stream mapping */
+     av_log(NULL, AV_LOG_INFO, "Stream mapping:\n");
+     for (i = 0; i < nb_input_streams; i++) {
+         ist = input_streams[i];
  
-     /* if seeking requested, we execute it */
-     if (o->start_time != 0) {
-         ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD);
-         if (ret < 0) {
-             av_log(NULL, AV_LOG_WARNING, "%s: could not seek to position %0.3f\n",
-                    filename, (double)timestamp / AV_TIME_BASE);
+         for (j = 0; j < ist->nb_filters; j++) {
+             if (ist->filters[j]->graph->graph_desc) {
+                 av_log(NULL, AV_LOG_INFO, "  Stream #%d:%d (%s) -> %s",
+                        ist->file_index, ist->st->index, ist->dec ? ist->dec->name : "?",
+                        ist->filters[j]->name);
+                 if (nb_filtergraphs > 1)
+                     av_log(NULL, AV_LOG_INFO, " (graph %d)", ist->filters[j]->graph->index);
+                 av_log(NULL, AV_LOG_INFO, "\n");
+             }
          }
      }
  
-     /* update the current parameters so that they match the one of the input stream */
-     add_input_streams(o, ic);
-     /* dump the file content */
-     av_dump_format(ic, nb_input_files, filename, 0);
-     input_files = grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1);
-     if (!(input_files[nb_input_files - 1] = av_mallocz(sizeof(*input_files[0]))))
-         exit_program(1);
-     input_files[nb_input_files - 1]->ctx        = ic;
-     input_files[nb_input_files - 1]->ist_index  = nb_input_streams - ic->nb_streams;
-     input_files[nb_input_files - 1]->ts_offset  = o->input_ts_offset - (copy_ts ? 0 : timestamp);
-     input_files[nb_input_files - 1]->nb_streams = ic->nb_streams;
-     input_files[nb_input_files - 1]->rate_emu   = o->rate_emu;
-     for (i = 0; i < o->nb_dump_attachment; i++) {
-         int j;
-         for (j = 0; j < ic->nb_streams; j++) {
-             AVStream *st = ic->streams[j];
+     for (i = 0; i < nb_output_streams; i++) {
+         ost = output_streams[i];
  
-             if (check_stream_specifier(ic, st, o->dump_attachment[i].specifier) == 1)
-                 dump_attachment(st, o->dump_attachment[i].u.str);
+         if (ost->attachment_filename) {
+             /* an attached file */
+             av_log(NULL, AV_LOG_INFO, "  File %s -> Stream #%d:%d\n",
+                    ost->attachment_filename, ost->file_index, ost->index);
+             continue;
          }
-     }
-     for (i = 0; i < orig_nb_streams; i++)
-         av_dict_free(&opts[i]);
-     av_freep(&opts);
-     reset_options(o, 1);
-     return 0;
- }
- static uint8_t *get_line(AVIOContext *s)
- {
-     AVIOContext *line;
-     uint8_t *buf;
-     char c;
  
-     if (avio_open_dyn_buf(&line) < 0) {
-         av_log(NULL, AV_LOG_FATAL, "Could not alloc buffer for reading preset.\n");
-         exit_program(1);
-     }
-     while ((c = avio_r8(s)) && c != '\n')
-         avio_w8(line, c);
-     avio_w8(line, 0);
-     avio_close_dyn_buf(line, &buf);
-     return buf;
- }
+         if (ost->filter && ost->filter->graph->graph_desc) {
+             /* output from a complex graph */
+             av_log(NULL, AV_LOG_INFO, "  %s", ost->filter->name);
+             if (nb_filtergraphs > 1)
+                 av_log(NULL, AV_LOG_INFO, " (graph %d)", ost->filter->graph->index);
  
- static int get_preset_file_2(const char *preset_name, const char *codec_name, AVIOContext **s)
- {
-     int i, ret = 1;
-     char filename[1000];
-     const char *base[3] = { getenv("AVCONV_DATADIR"),
-                             getenv("HOME"),
-                             AVCONV_DATADIR,
-                             };
-     for (i = 0; i < FF_ARRAY_ELEMS(base) && ret; i++) {
-         if (!base[i])
+             av_log(NULL, AV_LOG_INFO, " -> Stream #%d:%d (%s)\n", ost->file_index,
+                    ost->index, ost->enc ? ost->enc->name : "?");
              continue;
-         if (codec_name) {
-             snprintf(filename, sizeof(filename), "%s%s/%s-%s.avpreset", base[i],
-                      i != 1 ? "" : "/.avconv", codec_name, preset_name);
-             ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL);
-         }
-         if (ret) {
-             snprintf(filename, sizeof(filename), "%s%s/%s.avpreset", base[i],
-                      i != 1 ? "" : "/.avconv", preset_name);
-             ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL);
          }
-     }
-     return ret;
- }
- static void choose_encoder(OptionsContext *o, AVFormatContext *s, OutputStream *ost)
- {
-     char *codec_name = NULL;
-     MATCH_PER_STREAM_OPT(codec_names, str, codec_name, s, ost->st);
-     if (!codec_name) {
-         ost->st->codec->codec_id = av_guess_codec(s->oformat, NULL, s->filename,
-                                                   NULL, ost->st->codec->codec_type);
-         ost->enc = avcodec_find_encoder(ost->st->codec->codec_id);
-     } else if (!strcmp(codec_name, "copy"))
-         ost->stream_copy = 1;
-     else {
-         ost->enc = find_codec_or_die(codec_name, ost->st->codec->codec_type, 1);
-         ost->st->codec->codec_id = ost->enc->id;
-     }
- }
  
- static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, enum AVMediaType type, int source_index)
- {
-     OutputStream *ost;
-     AVStream *st = avformat_new_stream(oc, NULL);
-     int idx      = oc->nb_streams - 1, ret = 0;
-     char *bsf = NULL, *next, *codec_tag = NULL;
-     AVBitStreamFilterContext *bsfc, *bsfc_prev = NULL;
-     double qscale = -1;
-     char *buf = NULL, *arg = NULL, *preset = NULL;
-     AVIOContext *s = NULL;
-     if (!st) {
-         av_log(NULL, AV_LOG_FATAL, "Could not alloc stream.\n");
-         exit_program(1);
+         av_log(NULL, AV_LOG_INFO, "  Stream #%d:%d -> #%d:%d",
+                input_streams[ost->source_index]->file_index,
+                input_streams[ost->source_index]->st->index,
+                ost->file_index,
+                ost->index);
+         if (ost->sync_ist != input_streams[ost->source_index])
+             av_log(NULL, AV_LOG_INFO, " [sync #%d:%d]",
+                    ost->sync_ist->file_index,
+                    ost->sync_ist->st->index);
+         if (ost->stream_copy)
+             av_log(NULL, AV_LOG_INFO, " (copy)");
+         else
+             av_log(NULL, AV_LOG_INFO, " (%s -> %s)", input_streams[ost->source_index]->dec ?
+                    input_streams[ost->source_index]->dec->name : "?",
+                    ost->enc ? ost->enc->name : "?");
+         av_log(NULL, AV_LOG_INFO, "\n");
      }
  
-     if (oc->nb_streams - 1 < o->nb_streamid_map)
-         st->id = o->streamid_map[oc->nb_streams - 1];
-     output_streams = grow_array(output_streams, sizeof(*output_streams), &nb_output_streams,
-                                 nb_output_streams + 1);
-     if (!(ost = av_mallocz(sizeof(*ost))))
-         exit_program(1);
-     output_streams[nb_output_streams - 1] = ost;
-     ost->file_index = nb_output_files;
-     ost->index      = idx;
-     ost->st         = st;
-     st->codec->codec_type = type;
-     choose_encoder(o, oc, ost);
-     if (ost->enc) {
-         ost->opts  = filter_codec_opts(codec_opts, ost->enc->id, oc, st, ost->enc);
+     if (ret) {
+         av_log(NULL, AV_LOG_ERROR, "%s\n", error);
+         return ret;
      }
  
-     avcodec_get_context_defaults3(st->codec, ost->enc);
-     st->codec->codec_type = type; // XXX hack, avcodec_get_context_defaults2() sets type to unknown for stream copy
-     MATCH_PER_STREAM_OPT(presets, str, preset, oc, st);
-     if (preset && (!(ret = get_preset_file_2(preset, ost->enc->name, &s)))) {
-         do  {
-             buf = get_line(s);
-             if (!buf[0] || buf[0] == '#') {
-                 av_free(buf);
-                 continue;
-             }
-             if (!(arg = strchr(buf, '='))) {
-                 av_log(NULL, AV_LOG_FATAL, "Invalid line found in the preset file.\n");
-                 exit_program(1);
-             }
-             *arg++ = 0;
-             av_dict_set(&ost->opts, buf, arg, AV_DICT_DONT_OVERWRITE);
-             av_free(buf);
-         } while (!s->eof_reached);
-         avio_close(s);
-     }
-     if (ret) {
-         av_log(NULL, AV_LOG_FATAL,
-                "Preset %s specified for stream %d:%d, but could not be opened.\n",
-                preset, ost->file_index, ost->index);
-         exit_program(1);
+     if (want_sdp) {
+         print_sdp();
      }
  
-     ost->max_frames = INT64_MAX;
-     MATCH_PER_STREAM_OPT(max_frames, i64, ost->max_frames, oc, st);
+     return 0;
+ }
  
-     MATCH_PER_STREAM_OPT(bitstream_filters, str, bsf, oc, st);
-     while (bsf) {
-         if (next = strchr(bsf, ','))
-             *next++ = 0;
-         if (!(bsfc = av_bitstream_filter_init(bsf))) {
-             av_log(NULL, AV_LOG_FATAL, "Unknown bitstream filter %s\n", bsf);
-             exit_program(1);
-         }
-         if (bsfc_prev)
-             bsfc_prev->next = bsfc;
-         else
-             ost->bitstream_filters = bsfc;
+ /**
+  * @return 1 if there are still streams where more output is wanted,
+  *         0 otherwise
+  */
+ static int need_output(void)
+ {
+     int i;
  
-         bsfc_prev = bsfc;
-         bsf       = next;
-     }
+     for (i = 0; i < nb_output_streams; i++) {
+         OutputStream *ost    = output_streams[i];
+         OutputFile *of       = output_files[ost->file_index];
+         AVFormatContext *os  = output_files[ost->file_index]->ctx;
  
-     MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, oc, st);
-     if (codec_tag) {
-         uint32_t tag = strtol(codec_tag, &next, 0);
-         if (*next)
-             tag = AV_RL32(codec_tag);
-         st->codec->codec_tag = tag;
-     }
+         if (ost->is_past_recording_time ||
+             (os->pb && avio_tell(os->pb) >= of->limit_filesize))
+             continue;
+         if (ost->frame_number >= ost->max_frames) {
+             int j;
+             for (j = 0; j < of->ctx->nb_streams; j++)
+                 output_streams[of->ost_index + j]->is_past_recording_time = 1;
+             continue;
+         }
  
-     MATCH_PER_STREAM_OPT(qscale, dbl, qscale, oc, st);
-     if (qscale >= 0 || same_quant) {
-         st->codec->flags |= CODEC_FLAG_QSCALE;
-         st->codec->global_quality = FF_QP2LAMBDA * qscale;
+         return 1;
      }
  
-     if (oc->oformat->flags & AVFMT_GLOBALHEADER)
-         st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
-     av_opt_get_int(sws_opts, "sws_flags", 0, &ost->sws_flags);
-     av_opt_get_int   (swr_opts, "dither_method", 0, &ost->swr_dither_method);
-     av_opt_get_double(swr_opts, "dither_scale" , 0, &ost->swr_dither_scale);
-     ost->source_index = source_index;
-     if (source_index >= 0) {
-         ost->sync_ist = input_streams[source_index];
-         input_streams[source_index]->discard = 0;
-         input_streams[source_index]->st->discard = AVDISCARD_NONE;
-     }
+     return 0;
+ }
  
-     return ost;
 -static int select_input_file(uint8_t *no_packet)
++static int input_acceptable(InputStream *ist)
+ {
 -    int64_t ipts_min = INT64_MAX;
 -    int i, file_index = -1;
 -
 -    for (i = 0; i < nb_input_streams; i++) {
 -        InputStream *ist = input_streams[i];
 -        int64_t ipts     = ist->last_dts;
++    av_assert1(!ist->discard);
++    return !input_files[ist->file_index]->unavailable &&
++           !input_files[ist->file_index]->eof_reached;
 +}
  
- static void parse_matrix_coeffs(uint16_t *dest, const char *str)
 -        if (ist->discard || no_packet[ist->file_index])
 -            continue;
 -        if (!input_files[ist->file_index]->eof_reached) {
 -            if (ipts < ipts_min) {
 -                ipts_min = ipts;
++static int find_graph_input(FilterGraph *graph)
 +{
-     int i;
-     const char *p = str;
-     for (i = 0;; i++) {
-         dest[i] = atoi(p);
-         if (i == 63)
-             break;
-         p = strchr(p, ',');
-         if (!p) {
-             av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
-             exit_program(1);
++    int i, nb_req_max = 0, file_index = -1;
++
++    for (i = 0; i < graph->nb_inputs; i++) {
++        int nb_req = av_buffersrc_get_nb_failed_requests(graph->inputs[i]->filter);
++        if (nb_req > nb_req_max) {
++            InputStream *ist = graph->inputs[i]->ist;
++            if (input_acceptable(ist)) {
++                nb_req_max = nb_req;
+                 file_index = ist->file_index;
+             }
          }
-         p++;
      }
+     return file_index;
  }
  
- static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, int source_index)
++/**
++ * Select the input file to read from.
++ *
++ * @return  >=0 index of the input file to use;
++ *          -1  if no file is acceptable;
++ *          -2  to read from filters without reading from a file
++ */
++static int select_input_file(void)
 +{
-     AVStream *st;
++    int i, ret, nb_active_out = nb_output_streams, ost_index = -1;
++    int64_t opts_min;
 +    OutputStream *ost;
-     AVCodecContext *video_enc;
-     char *frame_rate = NULL;
-     ost = new_output_stream(o, oc, AVMEDIA_TYPE_VIDEO, source_index);
-     st  = ost->st;
-     video_enc = st->codec;
-     MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st);
-     if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) {
-         av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate);
-         exit_program(1);
-     }
-     if (!ost->stream_copy) {
-         const char *p = NULL;
-         char *frame_size = NULL;
-         char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL;
-         char *intra_matrix = NULL, *inter_matrix = NULL;
-         const char *filters = "null";
-         int i;
-         MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st);
-         if (frame_size && av_parse_video_size(&video_enc->width, &video_enc->height, frame_size) < 0) {
-             av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size);
-             exit_program(1);
-         }
++    AVFilterBufferRef *dummy;
 +
-         MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st);
-         if (frame_aspect_ratio) {
-             AVRational q;
-             if (av_parse_ratio(&q, frame_aspect_ratio, 255, 0, NULL) < 0 ||
-                 q.num <= 0 || q.den <= 0) {
-                 av_log(NULL, AV_LOG_FATAL, "Invalid aspect ratio: %s\n", frame_aspect_ratio);
-                 exit_program(1);
++    for (i = 0; i < nb_output_streams; i++)
++        nb_active_out -= output_streams[i]->unavailable =
++            output_streams[i]->is_past_recording_time;
++    while (nb_active_out) {
++        opts_min = INT64_MAX;
++        ost_index = -1;
++        for (i = 0; i < nb_output_streams; i++) {
++            OutputStream *ost = output_streams[i];
++            int64_t opts = av_rescale_q(ost->st->cur_dts, ost->st->time_base,
++                                        AV_TIME_BASE_Q);
++            if (!ost->unavailable && opts < opts_min) {
++                opts_min  = opts;
++                ost_index = i;
 +            }
-             ost->frame_aspect_ratio = av_q2d(q);
 +        }
++        if (ost_index < 0)
++            return -1;
 +
-         video_enc->bits_per_raw_sample = frame_bits_per_raw_sample;
-         MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st);
-         if (frame_pix_fmt && *frame_pix_fmt == '+') {
-             ost->keep_pix_fmt = 1;
-             if (!*++frame_pix_fmt)
-                 frame_pix_fmt = NULL;
-         }
-         if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == PIX_FMT_NONE) {
-             av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt);
-             exit_program(1);
-         }
-         st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
-         if (intra_only)
-             video_enc->gop_size = 0;
-         MATCH_PER_STREAM_OPT(intra_matrices, str, intra_matrix, oc, st);
-         if (intra_matrix) {
-             if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) {
-                 av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for intra matrix.\n");
-                 exit_program(1);
-             }
-             parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix);
-         }
-         MATCH_PER_STREAM_OPT(inter_matrices, str, inter_matrix, oc, st);
-         if (inter_matrix) {
-             if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) {
-                 av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for inter matrix.\n");
-                 exit_program(1);
-             }
-             parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix);
++        ost = output_streams[ost_index];
++        if (ost->source_index >= 0) {
++            /* ost is directly connected to an input */
++            InputStream *ist = input_streams[ost->source_index];
++            if (input_acceptable(ist))
++                return ist->file_index;
++        } else {
++            /* ost is connected to a complex filtergraph */
++            av_assert1(ost->filter);
++            ret = av_buffersink_get_buffer_ref(ost->filter->filter, &dummy,
++                                               AV_BUFFERSINK_FLAG_PEEK);
++            if (ret >= 0)
++                return -2;
++            ret = find_graph_input(ost->filter->graph);
++            if (ret >= 0)
++                return ret;
 +        }
++        ost->unavailable = 1;
++        nb_active_out--;
++    }
++    return -1;
++}
 +
-         MATCH_PER_STREAM_OPT(rc_overrides, str, p, oc, st);
-         for (i = 0; p; i++) {
-             int start, end, q;
-             int e = sscanf(p, "%d,%d,%d", &start, &end, &q);
-             if (e != 3) {
-                 av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n");
-                 exit_program(1);
-             }
-             /* FIXME realloc failure */
-             video_enc->rc_override =
-                 av_realloc(video_enc->rc_override,
-                            sizeof(RcOverride) * (i + 1));
-             video_enc->rc_override[i].start_frame = start;
-             video_enc->rc_override[i].end_frame   = end;
-             if (q > 0) {
-                 video_enc->rc_override[i].qscale         = q;
-                 video_enc->rc_override[i].quality_factor = 1.0;
-             }
-             else {
-                 video_enc->rc_override[i].qscale         = 0;
-                 video_enc->rc_override[i].quality_factor = -q/100.0;
++static int check_keyboard_interaction(int64_t cur_time)
++{
++    int i, ret, key;
++    static int64_t last_time;
++    if (received_nb_signals)
++        return AVERROR_EXIT;
++    /* read_key() returns 0 on EOF */
++    if(cur_time - last_time >= 100000 && !run_as_daemon){
++        key =  read_key();
++        last_time = cur_time;
++    }else
++        key = -1;
++    if (key == 'q')
++        return AVERROR_EXIT;
++    if (key == '+') av_log_set_level(av_log_get_level()+10);
++    if (key == '-') av_log_set_level(av_log_get_level()-10);
++    if (key == 's') qp_hist     ^= 1;
++    if (key == 'h'){
++        if (do_hex_dump){
++            do_hex_dump = do_pkt_dump = 0;
++        } else if(do_pkt_dump){
++            do_hex_dump = 1;
++        } else
++            do_pkt_dump = 1;
++        av_log_set_level(AV_LOG_DEBUG);
++    }
++    if (key == 'c' || key == 'C'){
++        char buf[4096], target[64], command[256], arg[256] = {0};
++        double time;
++        int k, n = 0;
++        fprintf(stderr, "\nEnter command: <target> <time> <command>[ <argument>]\n");
++        i = 0;
++        while ((k = read_key()) != '\n' && k != '\r' && i < sizeof(buf)-1)
++            if (k > 0)
++                buf[i++] = k;
++        buf[i] = 0;
++        if (k > 0 &&
++            (n = sscanf(buf, "%63[^ ] %lf %255[^ ] %255[^\n]", target, &time, command, arg)) >= 3) {
++            av_log(NULL, AV_LOG_DEBUG, "Processing command target:%s time:%f command:%s arg:%s",
++                   target, time, command, arg);
++            for (i = 0; i < nb_filtergraphs; i++) {
++                FilterGraph *fg = filtergraphs[i];
++                if (fg->graph) {
++                    if (time < 0) {
++                        ret = avfilter_graph_send_command(fg->graph, target, command, arg, buf, sizeof(buf),
++                                                          key == 'c' ? AVFILTER_CMD_FLAG_ONE : 0);
++                        fprintf(stderr, "Command reply for stream %d: ret:%d res:%s\n", i, ret, buf);
++                    } else {
++                        ret = avfilter_graph_queue_command(fg->graph, target, command, arg, 0, time);
++                    }
++                }
 +            }
-             p = strchr(p, '/');
-             if (p) p++;
++        } else {
++            av_log(NULL, AV_LOG_ERROR,
++                   "Parse error, at least 3 arguments were expected, "
++                   "only %d given in string '%s'\n", n, buf);
 +        }
-         video_enc->rc_override_count = i;
-         if (!video_enc->rc_initial_buffer_occupancy)
-             video_enc->rc_initial_buffer_occupancy = video_enc->rc_buffer_size * 3 / 4;
-         video_enc->intra_dc_precision = intra_dc_precision - 8;
-         if (do_psnr)
-             video_enc->flags|= CODEC_FLAG_PSNR;
-         /* two pass mode */
-         if (do_pass) {
-             if (do_pass & 1) {
-                 video_enc->flags |= CODEC_FLAG_PASS1;
-             }
-             if (do_pass & 2) {
-                 video_enc->flags |= CODEC_FLAG_PASS2;
-             }
++    }
++    if (key == 'd' || key == 'D'){
++        int debug=0;
++        if(key == 'D') {
++            debug = input_streams[0]->st->codec->debug<<1;
++            if(!debug) debug = 1;
++            while(debug & (FF_DEBUG_DCT_COEFF|FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) //unsupported, would just crash
++      &n