Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Aug 2011 00:16:44 +0000 (02:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Aug 2011 00:56:08 +0000 (02:56 +0200)
* commit 'b2c087871dafc7d030b2d48457ddff597dfd4925':
  Move x86util.asm from libavcodec/ to libavutil/.
  Move x86inc.asm to libavutil/.
  APIchanges: note error_recognition in lavf
  lavf: add support for error_recognition, use it in avidec, and bump minor API version
  avconv: change semantics of -map
  avconv: get rid of new* options.
  cmdutils: allow precisely specifying a stream for AVOptions.
  configure: add missing CFLAGS to fix building on the HURD
  libx264: Include hint for possible values for configuring libx264
  cmdutils: allow ':'-separated modifiers in option names.
  avconv: make -map_metadata work consistently with the other options
  avconv: remove deprecated options.
  avconv: make -map_chapters accept only the input file index.
  Make a copy of ffmpeg under a new name -- avconv.
  ffmpeg: add a warning stating that the program is deprecated.
  Add weighted motion compensation for RV40 B-frames
  RV3/4: calculate B-frame motion weights once per frame
  Move RV3/4-specific DSP functions into their own context
  mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt
  h264: notice memory allocation failure

Conflicts:
.gitignore
Makefile
cmdutils.c
configure
doc/ffplay.texi
doc/ffprobe.texi
doc/ffserver.texi
libavcodec/libx264.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/version.h
tests/lavf-regression.sh
tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
48 files changed:
1  2 
.gitignore
Makefile
avconv.c
cmdutils.c
cmdutils.h
configure
doc/APIchanges
doc/fftools-common-opts.texi
ffmpeg.c
ffplay.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/h264.c
libavcodec/libx264.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mxpegdec.c
libavcodec/rv30dsp.c
libavcodec/rv34.c
libavcodec/rv34.h
libavcodec/rv40dsp.c
libavcodec/x86/Makefile
libavcodec/x86/ac3dsp.asm
libavcodec/x86/dct32_sse.asm
libavcodec/x86/deinterlace.asm
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/dsputilenc_yasm.asm
libavcodec/x86/fft_mmx.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/vc1dsp_yasm.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm
libavformat/avformat.h
libavformat/avidec.c
libavformat/options.c
libavformat/version.h
libavutil/x86/x86util.asm
tests/Makefile
tests/codec-regression.sh
tests/lavfi-regression.sh

diff --cc .gitignore
@@@ -13,9 -12,10 +13,10 @@@ doc/*.htm
  doc/*.pod
  doxy
  ffmpeg
 -avplay
 -avprobe
 -avserver
 +ffplay
 +ffprobe
 +ffserver
+ avconv
  libavcodec/*_tablegen
  libavcodec/*_tables.c
  libavcodec/*_tables.h
diff --cc Makefile
+++ b/Makefile
@@@ -8,23 -7,66 +8,24 @@@ vpath %.asm  $(SRC_PATH
  vpath %.v    $(SRC_PATH)
  vpath %.texi $(SRC_PATH)
  
 -ifndef V
 -Q      = @
 -ECHO   = printf "$(1)\t%s\n" $(2)
 -BRIEF  = CC AS YASM AR LD HOSTCC
 -SILENT = DEPCC YASMDEP RM RANLIB
 -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 avutil postproc swscale
 -
 -IFLAGS     := -I. -I$(SRC_PATH)
 -CPPFLAGS   := $(IFLAGS) $(CPPFLAGS)
 -CFLAGS     += $(ECFLAGS)
 -CCFLAGS     = $(CFLAGS)
 -YASMFLAGS  += $(IFLAGS) -Pconfig.asm
 -HOSTCFLAGS += $(IFLAGS)
 -LDFLAGS    := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)
 -
 -define COMPILE
 -      $($(1)DEP)
 -      $($(1)) $(CPPFLAGS) $($(1)FLAGS) $($(1)_DEPFLAGS) -c $($(1)_O) $<
 -endef
 -
 -COMPILE_C = $(call COMPILE,CC)
 -COMPILE_S = $(call COMPILE,AS)
 -
 -%.o: %.c
 -      $(COMPILE_C)
 -
 -%.o: %.S
 -      $(COMPILE_S)
 -
 -%.ho: %.h
 -      $(CC) $(CPPFLAGS) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
 -
 -%.ver: %.v
 -      $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
 -
 -%.c %.h: TAG = GEN
  
  PROGS-$(CONFIG_FFMPEG)   += ffmpeg
 -PROGS-$(CONFIG_AVPLAY)   += avplay
 -PROGS-$(CONFIG_AVPROBE)  += avprobe
 -PROGS-$(CONFIG_AVSERVER) += avserver
+ PROGS-$(CONFIG_AVCONV)   += avconv
 +PROGS-$(CONFIG_FFPLAY)   += ffplay
 +PROGS-$(CONFIG_FFPROBE)  += ffprobe
 +PROGS-$(CONFIG_FFSERVER) += ffserver
  
  PROGS      := $(PROGS-yes:%=%$(EXESUF))
 +PROGS_G     = $(PROGS-yes:%=%_g$(EXESUF))
  OBJS        = $(PROGS-yes:%=%.o) cmdutils.o
  TESTTOOLS   = audiogen videogen rotozoom tiny_psnr base64
  HOSTPROGS  := $(TESTTOOLS:%=tests/%)
  TOOLS       = qt-faststart trasher
  TOOLS-$(CONFIG_ZLIB) += cws2fws
  
- BASENAMES   = ffmpeg ffplay ffprobe ffserver
 -BASENAMES   = ffmpeg avconv avplay avprobe avserver
++BASENAMES   = ffmpeg avconv ffplay ffprobe ffserver
  ALLPROGS    = $(BASENAMES:%=%$(EXESUF))
 +ALLPROGS_G  = $(BASENAMES:%=%_g$(EXESUF))
  ALLMANPAGES = $(BASENAMES:%=%.1)
  
  FFLIBS-$(CONFIG_AVDEVICE) += avdevice
diff --cc avconv.c
index 0000000,877079c..b663972
mode 000000,100644..100644
--- /dev/null
+++ b/avconv.c
@@@ -1,0 -1,4284 +1,4447 @@@
 - * This file is part of Libav.
+ /*
+  * avconv main
+  * Copyright (c) 2000-2011 The libav developers.
+  *
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
 -    int  file;      //< file index
 -    char type;      //< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram
 -    int  index;     //< stream/chapter/program number
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ #include "config.h"
+ #include <ctype.h>
+ #include <string.h>
+ #include <math.h>
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <signal.h>
+ #include <limits.h>
+ #include <unistd.h>
+ #include "libavformat/avformat.h"
+ #include "libavdevice/avdevice.h"
+ #include "libswscale/swscale.h"
+ #include "libavutil/opt.h"
+ #include "libavcodec/audioconvert.h"
+ #include "libavutil/audioconvert.h"
+ #include "libavutil/parseutils.h"
+ #include "libavutil/samplefmt.h"
+ #include "libavutil/colorspace.h"
+ #include "libavutil/fifo.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/dict.h"
+ #include "libavutil/mathematics.h"
+ #include "libavutil/pixdesc.h"
+ #include "libavutil/avstring.h"
+ #include "libavutil/libm.h"
+ #include "libavformat/os_support.h"
++#include "libavformat/ffm.h" // not public API
++
+ #if CONFIG_AVFILTER
++# include "libavfilter/avcodec.h"
+ # include "libavfilter/avfilter.h"
+ # include "libavfilter/avfiltergraph.h"
++# include "libavfilter/vsink_buffer.h"
+ # include "libavfilter/vsrc_buffer.h"
+ #endif
+ #if HAVE_SYS_RESOURCE_H
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #elif HAVE_GETPROCESSTIMES
+ #include <windows.h>
+ #endif
+ #if HAVE_GETPROCESSMEMORYINFO
+ #include <windows.h>
+ #include <psapi.h>
+ #endif
+ #if HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif
++#if HAVE_TERMIOS_H
++#include <fcntl.h>
++#include <sys/ioctl.h>
++#include <sys/time.h>
++#include <termios.h>
++#elif HAVE_KBHIT
++#include <conio.h>
++#endif
+ #include <time.h>
+ #include "cmdutils.h"
+ #include "libavutil/avassert.h"
+ const char program_name[] = "avconv";
+ 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;
+ } StreamMap;
+ /**
+  * select an input file for an output file
+  */
+ typedef struct MetadataMap {
 -
++    int  file;      ///< file index
++    char type;      ///< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram
++    int  index;     ///< stream/chapter/program number
+ } MetadataMap;
+ static const OptionDef options[];
+ #define MAX_FILES 100
 -static char *pass_logfilename_prefix = NULL;
++#define MAX_STREAMS 1024    /* arbitrary sanity check value */
+ static const char *last_asked_format = NULL;
+ static double *ts_scale;
+ static int  nb_ts_scale;
+ static AVFormatContext *output_files[MAX_FILES];
+ static AVDictionary *output_opts[MAX_FILES];
+ static int nb_output_files = 0;
+ static StreamMap *stream_maps = NULL;
+ static int nb_stream_maps;
+ /* first item specifies output metadata, second is input */
+ static MetadataMap (*meta_data_maps)[2] = NULL;
+ static int nb_meta_data_maps;
+ static int metadata_global_autocopy   = 1;
+ static int metadata_streams_autocopy  = 1;
+ static int metadata_chapters_autocopy = 1;
+ static int chapters_input_file = INT_MAX;
+ /* indexed by output file stream index */
+ static int *streamid_map = NULL;
+ static int nb_streamid_map = 0;
+ static int frame_width  = 0;
+ static int frame_height = 0;
+ static float frame_aspect_ratio = 0;
+ static enum PixelFormat frame_pix_fmt = PIX_FMT_NONE;
++static int frame_bits_per_raw_sample = 0;
+ static enum AVSampleFormat audio_sample_fmt = AV_SAMPLE_FMT_NONE;
+ static int max_frames[4] = {INT_MAX, INT_MAX, INT_MAX, INT_MAX};
+ static AVRational frame_rate;
+ static float video_qscale = 0;
+ static uint16_t *intra_matrix = NULL;
+ static uint16_t *inter_matrix = NULL;
+ static const char *video_rc_override_string=NULL;
+ static int video_disable = 0;
+ static int video_discard = 0;
+ static char *video_codec_name = NULL;
+ static unsigned int video_codec_tag = 0;
+ static char *video_language = NULL;
+ static int same_quality = 0;
+ static int do_deinterlace = 0;
+ static int top_field_first = -1;
+ static int me_threshold = 0;
+ static int intra_dc_precision = 8;
+ static int qp_hist = 0;
+ #if CONFIG_AVFILTER
+ static char *vfilters = NULL;
+ #endif
+ static int intra_only = 0;
+ static int audio_sample_rate = 0;
+ #define QSCALE_NONE -99999
+ static float audio_qscale = QSCALE_NONE;
+ static int audio_disable = 0;
+ static int audio_channels = 0;
+ static char  *audio_codec_name = NULL;
+ static unsigned int audio_codec_tag = 0;
+ static char *audio_language = NULL;
+ static int subtitle_disable = 0;
+ static char *subtitle_codec_name = NULL;
+ static char *subtitle_language = NULL;
+ static unsigned int subtitle_codec_tag = 0;
+ static int data_disable = 0;
+ static char *data_codec_name = NULL;
+ static unsigned int data_codec_tag = 0;
+ static float mux_preload= 0.5;
+ static float mux_max_delay= 0.7;
+ static int64_t recording_time = INT64_MAX;
+ static int64_t start_time = 0;
+ static int64_t input_ts_offset = 0;
+ static int file_overwrite = 0;
+ static AVDictionary *metadata;
+ static int do_benchmark = 0;
+ static int do_hex_dump = 0;
+ static int do_pkt_dump = 0;
+ static int do_psnr = 0;
+ static int do_pass = 0;
 -static int copy_tb;
++static const char *pass_logfilename_prefix;
+ static int audio_stream_copy = 0;
+ static int video_stream_copy = 0;
+ static int subtitle_stream_copy = 0;
+ static int data_stream_copy = 0;
+ static int video_sync_method= -1;
+ static int audio_sync_method= 0;
+ static float audio_drift_threshold= 0.1;
+ static int copy_ts= 0;
 -    AVFrame pict_tmp;      /* temporary image for resampling */
++static int copy_tb= 0;
+ static int opt_shortest = 0;
+ static char *vstats_filename;
+ static FILE *vstats_file;
+ static int opt_programid = 0;
+ static int copy_initial_nonkeyframes = 0;
+ static int rate_emu = 0;
+ static int audio_volume = 256;
+ static int exit_on_error = 0;
+ static int using_stdin = 0;
+ static int verbose = 1;
++static int run_as_daemon  = 0;
+ static int thread_count= 1;
++static int q_pressed = 0;
+ static int64_t video_size = 0;
+ static int64_t audio_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 uint64_t limit_filesize = 0;
+ static int force_fps = 0;
+ static char *forced_key_frames = NULL;
+ static float dts_delta_threshold = 10;
+ static int64_t timer_start;
+ static uint8_t *audio_buf;
+ static uint8_t *audio_out;
+ static unsigned int allocated_audio_out_size, allocated_audio_buf_size;
+ static short *samples;
+ static AVBitStreamFilterContext *video_bitstream_filters=NULL;
+ static AVBitStreamFilterContext *audio_bitstream_filters=NULL;
+ static AVBitStreamFilterContext *subtitle_bitstream_filters=NULL;
+ #define DEFAULT_PASS_LOGFILENAME_PREFIX "av2pass"
+ struct InputStream;
+ 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 */
+     //double sync_ipts;        /* dts from the AVPacket of the demuxer in second units */
+     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
+     AVBitStreamFilterContext *bitstream_filters;
+     AVCodec *enc;
+     /* video only */
+     int video_resample;
 -    PtsCorrectionContext pts_ctx;
++    AVFrame resample_frame;              /* temporary frame for image resampling */
+     struct SwsContext *img_resample_ctx; /* for image resampling */
+     int resample_height;
+     int resample_width;
+     int resample_pix_fmt;
+     AVRational frame_rate;
+     float frame_aspect_ratio;
+     /* forced key frames */
+     int64_t *forced_kf_pts;
+     int forced_kf_count;
+     int forced_kf_index;
+     /* audio only */
+     int audio_resample;
+     ReSampleContext *resample; /* for audio resampling */
+     int resample_sample_fmt;
+     int resample_channels;
+     int resample_sample_rate;
+     int reformat_pair;
+     AVAudioConvert *reformat_ctx;
+     AVFifoBuffer *fifo;     /* for compression: one audio fifo per codec */
+     FILE *logfile;
+ #if CONFIG_AVFILTER
+     AVFilterContext *output_video_filter;
+     AVFilterContext *input_video_filter;
+     AVFilterBufferRef *picref;
+     char *avfilter;
+     AVFilterGraph *graph;
+ #endif
+    int sws_flags;
+    AVDictionary *opts;
+ } OutputStream;
+ static OutputStream **output_streams_for_file[MAX_FILES] = { NULL };
+ static int nb_output_streams_for_file[MAX_FILES] = { 0 };
+ 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;
+     int64_t       start;     /* time when read started */
+     int64_t       next_pts;  /* synthetic pts for cases where pkt.pts
+                                 is not defined */
+     int64_t       pts;       /* current pts */
 -    FFSinkContext ffsink_ctx = { .pix_fmt = codec->pix_fmt };
+     double ts_scale;
+     int is_start;            /* is 1 at the start and after a discontinuity */
+     int showed_multi_packet_warning;
+     int is_past_recording_time;
+     AVDictionary *opts;
+ } InputStream;
+ typedef struct InputFile {
+     AVFormatContext *ctx;
+     int eof_reached;      /* true if eof reached */
+     int ist_index;        /* index of first stream in ist_table */
+     int buffer_size;      /* current total buffer size */
++    int nb_streams;
+     int64_t ts_offset;
+ } InputFile;
++#if HAVE_TERMIOS_H
++
++/* init terminal so that we can grab keys */
++static struct termios oldtty;
++#endif
++
+ static InputStream *input_streams = NULL;
+ static int         nb_input_streams = 0;
+ static InputFile   *input_files   = NULL;
+ static int         nb_input_files   = 0;
+ #if CONFIG_AVFILTER
+ static int configure_video_filters(InputStream *ist, OutputStream *ost)
+ {
+     AVFilterContext *last_filter, *filter;
+     /** filter graph containing all filters including input & output */
+     AVCodecContext *codec = ost->st->codec;
+     AVCodecContext *icodec = ist->st->codec;
 -    ret = avfilter_graph_create_filter(&ost->output_video_filter, &ffsink,
 -                                       "out", NULL, &ffsink_ctx, ost->graph);
++    enum PixelFormat pix_fmts[] = { codec->pix_fmt, PIX_FMT_NONE };
+     AVRational sample_aspect_ratio;
+     char args[255];
+     int ret;
+     ost->graph = avfilter_graph_alloc();
+     if (ist->st->sample_aspect_ratio.num){
+         sample_aspect_ratio = ist->st->sample_aspect_ratio;
+     }else
+         sample_aspect_ratio = ist->st->codec->sample_aspect_ratio;
+     snprintf(args, 255, "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width,
+              ist->st->codec->height, ist->st->codec->pix_fmt, 1, AV_TIME_BASE,
+              sample_aspect_ratio.num, sample_aspect_ratio.den);
+     ret = avfilter_graph_create_filter(&ost->input_video_filter, avfilter_get_by_name("buffer"),
+                                        "src", args, NULL, ost->graph);
+     if (ret < 0)
+         return ret;
 -        AVFilterInOut *outputs = av_malloc(sizeof(AVFilterInOut));
 -        AVFilterInOut *inputs  = av_malloc(sizeof(AVFilterInOut));
++    ret = avfilter_graph_create_filter(&ost->output_video_filter, avfilter_get_by_name("buffersink"),
++                                       "out", NULL, pix_fmts, ost->graph);
+     if (ret < 0)
+         return ret;
+     last_filter = ost->input_video_filter;
+     if (codec->width  != icodec->width || codec->height != icodec->height) {
+         snprintf(args, 255, "%d:%d:flags=0x%X",
+                  codec->width,
+                  codec->height,
+                  ost->sws_flags);
+         if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"),
+                                                 NULL, args, NULL, ost->graph)) < 0)
+             return ret;
+         if ((ret = avfilter_link(last_filter, 0, filter, 0)) < 0)
+             return ret;
+         last_filter = filter;
+     }
+     snprintf(args, sizeof(args), "flags=0x%X", ost->sws_flags);
+     ost->graph->scale_sws_opts = av_strdup(args);
+     if (ost->avfilter) {
 -        if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, inputs, outputs, NULL)) < 0)
++        AVFilterInOut *outputs = avfilter_inout_alloc();
++        AVFilterInOut *inputs  = avfilter_inout_alloc();
+         outputs->name    = av_strdup("in");
+         outputs->filter_ctx = last_filter;
+         outputs->pad_idx = 0;
+         outputs->next    = NULL;
+         inputs->name    = av_strdup("out");
+         inputs->filter_ctx = ost->output_video_filter;
+         inputs->pad_idx = 0;
+         inputs->next    = NULL;
 -    av_log(NULL, AV_LOG_QUIET, "");
++        if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, &inputs, &outputs, NULL)) < 0)
+             return ret;
+         av_freep(&ost->avfilter);
+     } else {
+         if ((ret = avfilter_link(last_filter, 0, ost->output_video_filter, 0)) < 0)
+             return ret;
+     }
+     if ((ret = avfilter_graph_config(ost->graph, NULL)) < 0)
+         return ret;
+     codec->width  = ost->output_video_filter->inputs[0]->w;
+     codec->height = ost->output_video_filter->inputs[0]->h;
+     codec->sample_aspect_ratio = ost->st->sample_aspect_ratio =
+         ost->frame_aspect_ratio ? // overriden by the -aspect cli option
+         av_d2q(ost->frame_aspect_ratio*codec->height/codec->width, 255) :
+         ost->output_video_filter->inputs[0]->sample_aspect_ratio;
+     return 0;
+ }
+ #endif /* CONFIG_AVFILTER */
+ static void term_exit(void)
+ {
 -static volatile int received_nb_signals = 0;
++    av_log(NULL, AV_LOG_QUIET, "%s", "");
++#if HAVE_TERMIOS_H
++    if(!run_as_daemon)
++        tcsetattr (0, TCSANOW, &oldtty);
++#endif
+ }
+ static volatile int received_sigterm = 0;
 -    received_nb_signals++;
+ static void
+ sigterm_handler(int sig)
+ {
+     received_sigterm = sig;
 -    return received_nb_signals > 1;
++    q_pressed++;
+     term_exit();
+ }
+ static void term_init(void)
+ {
++#if HAVE_TERMIOS_H
++    if(!run_as_daemon){
++    struct termios tty;
++
++    tcgetattr (0, &tty);
++    oldtty = tty;
++    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).  */
++    }
++#endif
++
+     signal(SIGINT , sigterm_handler); /* Interrupt (ANSI).  */
+     signal(SIGTERM, sigterm_handler); /* Termination (ANSI).  */
+ #ifdef SIGXCPU
+     signal(SIGXCPU, sigterm_handler);
+ #endif
+ }
++/* read a key without blocking */
++static int read_key(void)
++{
++#if HAVE_TERMIOS_H
++    int n = 1;
++    unsigned char ch;
++    struct timeval tv;
++    fd_set rfds;
++
++    if(run_as_daemon)
++        return -1;
++
++    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(kbhit())
++        return(getch());
++#endif
++    return -1;
++}
++
+ static int decode_interrupt_cb(void)
+ {
 -/**
 - * 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)
 -{
 -    /* 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 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;
 -    }
 -}
 -
++    q_pressed += read_key() == 'q';
++    return q_pressed > 1;
+ }
+ static int exit_program(int ret)
+ {
+     int i;
+     /* close files */
+     for(i=0;i<nb_output_files;i++) {
+         AVFormatContext *s = output_files[i];
+         if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
+             avio_close(s->pb);
+         avformat_free_context(s);
+         av_free(output_streams_for_file[i]);
+         av_dict_free(&output_opts[i]);
+     }
+     for(i=0;i<nb_input_files;i++) {
+         av_close_input_file(input_files[i].ctx);
+     }
+     for (i = 0; i < nb_input_streams; i++)
+         av_dict_free(&input_streams[i].opts);
+     av_free(intra_matrix);
+     av_free(inter_matrix);
+     if (vstats_file)
+         fclose(vstats_file);
+     av_free(vstats_filename);
+     av_free(streamid_map);
+     av_free(meta_data_maps);
+     av_freep(&input_streams);
+     av_freep(&input_files);
+     av_free(video_codec_name);
+     av_free(audio_codec_name);
+     av_free(subtitle_codec_name);
+     av_free(data_codec_name);
+     uninit_opts();
+     av_free(audio_buf);
+     av_free(audio_out);
+     allocated_audio_buf_size= allocated_audio_out_size= 0;
+     av_free(samples);
+ #if CONFIG_AVFILTER
+     avfilter_uninit();
+ #endif
+     if (received_sigterm) {
+         fprintf(stderr,
+             "Received signal %d: terminating.\n",
+             (int) received_sigterm);
+         exit (255);
+     }
+     exit(ret); /* not all OS-es handle main() return value */
+     return ret;
+ }
+ static void assert_avoptions(AVDictionary *m)
+ {
+     AVDictionaryEntry *t;
+     if ((t = av_dict_get(m, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
+         av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
+         exit_program(1);
+     }
+ }
+ 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_ERROR, "%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_ERROR, "Or use the non experimental %s '%s'.\n",
+                    codec_string, codec->name);
+         exit_program(1);
+     }
+ }
+ /* similar to ff_dynarray_add() and av_fast_realloc() */
+ static void *grow_array(void *array, int elem_size, int *size, int new_size)
+ {
+     if (new_size >= INT_MAX / elem_size) {
+         fprintf(stderr, "Array too big.\n");
+         exit_program(1);
+     }
+     if (*size < new_size) {
+         uint8_t *tmp = av_realloc(array, new_size*elem_size);
+         if (!tmp) {
+             fprintf(stderr, "Could not alloc buffer.\n");
+             exit_program(1);
+         }
+         memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size);
+         *size = new_size;
+         return tmp;
+     }
+     return array;
+ }
+ 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;
+         }
+         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, "Convertion will not be lossless'\n");
+             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];
+         }
+     }
+ }
 -static int read_avserver_streams(AVFormatContext *s, const char *filename)
+ static void choose_sample_rate(AVStream *st, AVCodec *codec)
+ {
+     if(codec && codec->supported_samplerates){
+         const int *p= codec->supported_samplerates;
+         int best=0;
+         int best_dist=INT_MAX;
+         for(; *p; p++){
+             int dist= abs(st->codec->sample_rate - *p);
+             if(dist < best_dist){
+                 best_dist= dist;
+                 best= *p;
+             }
+         }
+         if(best_dist){
+             av_log(st->codec, AV_LOG_WARNING, "Requested sampling rate unsupported using closest supported (%d)\n", best);
+         }
+         st->codec->sample_rate= best;
+     }
+ }
+ static void choose_pixel_fmt(AVStream *st, AVCodec *codec)
+ {
+     if(codec && codec->pix_fmts){
+         const enum PixelFormat *p= codec->pix_fmts;
+         if(st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL){
+             if(st->codec->codec_id==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==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!=-1; p++){
+             if(*p == st->codec->pix_fmt)
+                 break;
+         }
+         if (*p == -1) {
+             if(st->codec->pix_fmt != 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[st->codec->pix_fmt].name,
+                         codec->name,
+                         av_pix_fmt_descriptors[codec->pix_fmts[0]].name);
+             st->codec->pix_fmt = codec->pix_fmts[0];
+         }
+     }
+ }
+ static OutputStream *new_output_stream(AVFormatContext *oc, int file_idx, AVCodec *codec)
+ {
+     OutputStream *ost;
+     AVStream *st = av_new_stream(oc, oc->nb_streams < nb_streamid_map ? streamid_map[oc->nb_streams] : 0);
+     int idx      = oc->nb_streams - 1;
+     if (!st) {
+         av_log(NULL, AV_LOG_ERROR, "Could not alloc stream.\n");
+         exit_program(1);
+     }
+     output_streams_for_file[file_idx] =
+         grow_array(output_streams_for_file[file_idx],
+                    sizeof(*output_streams_for_file[file_idx]),
+                    &nb_output_streams_for_file[file_idx],
+                    oc->nb_streams);
+     ost = output_streams_for_file[file_idx][idx] =
+         av_mallocz(sizeof(OutputStream));
+     if (!ost) {
+         fprintf(stderr, "Could not alloc output stream\n");
+         exit_program(1);
+     }
+     ost->file_index = file_idx;
+     ost->index = idx;
+     ost->st    = st;
+     ost->enc   = codec;
+     if (codec) {
+         st->codec->codec_type = codec->type;
+         ost->opts  = filter_codec_opts(codec_opts, codec->id, oc, st);
+     }
+     avcodec_get_context_defaults3(st->codec, codec);
+     ost->sws_flags = av_get_int(sws_opts, "sws_flags", NULL);
+     return ost;
+ }
 -        st->info = NULL;
++static int read_ffserver_streams(AVFormatContext *s, const char *filename)
+ {
+     int i, err;
+     AVFormatContext *ic = NULL;
+     int nopts = 0;
+     err = avformat_open_input(&ic, filename, NULL, NULL);
+     if (err < 0)
+         return err;
+     /* copy stream format */
+     for(i=0;i<ic->nb_streams;i++) {
+         AVStream *st;
+         OutputStream *ost;
+         AVCodec *codec;
+         codec = avcodec_find_encoder(ic->streams[i]->codec->codec_id);
+         ost   = new_output_stream(s, nb_output_files, codec);
+         st    = ost->st;
+         // FIXME: a more elegant solution is needed
+         memcpy(st, ic->streams[i], sizeof(AVStream));
 -    if (enc->channels != dec->channels || enc->sample_rate != dec->sample_rate)
++        st->info = av_malloc(sizeof(*st->info));
++        memcpy(st->info, ic->streams[i]->info, sizeof(*st->info));
+         avcodec_copy_context(st->codec, ic->streams[i]->codec);
+         if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+             if (audio_stream_copy) {
+                 st->stream_copy = 1;
+             } else
+                 choose_sample_fmt(st, codec);
+         } else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+             if (video_stream_copy) {
+                 st->stream_copy = 1;
+             } else
+                 choose_pixel_fmt(st, codec);
+         }
+         if(st->codec->flags & CODEC_FLAG_BITEXACT)
+             nopts = 1;
+     }
+     av_close_input_file(ic);
+     return 0;
+ }
+ static double
+ get_sync_ipts(const OutputStream *ost)
+ {
+     const InputStream *ist = ost->sync_ist;
+     return (double)(ist->pts - start_time)/AV_TIME_BASE;
+ }
+ static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx, AVBitStreamFilterContext *bsfc){
+     int 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){
+             fprintf(stderr, "%s failed for stream %d, 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;
+     }
+     ret= av_interleaved_write_frame(s, pkt);
+     if(ret < 0){
+         print_error("av_interleaved_write_frame()", ret);
+         exit_program(1);
+     }
+ }
+ #define MAX_AUDIO_PACKET_SIZE (128 * 1024)
+ static void do_audio_out(AVFormatContext *s,
+                          OutputStream *ost,
+                          InputStream *ist,
+                          unsigned char *buf, int size)
+ {
+     uint8_t *buftmp;
+     int64_t audio_out_size, audio_buf_size;
+     int64_t allocated_for_size= size;
+     int size_out, frame_bytes, ret, resample_changed;
+     AVCodecContext *enc= ost->st->codec;
+     AVCodecContext *dec= ist->st->codec;
+     int osize = av_get_bytes_per_sample(enc->sample_fmt);
+     int isize = av_get_bytes_per_sample(dec->sample_fmt);
+     const int coded_bps = av_get_bits_per_sample(enc->codec->id);
+ need_realloc:
+     audio_buf_size= (allocated_for_size + isize*dec->channels - 1) / (isize*dec->channels);
+     audio_buf_size= (audio_buf_size*enc->sample_rate + dec->sample_rate) / dec->sample_rate;
+     audio_buf_size= audio_buf_size*2 + 10000; //safety factors for the deprecated resampling API
+     audio_buf_size= FFMAX(audio_buf_size, enc->frame_size);
+     audio_buf_size*= osize*enc->channels;
+     audio_out_size= FFMAX(audio_buf_size, enc->frame_size * osize * enc->channels);
+     if(coded_bps > 8*osize)
+         audio_out_size= audio_out_size * coded_bps / (8*osize);
+     audio_out_size += FF_MIN_BUFFER_SIZE;
+     if(audio_out_size > INT_MAX || audio_buf_size > INT_MAX){
+         fprintf(stderr, "Buffer sizes too large\n");
+         exit_program(1);
+     }
+     av_fast_malloc(&audio_buf, &allocated_audio_buf_size, audio_buf_size);
+     av_fast_malloc(&audio_out, &allocated_audio_out_size, audio_out_size);
+     if (!audio_buf || !audio_out){
+         fprintf(stderr, "Out of memory in do_audio_out\n");
+         exit_program(1);
+     }
 -        } else if (ost->audio_resample) {
++    if (enc->channels != dec->channels)
+         ost->audio_resample = 1;
+     resample_changed = ost->resample_sample_fmt  != dec->sample_fmt ||
+                        ost->resample_channels    != dec->channels   ||
+                        ost->resample_sample_rate != dec->sample_rate;
+     if ((ost->audio_resample && !ost->resample) || resample_changed) {
+         if (resample_changed) {
+             av_log(NULL, AV_LOG_INFO, "Input stream #%d.%d frame changed from rate:%d fmt:%s ch:%d to rate:%d fmt:%s ch:%d\n",
+                    ist->file_index, ist->st->index,
+                    ost->resample_sample_rate, av_get_sample_fmt_name(ost->resample_sample_fmt), ost->resample_channels,
+                    dec->sample_rate, av_get_sample_fmt_name(dec->sample_fmt), dec->channels);
+             ost->resample_sample_fmt  = dec->sample_fmt;
+             ost->resample_channels    = dec->channels;
+             ost->resample_sample_rate = dec->sample_rate;
+             if (ost->resample)
+                 audio_resample_close(ost->resample);
+         }
+         /* if audio_sync_method is >1 the resampler is needed for audio drift compensation */
+         if (audio_sync_method <= 1 &&
+             ost->resample_sample_fmt  == enc->sample_fmt &&
+             ost->resample_channels    == enc->channels   &&
+             ost->resample_sample_rate == enc->sample_rate) {
+             ost->resample = NULL;
+             ost->audio_resample = 0;
 -    int nb_frames, i, ret, resample_changed;
++        } else {
+             if (dec->sample_fmt != AV_SAMPLE_FMT_S16)
+                 fprintf(stderr, "Warning, using s16 intermediate sample format for resampling\n");
+             ost->resample = av_audio_resample_init(enc->channels,    dec->channels,
+                                                    enc->sample_rate, dec->sample_rate,
+                                                    enc->sample_fmt,  dec->sample_fmt,
+                                                    16, 10, 0, 0.8);
+             if (!ost->resample) {
+                 fprintf(stderr, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n",
+                         dec->channels, dec->sample_rate,
+                         enc->channels, enc->sample_rate);
+                 exit_program(1);
+             }
+         }
+     }
+ #define MAKE_SFMT_PAIR(a,b) ((a)+AV_SAMPLE_FMT_NB*(b))
+     if (!ost->audio_resample && dec->sample_fmt!=enc->sample_fmt &&
+         MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt)!=ost->reformat_pair) {
+         if (ost->reformat_ctx)
+             av_audio_convert_free(ost->reformat_ctx);
+         ost->reformat_ctx = av_audio_convert_alloc(enc->sample_fmt, 1,
+                                                    dec->sample_fmt, 1, NULL, 0);
+         if (!ost->reformat_ctx) {
+             fprintf(stderr, "Cannot convert %s sample format to %s sample format\n",
+                 av_get_sample_fmt_name(dec->sample_fmt),
+                 av_get_sample_fmt_name(enc->sample_fmt));
+             exit_program(1);
+         }
+         ost->reformat_pair=MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt);
+     }
+     if(audio_sync_method){
+         double delta = get_sync_ipts(ost) * enc->sample_rate - ost->sync_opts
+                 - av_fifo_size(ost->fifo)/(enc->channels * 2);
+         double idelta= delta*dec->sample_rate / enc->sample_rate;
+         int byte_delta= ((int)idelta)*2*dec->channels;
+         //FIXME resample delay
+         if(fabs(delta) > 50){
+             if(ist->is_start || fabs(delta) > audio_drift_threshold*enc->sample_rate){
+                 if(byte_delta < 0){
+                     byte_delta= FFMAX(byte_delta, -size);
+                     size += byte_delta;
+                     buf  -= byte_delta;
+                     if(verbose > 2)
+                         fprintf(stderr, "discarding %d audio samples\n", (int)-delta);
+                     if(!size)
+                         return;
+                     ist->is_start=0;
+                 }else{
+                     static uint8_t *input_tmp= NULL;
+                     input_tmp= av_realloc(input_tmp, byte_delta + size);
+                     if(byte_delta > allocated_for_size - size){
+                         allocated_for_size= byte_delta + (int64_t)size;
+                         goto need_realloc;
+                     }
+                     ist->is_start=0;
+                     memset(input_tmp, 0, byte_delta);
+                     memcpy(input_tmp + byte_delta, buf, size);
+                     buf= input_tmp;
+                     size += byte_delta;
+                     if(verbose > 2)
+                         fprintf(stderr, "adding %d audio samples of silence\n", (int)delta);
+                 }
+             }else if(audio_sync_method>1){
+                 int comp= av_clip(delta, -audio_sync_method, audio_sync_method);
+                 av_assert0(ost->audio_resample);
+                 if(verbose > 2)
+                     fprintf(stderr, "compensating audio timestamp drift:%f compensation:%d in:%d\n", delta, comp, enc->sample_rate);
+ //                fprintf(stderr, "drift:%f len:%d opts:%"PRId64" ipts:%"PRId64" fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(get_sync_ipts(ost) * enc->sample_rate), av_fifo_size(ost->fifo)/(ost->st->codec->channels * 2));
+                 av_resample_compensate(*(struct AVResampleContext**)ost->resample, comp, enc->sample_rate);
+             }
+         }
+     }else
+         ost->sync_opts= lrintf(get_sync_ipts(ost) * enc->sample_rate)
+                         - av_fifo_size(ost->fifo)/(enc->channels * 2); //FIXME wrong
+     if (ost->audio_resample) {
+         buftmp = audio_buf;
+         size_out = audio_resample(ost->resample,
+                                   (short *)buftmp, (short *)buf,
+                                   size / (dec->channels * isize));
+         size_out = size_out * enc->channels * osize;
+     } else {
+         buftmp = buf;
+         size_out = size;
+     }
+     if (!ost->audio_resample && dec->sample_fmt!=enc->sample_fmt) {
+         const void *ibuf[6]= {buftmp};
+         void *obuf[6]= {audio_buf};
+         int istride[6]= {isize};
+         int ostride[6]= {osize};
+         int len= size_out/istride[0];
+         if (av_audio_convert(ost->reformat_ctx, obuf, ostride, ibuf, istride, len)<0) {
+             printf("av_audio_convert() failed\n");
+             if (exit_on_error)
+                 exit_program(1);
+             return;
+         }
+         buftmp = audio_buf;
+         size_out = len*osize;
+     }
+     /* now encode as many frames as possible */
+     if (enc->frame_size > 1) {
+         /* output resampled raw samples */
+         if (av_fifo_realloc2(ost->fifo, av_fifo_size(ost->fifo) + size_out) < 0) {
+             fprintf(stderr, "av_fifo_realloc2() failed\n");
+             exit_program(1);
+         }
+         av_fifo_generic_write(ost->fifo, buftmp, size_out, NULL);
+         frame_bytes = enc->frame_size * osize * enc->channels;
+         while (av_fifo_size(ost->fifo) >= frame_bytes) {
+             AVPacket pkt;
+             av_init_packet(&pkt);
+             av_fifo_generic_read(ost->fifo, audio_buf, frame_bytes, NULL);
+             //FIXME pass ost->sync_opts as AVFrame.pts in avcodec_encode_audio()
+             ret = avcodec_encode_audio(enc, audio_out, audio_out_size,
+                                        (short *)audio_buf);
+             if (ret < 0) {
+                 fprintf(stderr, "Audio encoding failed\n");
+                 exit_program(1);
+             }
+             audio_size += ret;
+             pkt.stream_index= ost->index;
+             pkt.data= audio_out;
+             pkt.size= ret;
+             if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
+                 pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
+             pkt.flags |= AV_PKT_FLAG_KEY;
+             write_frame(s, &pkt, enc, ost->bitstream_filters);
+             ost->sync_opts += enc->frame_size;
+         }
+     } else {
+         AVPacket pkt;
+         av_init_packet(&pkt);
+         ost->sync_opts += size_out / (osize * enc->channels);
+         /* output a pcm frame */
+         /* determine the size of the coded buffer */
+         size_out /= osize;
+         if (coded_bps)
+             size_out = size_out*coded_bps/8;
+         if(size_out > audio_out_size){
+             fprintf(stderr, "Internal error, buffer size too small\n");
+             exit_program(1);
+         }
+         //FIXME pass ost->sync_opts as AVFrame.pts in avcodec_encode_audio()
+         ret = avcodec_encode_audio(enc, audio_out, size_out,
+                                    (short *)buftmp);
+         if (ret < 0) {
+             fprintf(stderr, "Audio encoding failed\n");
+             exit_program(1);
+         }
+         audio_size += ret;
+         pkt.stream_index= ost->index;
+         pkt.data= audio_out;
+         pkt.size= ret;
+         if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
+             pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
+         pkt.flags |= AV_PKT_FLAG_KEY;
+         write_frame(s, &pkt, enc, ost->bitstream_filters);
+     }
+ }
+ 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)
+             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 */
+             fprintf(stderr, "Deinterlacing failed\n");
+             av_free(buf);
+             buf = NULL;
+             picture2 = picture;
+         }
+     } else {
+         picture2 = picture;
+     }
+     if (picture != picture2)
+         *picture = *picture2;
+     *bufp = buf;
+ }
+ /* we begin to correct av delay at this threshold */
+ #define AV_DELAY_MAX 0.100
+ static void do_subtitle_out(AVFormatContext *s,
+                             OutputStream *ost,
+                             InputStream *ist,
+                             AVSubtitle *sub,
+                             int64_t pts)
+ {
+     static uint8_t *subtitle_out = NULL;
+     int subtitle_out_max_size = 1024 * 1024;
+     int subtitle_out_size, nb, i;
+     AVCodecContext *enc;
+     AVPacket pkt;
+     if (pts == AV_NOPTS_VALUE) {
+         fprintf(stderr, "Subtitle packets must have a pts\n");
+         if (exit_on_error)
+             exit_program(1);
+         return;
+     }
+     enc = ost->st->codec;
+     if (!subtitle_out) {
+         subtitle_out = av_malloc(subtitle_out_max_size);
+     }
+     /* 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 == CODEC_ID_DVB_SUBTITLE)
+         nb = 2;
+     else
+         nb = 1;
+     for(i = 0; i < nb; i++) {
+         sub->pts = av_rescale_q(pts, ist->st->time_base, AV_TIME_BASE_Q);
+         // 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) {
+             fprintf(stderr, "Subtitle encoding failed\n");
+             exit_program(1);
+         }
+         av_init_packet(&pkt);
+         pkt.stream_index = ost->index;
+         pkt.data = subtitle_out;
+         pkt.size = subtitle_out_size;
+         pkt.pts = av_rescale_q(sub->pts, AV_TIME_BASE_Q, ost->st->time_base);
+         if (enc->codec_id == 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->st->codec, ost->bitstream_filters);
+     }
+ }
+ static int bit_buffer_size= 1024*256;
+ static uint8_t *bit_buffer= NULL;
+ static void do_video_out(AVFormatContext *s,
+                          OutputStream *ost,
+                          InputStream *ist,
+                          AVFrame *in_picture,
+                          int *frame_size, float quality)
+ {
 -        if(!ost->video_resample)
 -            exit_program(1);
++    int nb_frames, i, ret, av_unused resample_changed;
+     AVFrame *final_picture, *formatted_picture;
+     AVCodecContext *enc, *dec;
+     double sync_ipts;
+     enc = ost->st->codec;
+     dec = ist->st->codec;
+     sync_ipts = get_sync_ipts(ost) / av_q2d(enc->time_base);
+     /* by default, we output a single frame */
+     nb_frames = 1;
+     *frame_size = 0;
+     if(video_sync_method){
+         double vdelta = sync_ipts - ost->sync_opts;
+         //FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
+         if (vdelta < -1.1)
+             nb_frames = 0;
+         else if (video_sync_method == 2 || (video_sync_method<0 && (s->oformat->flags & AVFMT_VARIABLE_FPS))){
+             if(vdelta<=-0.6){
+                 nb_frames=0;
+             }else if(vdelta>0.6)
+                 ost->sync_opts= lrintf(sync_ipts);
+         }else if (vdelta > 1.1)
+             nb_frames = lrintf(vdelta);
+ //fprintf(stderr, "vdelta:%f, ost->sync_opts:%"PRId64", ost->sync_ipts:%f nb_frames:%d\n", vdelta, ost->sync_opts, get_sync_ipts(ost), nb_frames);
+         if (nb_frames == 0){
+             ++nb_frames_drop;
+             if (verbose>2)
+                 fprintf(stderr, "*** drop!\n");
+         }else if (nb_frames > 1) {
+             nb_frames_dup += nb_frames - 1;
+             if (verbose>2)
+                 fprintf(stderr, "*** %d dup!\n", nb_frames-1);
+         }
+     }else
+         ost->sync_opts= lrintf(sync_ipts);
+     nb_frames= FFMIN(nb_frames, max_frames[AVMEDIA_TYPE_VIDEO] - ost->frame_number);
+     if (nb_frames <= 0)
+         return;
+     formatted_picture = in_picture;
+     final_picture = formatted_picture;
++#if !CONFIG_AVFILTER
+     resample_changed = ost->resample_width   != dec->width  ||
+                        ost->resample_height  != dec->height ||
+                        ost->resample_pix_fmt != dec->pix_fmt;
+     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,
+                ost->resample_width, ost->resample_height, av_get_pix_fmt_name(ost->resample_pix_fmt),
+                dec->width         , dec->height         , av_get_pix_fmt_name(dec->pix_fmt));
 -#if !CONFIG_AVFILTER
++        ost->resample_width   = dec->width;
++        ost->resample_height  = dec->height;
++        ost->resample_pix_fmt = dec->pix_fmt;
+     }
 -        final_picture = &ost->pict_tmp;
 -        if (resample_changed) {
++    ost->video_resample = dec->width   != enc->width  ||
++                          dec->height  != enc->height ||
++                          dec->pix_fmt != enc->pix_fmt;
++
+     if (ost->video_resample) {
 -            ost->img_resample_ctx = sws_getContext(
 -                ist->st->codec->width,
 -                ist->st->codec->height,
 -                ist->st->codec->pix_fmt,
 -                ost->st->codec->width,
 -                ost->st->codec->height,
 -                ost->st->codec->pix_fmt,
 -                ost->sws_flags, NULL, NULL, NULL);
++        final_picture = &ost->resample_frame;
++        if (!ost->img_resample_ctx || resample_changed) {
++            /* initialize the destination picture */
++            if (!ost->resample_frame.data[0]) {
++                avcodec_get_frame_defaults(&ost->resample_frame);
++                if (avpicture_alloc((AVPicture *)&ost->resample_frame, enc->pix_fmt,
++                                    enc->width, enc->height)) {
++                    fprintf(stderr, "Cannot allocate temp picture, check pix fmt\n");
++                    exit_program(1);
++                }
++            }
+             /* initialize a new scaler context */
+             sws_freeContext(ost->img_resample_ctx);
 -    double bitrate, ti1, pts;
++            ost->img_resample_ctx = sws_getContext(dec->width, dec->height, dec->pix_fmt,
++                                                   enc->width, enc->height, enc->pix_fmt,
++                                                   ost->sws_flags, NULL, NULL, NULL);
+             if (ost->img_resample_ctx == NULL) {
+                 fprintf(stderr, "Cannot get resampling context\n");
+                 exit_program(1);
+             }
+         }
+         sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
+               0, ost->resample_height, final_picture->data, final_picture->linesize);
+     }
+ #endif
+     /* duplicates frame if needed */
+     for(i=0;i<nb_frames;i++) {
+         AVPacket pkt;
+         av_init_packet(&pkt);
+         pkt.stream_index= ost->index;
+         if (s->oformat->flags & AVFMT_RAWPICTURE) {
+             /* raw pictures are written as AVPicture structure to
+                avoid any copies. We support temorarily the older
+                method. */
+             AVFrame* old_frame = enc->coded_frame;
+             enc->coded_frame = dec->coded_frame; //FIXME/XXX remove this hack
+             pkt.data= (uint8_t *)final_picture;
+             pkt.size=  sizeof(AVPicture);
+             pkt.pts= av_rescale_q(ost->sync_opts, enc->time_base, ost->st->time_base);
+             pkt.flags |= AV_PKT_FLAG_KEY;
+             write_frame(s, &pkt, ost->st->codec, ost->bitstream_filters);
+             enc->coded_frame = old_frame;
+         } else {
+             AVFrame big_picture;
+             big_picture= *final_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(top_field_first == -1)
+                     big_picture.top_field_first = in_picture->top_field_first;
+                 else
+                     big_picture.top_field_first = top_field_first;
+             }
+             /* handles sameq here. This is not correct because it may
+                not be a global option */
+             big_picture.quality = quality;
+             if(!me_threshold)
+                 big_picture.pict_type = 0;
+ //            big_picture.pts = AV_NOPTS_VALUE;
+             big_picture.pts= ost->sync_opts;
+ //            big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->time_base.num, enc->time_base.den);
+ //av_log(NULL, AV_LOG_DEBUG, "%"PRId64" -> encoder\n", ost->sync_opts);
+             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++;
+             }
+             ret = avcodec_encode_video(enc,
+                                        bit_buffer, bit_buffer_size,
+                                        &big_picture);
+             if (ret < 0) {
+                 fprintf(stderr, "Video encoding failed\n");
+                 exit_program(1);
+             }
+             if(ret>0){
+                 pkt.data= bit_buffer;
+                 pkt.size= ret;
+                 if(enc->coded_frame->pts != AV_NOPTS_VALUE)
+                     pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
+ /*av_log(NULL, AV_LOG_DEBUG, "encoder -> %"PRId64"/%"PRId64"\n",
+    pkt.pts != AV_NOPTS_VALUE ? av_rescale(pkt.pts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1,
+    pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1);*/
+                 if(enc->coded_frame->key_frame)
+                     pkt.flags |= AV_PKT_FLAG_KEY;
+                 write_frame(s, &pkt, ost->st->codec, ost->bitstream_filters);
+                 *frame_size = ret;
+                 video_size += ret;
+                 //fprintf(stderr,"\nFrame: %3d size: %5d type: %d",
+                 //        enc->frame_number-1, ret, enc->pict_type);
+                 /* if two pass, output log */
+                 if (ost->logfile && enc->stats_out) {
+                     fprintf(ost->logfile, "%s", enc->stats_out);
+                 }
+             }
+         }
+         ost->sync_opts++;
+         ost->frame_number++;
+     }
+ }
+ 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));
+     }
+ }
+ static void print_report(AVFormatContext **output_files,
+                          OutputStream **ost_table, int nb_ostreams,
+                          int is_last_report)
+ {
+     char buf[1024];
+     OutputStream *ost;
+     AVFormatContext *oc;
+     int64_t total_size;
+     AVCodecContext *enc;
+     int frame_number, vid, i;
 -    ti1 = 1e10;
++    double bitrate;
++    int64_t pts = INT64_MAX;
+     static int64_t last_time = -1;
+     static int qp_histogram[52];
+     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;
+         }
+         if ((cur_time - last_time) < 500000)
+             return;
+         last_time = cur_time;
+     }
+     oc = output_files[0];
+     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);
+     buf[0] = '\0';
 -        pts = (double)ost->st->pts.val * av_q2d(ost->st->time_base);
 -        if ((pts < ti1) && (pts > 0))
 -            ti1 = pts;
+     vid = 0;
+     for(i=0;i<nb_ostreams;i++) {
+         float q = -1;
+         ost = ost_table[i];
+         enc = ost->st->codec;
+         if (!ost->st->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);
+         }
+         if (!vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) {
+             float t = (av_gettime()-timer_start) / 1000000.0;
+             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);
+             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;
+                 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;
+                     snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%c:%2.2f ", type[j], psnr(error/scale));
+                 }
+                 snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "*:%2.2f ", psnr(error_sum/scale_sum));
+             }
+             vid = 1;
+         }
+         /* compute min output value */
 -    if (ti1 < 0.01)
 -        ti1 = 0.01;
++        pts = FFMIN(pts, av_rescale_q(ost->st->pts.val,
++                                      ost->st->time_base, AV_TIME_BASE_Q));
+     }
 -        bitrate = (double)(total_size * 8) / ti1 / 1000.0;
+     if (verbose > 0 || is_last_report) {
 -            "size=%8.0fkB time=%0.2f bitrate=%6.1fkbits/s",
 -            (double)total_size / 1024, ti1, bitrate);
++        int hours, mins, secs, us;
++        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),
 -                    ist->next_pts = ist->pts = guess_correct_pts(&ist->pts_ctx, picture.pkt_pts, picture.pkt_dts);
++                 "%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);
+         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);
+         if (verbose >= 0)
+             fprintf(stderr, "%s    \r", buf);
+         fflush(stderr);
+     }
+     if (is_last_report && verbose >= 0){
+         int64_t raw= audio_size + video_size + extra_size;
+         fprintf(stderr, "\n");
+         fprintf(stderr, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n",
+                 video_size/1024.0,
+                 audio_size/1024.0,
+                 extra_size/1024.0,
+                 100.0*(total_size - raw)/raw
+         );
+     }
+ }
+ static void generate_silence(uint8_t* buf, enum AVSampleFormat sample_fmt, size_t size)
+ {
+     int fill_char = 0x00;
+     if (sample_fmt == AV_SAMPLE_FMT_U8)
+         fill_char = 0x80;
+     memset(buf, fill_char, size);
+ }
+ /* pkt = NULL means EOF (needed to flush decoder buffers) */
+ static int output_packet(InputStream *ist, int ist_index,
+                          OutputStream **ost_table, int nb_ostreams,
+                          const AVPacket *pkt)
+ {
+     AVFormatContext *os;
+     OutputStream *ost;
+     int ret, i;
+     int got_output;
+     AVFrame picture;
+     void *buffer_to_free = NULL;
+     static unsigned int samples_size= 0;
+     AVSubtitle subtitle, *subtitle_to_free;
+     int64_t pkt_pts = AV_NOPTS_VALUE;
+ #if CONFIG_AVFILTER
+     int frame_available;
+ #endif
+     float quality;
+     AVPacket avpkt;
+     int bps = av_get_bytes_per_sample(ist->st->codec->sample_fmt);
+     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_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
+     if(pkt->pts != AV_NOPTS_VALUE)
+         pkt_pts = av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q);
+     //while we have more to decode or while the decoder did output something on EOF
+     while (avpkt.size > 0 || (!pkt && got_output)) {
+         uint8_t *data_buf, *decoded_data_buf;
+         int data_size, decoded_data_size;
+     handle_eof:
+         ist->pts= ist->next_pts;
+         if(avpkt.size && avpkt.size != pkt->size &&
+            ((!ist->showed_multi_packet_warning && verbose>0) || verbose>1)){
+             fprintf(stderr, "Multiple frames in a packet from stream %d\n", pkt->stream_index);
+             ist->showed_multi_packet_warning=1;
+         }
+         /* decode the packet if needed */
+         decoded_data_buf = NULL; /* fail safe */
+         decoded_data_size= 0;
+         data_buf  = avpkt.data;
+         data_size = avpkt.size;
+         subtitle_to_free = NULL;
+         if (ist->decoding_needed) {
+             switch(ist->st->codec->codec_type) {
+             case AVMEDIA_TYPE_AUDIO:{
+                 if(pkt && samples_size < FFMAX(pkt->size*sizeof(*samples), AVCODEC_MAX_AUDIO_FRAME_SIZE)) {
+                     samples_size = FFMAX(pkt->size*sizeof(*samples), AVCODEC_MAX_AUDIO_FRAME_SIZE);
+                     av_free(samples);
+                     samples= av_malloc(samples_size);
+                 }
+                 decoded_data_size= samples_size;
+                     /* XXX: could avoid copy if PCM 16 bits with same
+                        endianness as CPU */
+                 ret = avcodec_decode_audio3(ist->st->codec, samples, &decoded_data_size,
+                                             &avpkt);
+                 if (ret < 0)
+                     return ret;
+                 avpkt.data += ret;
+                 avpkt.size -= ret;
+                 data_size   = ret;
+                 got_output  = decoded_data_size > 0;
+                 /* Some bug in mpeg audio decoder gives */
+                 /* decoded_data_size < 0, it seems they are overflows */
+                 if (!got_output) {
+                     /* no audio frame */
+                     continue;
+                 }
+                 decoded_data_buf = (uint8_t *)samples;
+                 ist->next_pts += ((int64_t)AV_TIME_BASE/bps * decoded_data_size) /
+                     (ist->st->codec->sample_rate * ist->st->codec->channels);
+                 break;}
+             case AVMEDIA_TYPE_VIDEO:
+                     decoded_data_size = (ist->st->codec->width * ist->st->codec->height * 3) / 2;
+                     /* XXX: allocate picture correctly */
+                     avcodec_get_frame_defaults(&picture);
+                     avpkt.pts = pkt_pts;
+                     avpkt.dts = ist->pts;
+                     pkt_pts = AV_NOPTS_VALUE;
+                     ret = avcodec_decode_video2(ist->st->codec,
+                                                 &picture, &got_output, &avpkt);
+                     quality = same_quality ? picture.quality : 0;
+                     if (ret < 0)
+                         return ret;
+                     if (!got_output) {
+                         /* no picture yet */
+                         goto discard_packet;
+                     }
 -        if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 -            for (i = 0; i < nb_ostreams; i++) {
++                    ist->next_pts = ist->pts = picture.best_effort_timestamp;
+                     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_pts += ((int64_t)AV_TIME_BASE *
+                                           ist->st->codec->time_base.num * ticks) /
+                             ist->st->codec->time_base.den;
+                     }
+                     avpkt.size = 0;
+                     buffer_to_free = NULL;
+                     pre_process_video_frame(ist, (AVPicture *)&picture, &buffer_to_free);
+                     break;
+             case AVMEDIA_TYPE_SUBTITLE:
+                 ret = avcodec_decode_subtitle2(ist->st->codec,
+                                                &subtitle, &got_output, &avpkt);
+                 if (ret < 0)
+                     return ret;
+                 if (!got_output) {
+                     goto discard_packet;
+                 }
+                 subtitle_to_free = &subtitle;
+                 avpkt.size = 0;
+                 break;
+             default:
+                 return -1;
+             }
+         } else {
+             switch(ist->st->codec->codec_type) {
+             case AVMEDIA_TYPE_AUDIO:
+                 ist->next_pts += ((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;
+                     ist->next_pts += ((int64_t)AV_TIME_BASE *
+                                       ist->st->codec->time_base.num * ticks) /
+                         ist->st->codec->time_base.den;
+                 }
+                 break;
+             }
+             ret = avpkt.size;
+             avpkt.size = 0;
+         }
+ #if CONFIG_AVFILTER
 -                    AVRational sar;
 -                    if (ist->st->sample_aspect_ratio.num)
 -                        sar = ist->st->sample_aspect_ratio;
 -                    else
 -                        sar = ist->st->codec->sample_aspect_ratio;
 -                    // add it to be filtered
 -                    av_vsrc_buffer_add_frame(ost->input_video_filter, &picture,
 -                                             ist->pts,
 -                                             sar);
++        if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
++        if (start_time == 0 || ist->pts >= start_time) {
++            for(i=0;i<nb_ostreams;i++) {
+                 ost = ost_table[i];
+                 if (ost->input_video_filter && ost->source_index == ist_index) {
 -                    AVRational ist_pts_tb;
 -                    if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ost->output_video_filter)
 -                        get_filtered_video_frame(ost->output_video_filter, &picture, &ost->picref, &ist_pts_tb);
 -                    if (ost->picref)
 -                        ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q);
++                    if (!picture.sample_aspect_ratio.num)
++                        picture.sample_aspect_ratio = ist->st->sample_aspect_ratio;
++                    picture.pts = ist->pts;
++
++                    av_vsrc_buffer_add_frame(ost->input_video_filter, &picture, AV_VSRC_BUF_FLAG_OVERWRITE);
+                 }
+             }
+         }
+ #endif
+         // preprocess audio (volume)
+         if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+             if (audio_volume != 256) {
+                 short *volp;
+                 volp = samples;
+                 for(i=0;i<(decoded_data_size / sizeof(short));i++) {
+                     int v = ((*volp) * audio_volume + 128) >> 8;
+                     if (v < -32768) v = -32768;
+                     if (v >  32767) v = 32767;
+                     *volp++ = v;
+                 }
+             }
+         }
+         /* frame rate emulation */
+         if (rate_emu) {
+             int64_t pts = av_rescale(ist->pts, 1000000, AV_TIME_BASE);
+             int64_t now = av_gettime() - ist->start;
+             if (pts > now)
+                 usleep(pts - now);
+         }
+         /* if output time reached then transcode raw format,
+            encode packets and output them */
+         if (start_time == 0 || ist->pts >= start_time)
+             for(i=0;i<nb_ostreams;i++) {
+                 int frame_size;
+                 ost = ost_table[i];
+                 if (ost->source_index == ist_index) {
+ #if CONFIG_AVFILTER
+                 frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO ||
+                     !ost->output_video_filter || avfilter_poll_frame(ost->output_video_filter->inputs[0]);
+                 while (frame_available) {
 -                                ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect;
++                    if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ost->output_video_filter) {
++                        AVRational ist_pts_tb = ost->output_video_filter->inputs[0]->time_base;
++                        if (av_vsink_buffer_get_video_buffer_ref(ost->output_video_filter, &ost->picref, 0) < 0)
++                            goto cont;
++                        if (ost->picref) {
++                            avfilter_fill_frame_from_video_buffer_ref(&picture, ost->picref);
++                            ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q);
++                        }
++                    }
+ #endif
+                     os = output_files[ost->file_index];
+                     /* set the input output pts pairs */
+                     //ost->sync_ipts = (double)(ist->pts + input_files[ist->file_index].ts_offset - start_time)/ AV_TIME_BASE;
+                     if (ost->encoding_needed) {
+                         av_assert0(ist->decoding_needed);
+                         switch(ost->st->codec->codec_type) {
+                         case AVMEDIA_TYPE_AUDIO:
+                             do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size);
+                             break;
+                         case AVMEDIA_TYPE_VIDEO:
+ #if CONFIG_AVFILTER
+                             if (ost->picref->video && !ost->frame_aspect_ratio)
 -                    if (ost->picref)
 -                        avfilter_unref_buffer(ost->picref);
++                                ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio;
+ #endif
+                             do_video_out(os, ost, ist, &picture, &frame_size,
+                                          same_quality ? quality : ost->st->codec->global_quality);
+                             if (vstats_filename && frame_size)
+                                 do_video_stats(os, ost, frame_size);
+                             break;
+                         case AVMEDIA_TYPE_SUBTITLE:
+                             do_subtitle_out(os, ost, ist, &subtitle,
+                                             pkt->pts);
+                             break;
+                         default:
+                             abort();
+                         }
+                     } else {
+                         AVFrame avframe; //FIXME/XXX remove this
++                        AVPicture pict;
+                         AVPacket opkt;
+                         int64_t ost_tb_start_time= av_rescale_q(start_time, AV_TIME_BASE_Q, ost->st->time_base);
+                         av_init_packet(&opkt);
+                         if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) && !copy_initial_nonkeyframes)
+ #if !CONFIG_AVFILTER
+                             continue;
+ #else
+                             goto cont;
+ #endif
+                         /* no reencoding needed : output the packet directly */
+                         /* force the input stream PTS */
+                         avcodec_get_frame_defaults(&avframe);
+                         ost->st->codec->coded_frame= &avframe;
+                         avframe.key_frame = pkt->flags & AV_PKT_FLAG_KEY;
+                         if(ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+                             audio_size += data_size;
+                         else if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+                             video_size += data_size;
+                             ost->sync_opts++;
+                         }
+                         opkt.stream_index= ost->index;
+                         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->pts, 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 != CODEC_ID_H264
+                            && ost->st->codec->codec_id != CODEC_ID_MPEG1VIDEO
+                            && ost->st->codec->codec_id != CODEC_ID_MPEG2VIDEO
+                            ) {
+                             if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & AV_PKT_FLAG_KEY))
+                                 opkt.destruct= av_destruct_packet;
+                         } else {
+                             opkt.data = data_buf;
+                             opkt.size = data_size;
+                         }
++                        if (os->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(os, &opkt, ost->st->codec, ost->bitstream_filters);
+                         ost->st->codec->frame_number++;
+                         ost->frame_number++;
+                         av_free_packet(&opkt);
+                     }
+ #if CONFIG_AVFILTER
+                     cont:
+                     frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
+                                        ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]);
 -    int ret = 0, i, j, k, n, nb_ostreams = 0;
++                    avfilter_unref_buffer(ost->picref);
+                 }
+ #endif
+                 }
+             }
+         av_free(buffer_to_free);
+         /* XXX: allocate the subtitles in the codec ? */
+         if (subtitle_to_free) {
+             avsubtitle_free(subtitle_to_free);
+             subtitle_to_free = NULL;
+         }
+     }
+  discard_packet:
+     if (pkt == NULL) {
+         /* EOF handling */
+         for(i=0;i<nb_ostreams;i++) {
+             ost = ost_table[i];
+             if (ost->source_index == ist_index) {
+                 AVCodecContext *enc= ost->st->codec;
+                 os = output_files[ost->file_index];
+                 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))
+                     continue;
+                 if (ost->encoding_needed) {
+                     for(;;) {
+                         AVPacket pkt;
+                         int fifo_bytes;
+                         av_init_packet(&pkt);
+                         pkt.stream_index= ost->index;
+                         switch(ost->st->codec->codec_type) {
+                         case AVMEDIA_TYPE_AUDIO:
+                             fifo_bytes = av_fifo_size(ost->fifo);
+                             ret = 0;
+                             /* encode any samples remaining in fifo */
+                             if (fifo_bytes > 0) {
+                                 int osize = av_get_bytes_per_sample(enc->sample_fmt);
+                                 int fs_tmp = enc->frame_size;
+                                 av_fifo_generic_read(ost->fifo, audio_buf, fifo_bytes, NULL);
+                                 if (enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
+                                     enc->frame_size = fifo_bytes / (osize * enc->channels);
+                                 } else { /* pad */
+                                     int frame_bytes = enc->frame_size*osize*enc->channels;
+                                     if (allocated_audio_buf_size < frame_bytes)
+                                         exit_program(1);
+                                     generate_silence(audio_buf+fifo_bytes, enc->sample_fmt, frame_bytes - fifo_bytes);
+                                 }
+                                 ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, (short *)audio_buf);
+                                 pkt.duration = av_rescale((int64_t)enc->frame_size*ost->st->time_base.den,
+                                                           ost->st->time_base.num, enc->sample_rate);
+                                 enc->frame_size = fs_tmp;
+                             }
+                             if(ret <= 0) {
+                                 ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL);
+                             }
+                             if (ret < 0) {
+                                 fprintf(stderr, "Audio encoding failed\n");
+                                 exit_program(1);
+                             }
+                             audio_size += ret;
+                             pkt.flags |= AV_PKT_FLAG_KEY;
+                             break;
+                         case AVMEDIA_TYPE_VIDEO:
+                             ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL);
+                             if (ret < 0) {
+                                 fprintf(stderr, "Video encoding failed\n");
+                                 exit_program(1);
+                             }
+                             video_size += ret;
+                             if(enc->coded_frame && enc->coded_frame->key_frame)
+                                 pkt.flags |= AV_PKT_FLAG_KEY;
+                             if (ost->logfile && enc->stats_out) {
+                                 fprintf(ost->logfile, "%s", enc->stats_out);
+                             }
+                             break;
+                         default:
+                             ret=-1;
+                         }
+                         if(ret<=0)
+                             break;
+                         pkt.data= bit_buffer;
+                         pkt.size= ret;
+                         if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
+                             pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
+                         write_frame(os, &pkt, ost->st->codec, ost->bitstream_filters);
+                     }
+                 }
+             }
+         }
+     }
+     return 0;
+ }
+ static void print_sdp(AVFormatContext **avc, int n)
+ {
+     char sdp[2048];
+     av_sdp_create(avc, n, sdp, sizeof(sdp));
+     printf("SDP:\n%s\n", sdp);
+     fflush(stdout);
+ }
+ static int copy_chapters(int infile, int outfile)
+ {
+     AVFormatContext *is = input_files[infile].ctx;
+     AVFormatContext *os = output_files[outfile];
+     int i;
+     for (i = 0; i < is->nb_chapters; i++) {
+         AVChapter *in_ch = is->chapters[i], *out_ch;
+         int64_t ts_off   = av_rescale_q(start_time - input_files[infile].ts_offset,
+                                       AV_TIME_BASE_Q, in_ch->time_base);
+         int64_t rt       = (recording_time == INT64_MAX) ? INT64_MAX :
+                            av_rescale_q(recording_time, AV_TIME_BASE_Q, in_ch->time_base);
+         if (in_ch->end < ts_off)
+             continue;
+         if (rt != INT64_MAX && in_ch->start > rt + ts_off)
+             break;
+         out_ch = av_mallocz(sizeof(AVChapter));
+         if (!out_ch)
+             return AVERROR(ENOMEM);
+         out_ch->id        = in_ch->id;
+         out_ch->time_base = in_ch->time_base;
+         out_ch->start     = FFMAX(0,  in_ch->start - ts_off);
+         out_ch->end       = FFMIN(rt, in_ch->end   - ts_off);
+         if (metadata_chapters_autocopy)
+             av_dict_copy(&out_ch->metadata, in_ch->metadata, 0);
+         os->nb_chapters++;
+         os->chapters = av_realloc(os->chapters, sizeof(AVChapter)*os->nb_chapters);
+         if (!os->chapters)
+             return AVERROR(ENOMEM);
+         os->chapters[os->nb_chapters - 1] = out_ch;
+     }
+     return 0;
+ }
+ 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);
+     }
+     for (i = 0; i < n; i++) {
+         p = i ? strchr(p, ',') + 1 : kf;
+         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);
+     }
+ }
+ /*
+  * The following code is the main loop of the file converter
+  */
+ static int transcode(AVFormatContext **output_files,
+                      int nb_output_files,
+                      InputFile *input_files,
+                      int nb_input_files)
+ {
 -            if(!copy_tb && av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/500){
 -                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;
++    int ret = 0, i, j, k, n, nb_ostreams = 0, step;
++
+     AVFormatContext *is, *os;
+     AVCodecContext *codec, *icodec;
+     OutputStream *ost, **ost_table = NULL;
+     InputStream *ist;
+     char error[1024];
++    int key;
+     int want_sdp = 1;
+     uint8_t no_packet[MAX_FILES]={0};
+     int no_packet_count=0;
++    int nb_frame_threshold[AVMEDIA_TYPE_NB]={0};
++    int nb_streams[AVMEDIA_TYPE_NB]={0};
+     if (rate_emu)
+         for (i = 0; i < nb_input_streams; i++)
+             input_streams[i].start = av_gettime();
+     /* output stream init */
+     nb_ostreams = 0;
+     for(i=0;i<nb_output_files;i++) {
+         os = output_files[i];
+         if (!os->nb_streams && !(os->oformat->flags & AVFMT_NOSTREAMS)) {
+             av_dump_format(output_files[i], i, output_files[i]->filename, 1);
+             fprintf(stderr, "Output file #%d does not contain any stream\n", i);
+             ret = AVERROR(EINVAL);
+             goto fail;
+         }
+         nb_ostreams += os->nb_streams;
+     }
+     ost_table = av_mallocz(sizeof(OutputStream *) * nb_ostreams);
+     if (!ost_table)
+         goto fail;
++
++    for(k=0;k<nb_output_files;k++) {
++        os = output_files[k];
++        for(i=0;i<os->nb_streams;i++,n++) {
++            nb_streams[os->streams[i]->codec->codec_type]++;
++        }
++    }
++    for(step=1<<30; step; step>>=1){
++        int found_streams[AVMEDIA_TYPE_NB]={0};
++        for(j=0; j<AVMEDIA_TYPE_NB; j++)
++            nb_frame_threshold[j] += step;
++
++        for(j=0; j<nb_input_streams; j++) {
++            int skip=0;
++            ist = &input_streams[j];
++            if(opt_programid){
++                int pi,si;
++                AVFormatContext *f= input_files[ ist->file_index ].ctx;
++                skip=1;
++                for(pi=0; pi<f->nb_programs; pi++){
++                    AVProgram *p= f->programs[pi];
++                    if(p->id == opt_programid)
++                        for(si=0; si<p->nb_stream_indexes; si++){
++                            if(f->streams[ p->stream_index[si] ] == ist->st)
++                                skip=0;
++                        }
++                }
++            }
++            if (ist->discard && ist->st->discard != AVDISCARD_ALL && !skip
++                && nb_frame_threshold[ist->st->codec->codec_type] <= ist->st->codec_info_nb_frames){
++                found_streams[ist->st->codec->codec_type]++;
++            }
++        }
++        for(j=0; j<AVMEDIA_TYPE_NB; j++)
++            if(found_streams[j] < nb_streams[j])
++                nb_frame_threshold[j] -= step;
++    }
+     n = 0;
+     for(k=0;k<nb_output_files;k++) {
+         os = output_files[k];
+         for (i = 0; i < os->nb_streams; i++, n++)
+             ost_table[n] = output_streams_for_file[k][i];
+     }
+     /* for each output stream, we compute the right encoding parameters */
+     for(i=0;i<nb_ostreams;i++) {
+         ost = ost_table[i];
+         os = output_files[ost->file_index];
+         ist = &input_streams[ost->source_index];
+         codec = ost->st->codec;
+         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->st->stream_copy) {
+             uint64_t extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE;
+             if (extra_size > INT_MAX)
+                 goto fail;
+             /* 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(   !os->oformat->codec_tag
+                    || av_codec_get_id (os->oformat->codec_tag, icodec->codec_tag) == codec->codec_id
+                    || av_codec_get_tag(os->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->extradata= av_mallocz(extra_size);
+             if (!codec->extradata)
+                 goto fail;
+             memcpy(codec->extradata, icodec->extradata, icodec->extradata_size);
+             codec->extradata_size= icodec->extradata_size;
 -                    if (icodec->lowres)
 -                        codec->sample_rate >>= icodec->lowres;
++
++            codec->time_base = ist->st->time_base;
++            if(!strcmp(os->oformat->name, "avi")) {
++                if(!copy_tb && 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){
++                    codec->time_base = icodec->time_base;
++                    codec->time_base.num *= icodec->ticks_per_frame;
++                    codec->time_base.den *= 2;
++                }
++            } else if(!(os->oformat->flags & AVFMT_VARIABLE_FPS)) {
++                if(!copy_tb && av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/500){
++                    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);
++
+             switch(codec->codec_type) {
+             case AVMEDIA_TYPE_AUDIO:
+                 if(audio_volume != 256) {
+                     fprintf(stderr,"-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->codec_id == CODEC_ID_MP3)
+                     codec->block_align= 0;
+                 if(codec->codec_id == 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};
+                 }
+                 break;
+             case AVMEDIA_TYPE_SUBTITLE:
+                 codec->width = icodec->width;
+                 codec->height = icodec->height;
+                 break;
+             case AVMEDIA_TYPE_DATA:
+                 break;
+             default:
+                 abort();
+             }
+         } else {
+             if (!ost->enc)
+                 ost->enc = avcodec_find_encoder(ost->st->codec->codec_id);
+             switch(codec->codec_type) {
+             case AVMEDIA_TYPE_AUDIO:
+                 ost->fifo= av_fifo_alloc(1024);
+                 if(!ost->fifo)
+                     goto fail;
+                 ost->reformat_pair = MAKE_SFMT_PAIR(AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NONE);
+                 if (!codec->sample_rate) {
+                     codec->sample_rate = icodec->sample_rate;
 -                if (!codec->channels)
+                 }
+                 choose_sample_rate(ost->st, ost->enc);
+                 codec->time_base = (AVRational){1, codec->sample_rate};
+                 if (codec->sample_fmt == AV_SAMPLE_FMT_NONE)
+                     codec->sample_fmt = icodec->sample_fmt;
+                 choose_sample_fmt(ost->st, ost->enc);
 -                codec->channel_layout = icodec->channel_layout;
++                if (!codec->channels) {
+                     codec->channels = icodec->channels;
 -#if !CONFIG_AVFILTER
 -                    avcodec_get_frame_defaults(&ost->pict_tmp);
 -                    if(avpicture_alloc((AVPicture*)&ost->pict_tmp, codec->pix_fmt,
 -                                       codec->width, codec->height)) {
 -                        fprintf(stderr, "Cannot allocate temp picture, check pix fmt\n");
 -                        exit_program(1);
 -                    }
 -                    ost->img_resample_ctx = sws_getContext(
 -                        icodec->width,
 -                        icodec->height,
 -                        icodec->pix_fmt,
 -                        codec->width,
 -                        codec->height,
 -                        codec->pix_fmt,
 -                        ost->sws_flags, NULL, NULL, NULL);
 -                    if (ost->img_resample_ctx == NULL) {
 -                        fprintf(stderr, "Cannot get resampling context\n");
 -                        exit_program(1);
 -                    }
 -#endif
 -                    codec->bits_per_raw_sample= 0;
++                    codec->channel_layout = icodec->channel_layout;
++                }
+                 if (av_get_channel_layout_nb_channels(codec->channel_layout) != codec->channels)
+                     codec->channel_layout = 0;
+                 ost->audio_resample = codec->sample_rate != icodec->sample_rate || audio_sync_method > 1;
+                 icodec->request_channels = codec->channels;
+                 ist->decoding_needed = 1;
+                 ost->encoding_needed = 1;
+                 ost->resample_sample_fmt  = icodec->sample_fmt;
+                 ost->resample_sample_rate = icodec->sample_rate;
+                 ost->resample_channels    = icodec->channels;
+                 break;
+             case AVMEDIA_TYPE_VIDEO:
+                 if (codec->pix_fmt == PIX_FMT_NONE)
+                     codec->pix_fmt = icodec->pix_fmt;
+                 choose_pixel_fmt(ost->st, ost->enc);
+                 if (ost->st->codec->pix_fmt == PIX_FMT_NONE) {
+                     fprintf(stderr, "Video pixel format is unknown, stream cannot be encoded\n");
+                     exit_program(1);
+                 }
+                 if (!codec->width || !codec->height) {
+                     codec->width  = icodec->width;
+                     codec->height = icodec->height;
+                 }
+                 ost->video_resample = codec->width   != icodec->width  ||
+                                       codec->height  != icodec->height ||
+                                       codec->pix_fmt != icodec->pix_fmt;
+                 if (ost->video_resample) {
 -            if (ost->encoding_needed &&
++                    codec->bits_per_raw_sample= frame_bits_per_raw_sample;
+                 }
+                 ost->resample_height = icodec->height;
+                 ost->resample_width  = icodec->width;
+                 ost->resample_pix_fmt= icodec->pix_fmt;
+                 ost->encoding_needed = 1;
+                 ist->decoding_needed = 1;
+                 if (!ost->frame_rate.num)
+                     ost->frame_rate = ist->st->r_frame_rate.num ? ist->st->r_frame_rate : (AVRational){25,1};
+                 if (ost->enc && ost->enc->supported_framerates && !force_fps) {
+                     int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
+                     ost->frame_rate = ost->enc->supported_framerates[idx];
+                 }
+                 codec->time_base = (AVRational){ost->frame_rate.den, ost->frame_rate.num};
++                if(   av_q2d(codec->time_base) < 0.001 && video_sync_method
++                   && (video_sync_method==1 || (video_sync_method<0 && !(os->oformat->flags & AVFMT_VARIABLE_FPS)))){
++                    av_log(os, AV_LOG_WARNING, "Frame rate very high for a muxer not effciciently supporting it.\n"
++                                               "Please consider specifiying a lower framerate, a different muxer or -vsync 2\n");
++                }
+ #if CONFIG_AVFILTER
+                 if (configure_video_filters(ist, ost)) {
+                     fprintf(stderr, "Error opening filters!\n");
+                     exit(1);
+                 }
+ #endif
+                 break;
+             case AVMEDIA_TYPE_SUBTITLE:
+                 ost->encoding_needed = 1;
+                 ist->decoding_needed = 1;
+                 break;
+             default:
+                 abort();
+                 break;
+             }
+             /* two pass mode */
 -            bit_buffer_size= FFMAX(bit_buffer_size, 6*size + 200);
++            if (ost->encoding_needed && codec->codec_id != CODEC_ID_H264 &&
+                 (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 (codec->flags & CODEC_FLAG_PASS1) {
+                     f = fopen(logfilename, "wb");
+                     if (!f) {
+                         fprintf(stderr, "Cannot write log file '%s' for pass-1 encoding: %s\n", logfilename, strerror(errno));
+                         exit_program(1);
+                     }
+                     ost->logfile = f;
+                 } else {
+                     char  *logbuffer;
+                     size_t logbuffer_size;
+                     if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
+                         fprintf(stderr, "Error reading log file '%s' for pass-2 encoding\n", logfilename);
+                         exit_program(1);
+                     }
+                     codec->stats_in = logbuffer;
+                 }
+             }
+         }
+         if(codec->codec_type == AVMEDIA_TYPE_VIDEO){
++            /* maximum video buffer size is 6-bytes per pixel, plus DPX header size */
+             int size= codec->width * codec->height;
 -
 -            /* update requested sample format for the decoder based on the
 -               corresponding encoder sample format */
 -            for (j = 0; j < nb_ostreams; j++) {
 -                ost = ost_table[j];
 -                if (ost->source_index == i) {
 -                    update_sample_fmt(ist->st->codec, codec, ost->st->codec);
 -                    break;
 -                }
 -            }
 -
++            bit_buffer_size= FFMAX(bit_buffer_size, 6*size + 1664);
+         }
+     }
+     if (!bit_buffer)
+         bit_buffer = av_malloc(bit_buffer_size);
+     if (!bit_buffer) {
+         fprintf(stderr, "Cannot allocate %d bytes output buffer\n",
+                 bit_buffer_size);
+         ret = AVERROR(ENOMEM);
+         goto fail;
+     }
+     /* open each encoder */
+     for(i=0;i<nb_ostreams;i++) {
+         ost = ost_table[i];
+         if (ost->encoding_needed) {
+             AVCodec *codec = ost->enc;
+             AVCodecContext *dec = input_streams[ost->source_index].st->codec;
+             if (!codec) {
+                 snprintf(error, sizeof(error), "Encoder (codec id %d) not found for output stream #%d.%d",
+                          ost->st->codec->codec_id, ost->file_index, ost->index);
+                 ret = AVERROR(EINVAL);
+                 goto dump_format;
+             }
+             if (dec->subtitle_header) {
+                 ost->st->codec->subtitle_header = av_malloc(dec->subtitle_header_size);
+                 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 (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;
+             }
+             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;
+         }
+     }
+     /* open each decoder */
+     for (i = 0; i < nb_input_streams; i++) {
+         ist = &input_streams[i];
+         if (ist->decoding_needed) {
+             AVCodec *codec = ist->dec;
+             if (!codec)
+                 codec = avcodec_find_decoder(ist->st->codec->codec_id);
+             if (!codec) {
+                 snprintf(error, sizeof(error), "Decoder (codec id %d) not found for input stream #%d.%d",
+                         ist->st->codec->codec_id, ist->file_index, ist->st->index);
+                 ret = AVERROR(EINVAL);
+                 goto dump_format;
+             }
 -        init_pts_correction(&ist->pts_ctx);
+             if (avcodec_open2(ist->st->codec, codec, &ist->opts) < 0) {
+                 snprintf(error, sizeof(error), "Error while opening decoder for input stream #%d.%d",
+                         ist->file_index, ist->st->index);
+                 ret = AVERROR(EINVAL);
+                 goto dump_format;
+             }
+             assert_codec_experimental(ist->st->codec, 0);
+             assert_avoptions(ost->opts);
+             //if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+             //    ist->st->codec->flags |= CODEC_FLAG_REPEAT_FIELD;
+         }
+     }
+     /* init pts */
+     for (i = 0; i < nb_input_streams; i++) {
+         AVStream *st;
+         ist = &input_streams[i];
+         st= ist->st;
+         ist->pts = st->avg_frame_rate.num ? - st->codec->has_b_frames*AV_TIME_BASE / av_q2d(st->avg_frame_rate) : 0;
+         ist->next_pts = AV_NOPTS_VALUE;
 -        assert_avoptions(output_opts[i]);
+         ist->is_start = 1;
+     }
+     /* open files and write file headers */
+     for(i=0;i<nb_output_files;i++) {
+         os = output_files[i];
+         if (avformat_write_header(os, &output_opts[i]) < 0) {
+             snprintf(error, sizeof(error), "Could not write header for output file #%d (incorrect codec parameters ?)", i);
+             ret = AVERROR(EINVAL);
+             goto dump_format;
+         }
 -    if (verbose >= 0)
 -        fprintf(stderr, "Press ctrl-c to stop encoding\n");
++//        assert_avoptions(output_opts[i]);
+         if (strcmp(output_files[i]->oformat->name, "rtp")) {
+             want_sdp = 0;
+         }
+     }
+  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], i, output_files[i]->filename, 1);
+     }
+     /* dump the stream mapping */
+     if (verbose >= 0) {
+         fprintf(stderr, "Stream mapping:\n");
+         for(i=0;i<nb_ostreams;i++) {
+             ost = ost_table[i];
+             fprintf(stderr, "  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])
+                 fprintf(stderr, " [sync #%d.%d]",
+                         ost->sync_ist->file_index,
+                         ost->sync_ist->st->index);
+             fprintf(stderr, "\n");
+         }
+     }
+     if (ret) {
+         fprintf(stderr, "%s\n", error);
+         goto fail;
+     }
+     if (want_sdp) {
+         print_sdp(output_files, nb_output_files);
+     }
 -        if (pkt.stream_index >= input_files[file_index].ctx->nb_streams)
++    if (!using_stdin) {
++        if(verbose >= 0)
++            fprintf(stderr, "Press [q] to stop, [?] for help\n");
++        avio_set_interrupt_cb(decode_interrupt_cb);
++    }
+     term_init();
+     timer_start = av_gettime();
+     for(; received_sigterm == 0;) {
+         int file_index, ist_index;
+         AVPacket pkt;
+         double ipts_min;
+         double opts_min;
+     redo:
+         ipts_min= 1e100;
+         opts_min= 1e100;
++        /* if 'q' pressed, exits */
++        if (!using_stdin) {
++            if (q_pressed)
++                break;
++            /* read_key() returns 0 on EOF */
++            key = read_key();
++            if (key == 'q')
++                break;
++            if (key == '+') verbose++;
++            if (key == '-') verbose--;
++            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 == '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
++                    scanf("%d", &debug);
++                for(i=0;i<nb_input_streams;i++) {
++                    input_streams[i].st->codec->debug = debug;
++                }
++                for(i=0;i<nb_ostreams;i++) {
++                    ost = ost_table[i];
++                    ost->st->codec->debug = debug;
++                }
++                if(debug) av_log_set_level(AV_LOG_DEBUG);
++                fprintf(stderr,"debug=%d\n", debug);
++            }
++            if (key == '?'){
++                fprintf(stderr, "key    function\n"
++                                "?      show this help\n"
++                                "+      increase verbosity\n"
++                                "-      decrease verbosity\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"
++                );
++            }
++        }
+         /* select the stream that we must read now by looking at the
+            smallest output pts */
+         file_index = -1;
+         for(i=0;i<nb_ostreams;i++) {
+             double ipts, opts;
+             ost = ost_table[i];
+             os = output_files[ost->file_index];
+             ist = &input_streams[ost->source_index];
+             if(ist->is_past_recording_time || no_packet[ist->file_index])
+                 continue;
+                 opts = ost->st->pts.val * av_q2d(ost->st->time_base);
+             ipts = (double)ist->pts;
+             if (!input_files[ist->file_index].eof_reached){
+                 if(ipts < ipts_min) {
+                     ipts_min = ipts;
+                     if(input_sync ) file_index = ist->file_index;
+                 }
+                 if(opts < opts_min) {
+                     opts_min = opts;
+                     if(!input_sync) file_index = ist->file_index;
+                 }
+             }
+             if(ost->frame_number >= max_frames[ost->st->codec->codec_type]){
+                 file_index= -1;
+                 break;
+             }
+         }
+         /* if none, if is finished */
+         if (file_index < 0) {
+             if(no_packet_count){
+                 no_packet_count=0;
+                 memset(no_packet, 0, sizeof(no_packet));
+                 usleep(10000);
+                 continue;
+             }
+             break;
+         }
+         /* finish if limit size exhausted */
+         if (limit_filesize != 0 && limit_filesize <= avio_tell(output_files[0]->pb))
+             break;
+         /* read a frame from it and output it in the fifo */
+         is = input_files[file_index].ctx;
+         ret= av_read_frame(is, &pkt);
+         if(ret == AVERROR(EAGAIN)){
+             no_packet[file_index]=1;
+             no_packet_count++;
+             continue;
+         }
+         if (ret < 0) {
+             input_files[file_index].eof_reached = 1;
+             if (opt_shortest)
+                 break;
+             else
+                 continue;
+         }
+         no_packet_count=0;
+         memset(no_packet, 0, sizeof(no_packet));
+         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 */
 -            av_compare_ts(pkt.pts, ist->st->time_base, recording_time + start_time, (AVRational){1, 1000000}) >= 0) {
++        if (pkt.stream_index >= input_files[file_index].nb_streams)
+             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;
+         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->ts_scale) {
+             if(pkt.pts != AV_NOPTS_VALUE)
+                 pkt.pts *= ist->ts_scale;
+             if(pkt.dts != AV_NOPTS_VALUE)
+                 pkt.dts *= ist->ts_scale;
+         }
+ //        fprintf(stderr, "next:%"PRId64" dts:%"PRId64" off:%"PRId64" %d\n", ist->next_pts, pkt.dts, input_files[ist->file_index].ts_offset, ist->st->codec->codec_type);
+         if (pkt.dts != AV_NOPTS_VALUE && ist->next_pts != AV_NOPTS_VALUE
+             && (is->iformat->flags & AVFMT_TS_DISCONT)) {
+             int64_t pkt_dts= av_rescale_q(pkt.dts, ist->st->time_base, AV_TIME_BASE_Q);
+             int64_t delta= pkt_dts - ist->next_pts;
+             if((FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE || pkt_dts+1<ist->pts)&& !copy_ts){
+                 input_files[ist->file_index].ts_offset -= delta;
+                 if (verbose > 2)
+                     fprintf(stderr, "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);
+             }
+         }
+         /* finish if recording time exhausted */
+         if (recording_time != INT64_MAX &&
 -                av_free(ost->pict_tmp.data[0]);
++            (pkt.pts != AV_NOPTS_VALUE ?
++                av_compare_ts(pkt.pts, ist->st->time_base, recording_time + start_time, (AVRational){1, 1000000})
++                    :
++                av_compare_ts(ist->pts, AV_TIME_BASE_Q, recording_time + start_time, (AVRational){1, 1000000})
++            )>= 0) {
+             ist->is_past_recording_time = 1;
+             goto discard_packet;
+         }
+         //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size);
+         if (output_packet(ist, ist_index, ost_table, nb_ostreams, &pkt) < 0) {
+             if (verbose >= 0)
+                 fprintf(stderr, "Error while decoding stream #%d.%d\n",
+                         ist->file_index, ist->st->index);
+             if (exit_on_error)
+                 exit_program(1);
+             av_free_packet(&pkt);
+             goto redo;
+         }
+     discard_packet:
+         av_free_packet(&pkt);
+         /* dump report by using the output first video and audio streams */
+         print_report(output_files, ost_table, nb_ostreams, 0);
+     }
+     /* at the end of stream, we must flush the decoder buffers */
+     for (i = 0; i < nb_input_streams; i++) {
+         ist = &input_streams[i];
+         if (ist->decoding_needed) {
+             output_packet(ist, i, ost_table, nb_ostreams, NULL);
+         }
+     }
+     term_exit();
+     /* write the trailer if needed and close file */
+     for(i=0;i<nb_output_files;i++) {
+         os = output_files[i];
+         av_write_trailer(os);
+     }
+     /* dump report by using the first video and audio streams */
+     print_report(output_files, ost_table, nb_ostreams, 1);
+     /* close each encoder */
+     for(i=0;i<nb_ostreams;i++) {
+         ost = ost_table[i];
+         if (ost->encoding_needed) {
+             av_freep(&ost->st->codec->stats_in);
+             avcodec_close(ost->st->codec);
+         }
+ #if CONFIG_AVFILTER
+         avfilter_graph_free(&ost->graph);
+ #endif
+     }
+     /* close each decoder */
+     for (i = 0; i < nb_input_streams; i++) {
+         ist = &input_streams[i];
+         if (ist->decoding_needed) {
+             avcodec_close(ist->st->codec);
+         }
+     }
+     /* finished ! */
+     ret = 0;
+  fail:
+     av_freep(&bit_buffer);
+     if (ost_table) {
+         for(i=0;i<nb_ostreams;i++) {
+             ost = ost_table[i];
+             if (ost) {
+                 if (ost->st->stream_copy)
+                     av_freep(&ost->st->codec->extradata);
+                 if (ost->logfile) {
+                     fclose(ost->logfile);
+                     ost->logfile = NULL;
+                 }
+                 av_fifo_free(ost->fifo); /* works even if fifo is not
+                                              initialized but set to zero */
+                 av_freep(&ost->st->codec->subtitle_header);
 -        show_pix_fmts();
++                av_free(ost->resample_frame.data[0]);
+                 av_free(ost->forced_kf_pts);
+                 if (ost->video_resample)
+                     sws_freeContext(ost->img_resample_ctx);
+                 if (ost->resample)
+                     audio_resample_close(ost->resample);
+                 if (ost->reformat_ctx)
+                     av_audio_convert_free(ost->reformat_ctx);
+                 av_dict_free(&ost->opts);
+                 av_free(ost);
+             }
+         }
+         av_free(ost_table);
+     }
+     return ret;
+ }
+ static int opt_format(const char *opt, const char *arg)
+ {
+     last_asked_format = arg;
+     return 0;
+ }
+ static int opt_video_rc_override_string(const char *opt, const char *arg)
+ {
+     video_rc_override_string = arg;
+     return 0;
+ }
+ static int opt_me_threshold(const char *opt, const char *arg)
+ {
+     me_threshold = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX);
+     return 0;
+ }
+ static int opt_verbose(const char *opt, const char *arg)
+ {
+     verbose = parse_number_or_die(opt, arg, OPT_INT64, -10, 10);
+     return 0;
+ }
+ static int opt_frame_rate(const char *opt, const char *arg)
+ {
+     if (av_parse_video_rate(&frame_rate, arg) < 0) {
+         fprintf(stderr, "Incorrect value for %s: %s\n", opt, arg);
+         exit_program(1);
+     }
+     return 0;
+ }
+ static int opt_frame_crop(const char *opt, const char *arg)
+ {
+     fprintf(stderr, "Option '%s' has been removed, use the crop filter instead\n", opt);
+     return AVERROR(EINVAL);
+ }
+ static int opt_frame_size(const char *opt, const char *arg)
+ {
+     if (av_parse_video_size(&frame_width, &frame_height, arg) < 0) {
+         fprintf(stderr, "Incorrect frame size\n");
+         return AVERROR(EINVAL);
+     }
+     return 0;
+ }
+ static int opt_pad(const char *opt, const char *arg) {
+     fprintf(stderr, "Option '%s' has been removed, use the pad filter instead\n", opt);
+     return -1;
+ }
+ static int opt_frame_pix_fmt(const char *opt, const char *arg)
+ {
+     if (strcmp(arg, "list")) {
+         frame_pix_fmt = av_get_pix_fmt(arg);
+         if (frame_pix_fmt == PIX_FMT_NONE) {
+             fprintf(stderr, "Unknown pixel format requested: %s\n", arg);
+             return AVERROR(EINVAL);
+         }
+     } else {
 -    if (video_qscale == 0) {
++        opt_pix_fmts(NULL, NULL);
+         exit_program(0);
+     }
+     return 0;
+ }
+ static int opt_frame_aspect_ratio(const char *opt, const char *arg)
+ {
+     int x = 0, y = 0;
+     double ar = 0;
+     const char *p;
+     char *end;
+     p = strchr(arg, ':');
+     if (p) {
+         x = strtol(arg, &end, 10);
+         if (end == p)
+             y = strtol(end+1, &end, 10);
+         if (x > 0 && y > 0)
+             ar = (double)x / (double)y;
+     } else
+         ar = strtod(arg, NULL);
+     if (!ar) {
+         fprintf(stderr, "Incorrect aspect ratio specification.\n");
+         return AVERROR(EINVAL);
+     }
+     frame_aspect_ratio = ar;
+     return 0;
+ }
+ static int opt_metadata(const char *opt, const char *arg)
+ {
+     char *mid= strchr(arg, '=');
+     if(!mid){
+         fprintf(stderr, "Missing =\n");
+         exit_program(1);
+     }
+     *mid++= 0;
+     av_dict_set(&metadata, arg, mid, 0);
+     return 0;
+ }
+ static int opt_qscale(const char *opt, const char *arg)
+ {
+     video_qscale = parse_number_or_die(opt, arg, OPT_FLOAT, 0, 255);
 -    return 0;
++    if (video_qscale <= 0 || video_qscale > 255) {
+         fprintf(stderr, "qscale must be > 0.0 and <= 255\n");
+         return AVERROR(EINVAL);
+     }
+     return 0;
+ }
+ static int opt_top_field_first(const char *opt, const char *arg)
+ {
+     top_field_first = parse_number_or_die(opt, arg, OPT_INT, 0, 1);
 -static int opt_codec(int *pstream_copy, char **pcodec_name,
 -                      int codec_type, const char *arg)
++    return opt_default(opt, arg);
+ }
+ static int opt_thread_count(const char *opt, const char *arg)
+ {
+     thread_count= parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX);
+ #if !HAVE_THREADS
+     if (verbose >= 0)
+         fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n");
+ #endif
+     return 0;
+ }
+ static int opt_audio_sample_fmt(const char *opt, const char *arg)
+ {
+     if (strcmp(arg, "list")) {
+         audio_sample_fmt = av_get_sample_fmt(arg);
+         if (audio_sample_fmt == AV_SAMPLE_FMT_NONE) {
+             av_log(NULL, AV_LOG_ERROR, "Invalid sample format '%s'\n", arg);
+             return AVERROR(EINVAL);
+         }
+     } else {
+         int i;
+         char fmt_str[128];
+         for (i = -1; i < AV_SAMPLE_FMT_NB; i++)
+             printf("%s\n", av_get_sample_fmt_string(fmt_str, sizeof(fmt_str), i));
+         exit_program(0);
+     }
+     return 0;
+ }
+ static int opt_audio_rate(const char *opt, const char *arg)
+ {
+     audio_sample_rate = parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX);
+     return 0;
+ }
+ static int opt_audio_channels(const char *opt, const char *arg)
+ {
+     audio_channels = parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX);
+     return 0;
+ }
 -static int opt_audio_codec(const char *opt, const char *arg)
 -{
 -    return opt_codec(&audio_stream_copy, &audio_codec_name, AVMEDIA_TYPE_AUDIO, arg);
 -}
 -
 -static int opt_video_codec(const char *opt, const char *arg)
 -{
 -    return opt_codec(&video_stream_copy, &video_codec_name, AVMEDIA_TYPE_VIDEO, arg);
 -}
 -
 -static int opt_subtitle_codec(const char *opt, const char *arg)
 -{
 -    return opt_codec(&subtitle_stream_copy, &subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, arg);
 -}
 -
 -static int opt_data_codec(const char *opt, const char *arg)
 -{
 -    return opt_codec(&data_stream_copy, &data_codec_name, AVMEDIA_TYPE_DATA, arg);
 -}
 -
++static int opt_codec(const char *opt, const char *arg)
+ {
++    int *pstream_copy; char **pcodec_name; enum AVMediaType codec_type;
++
++    if      (!strcmp(opt, "acodec")) { pstream_copy = &audio_stream_copy;    pcodec_name = &audio_codec_name;    codec_type = AVMEDIA_TYPE_AUDIO;    }
++    else if (!strcmp(opt, "vcodec")) { pstream_copy = &video_stream_copy;    pcodec_name = &video_codec_name;    codec_type = AVMEDIA_TYPE_VIDEO;    }
++    else if (!strcmp(opt, "scodec")) { pstream_copy = &subtitle_stream_copy; pcodec_name = &subtitle_codec_name; codec_type = AVMEDIA_TYPE_SUBTITLE; }
++    else if (!strcmp(opt, "dcodec")) { pstream_copy = &data_stream_copy;     pcodec_name = &data_codec_name;     codec_type = AVMEDIA_TYPE_DATA;     }
++
+     av_freep(pcodec_name);
+     if (!strcmp(arg, "copy")) {
+         *pstream_copy = 1;
+     } else {
+         *pcodec_name = av_strdup(arg);
+     }
+     return 0;
+ }
 -            ist->dec = avcodec_find_decoder_by_name(video_codec_name);
+ static int opt_codec_tag(const char *opt, const char *arg)
+ {
+     char *tail;
+     uint32_t *codec_tag;
+     codec_tag = !strcmp(opt, "atag") ? &audio_codec_tag :
+                 !strcmp(opt, "vtag") ? &video_codec_tag :
+                 !strcmp(opt, "stag") ? &subtitle_codec_tag : NULL;
+     if (!codec_tag)
+         return -1;
+     *codec_tag = strtol(arg, &tail, 0);
+     if (!tail || *tail)
+         *codec_tag = AV_RL32(arg);
+     return 0;
+ }
+ static int opt_map(const char *opt, const char *arg)
+ {
+     StreamMap *m = NULL;
+     int i, negative = 0, file_idx;
+     int sync_file_idx = -1, sync_stream_idx;
+     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_ERROR, "Invalid sync file index: %d.\n", sync_file_idx);
+             exit_program(1);
+         }
+         if (*sync)
+             sync++;
+         for (i = 0; i < input_files[sync_file_idx].ctx->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].ctx->nb_streams) {
+             av_log(NULL, AV_LOG_ERROR, "Sync stream specification in map %s does not "
+                                        "match any streams.\n", arg);
+             exit_program(1);
+         }
+     }
+     file_idx = strtol(map, &p, 0);
+     if (file_idx >= nb_input_files || file_idx < 0) {
+         av_log(NULL, AV_LOG_ERROR, "Invalid input file index: %d.\n", file_idx);
+         exit_program(1);
+     }
+     if (negative)
+         /* disable some already defined maps */
+         for (i = 0; i < nb_stream_maps; i++) {
+             m = &stream_maps[i];
+             if (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].ctx->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;
+             stream_maps = grow_array(stream_maps, sizeof(*stream_maps), &nb_stream_maps, nb_stream_maps + 1);
+             m = &stream_maps[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;
+             }
+         }
+     if (!m) {
+         av_log(NULL, AV_LOG_ERROR, "Stream map '%s' matches no streams.\n", arg);
+         exit_program(1);
+     }
+     av_freep(&map);
+     return 0;
+ }
+ static void parse_meta_type(char *arg, char *type, int *index)
+ {
+     if (*arg == ':') {
+         *type = *(++arg);
+         switch (*arg) {
+         case 'g':
+             break;
+         case 's':
+         case 'c':
+         case 'p':
+             if (*(++arg) == ':')
+                 *index = strtol(++arg, NULL, 0);
+             break;
+         default:
+             fprintf(stderr, "Invalid metadata type %c.\n", *arg);
+             exit_program(1);
+         }
+     } else
+         *type = 'g';
+ }
+ static int opt_map_metadata(const char *opt, const char *arg)
+ {
+     MetadataMap *m, *m1;
+     char *p;
+     meta_data_maps = grow_array(meta_data_maps, sizeof(*meta_data_maps),
+                                 &nb_meta_data_maps, nb_meta_data_maps + 1);
+     m = &meta_data_maps[nb_meta_data_maps - 1][1];
+     m->file = strtol(arg, &p, 0);
+     parse_meta_type(p, &m->type, &m->index);
+     m1 = &meta_data_maps[nb_meta_data_maps - 1][0];
+     if (p = strchr(opt, ':'))
+         parse_meta_type(p, &m1->type, &m1->index);
+     else
+         m1->type = 'g';
+     if (m->type == 'g' || m1->type == 'g')
+         metadata_global_autocopy = 0;
+     if (m->type == 's' || m1->type == 's')
+         metadata_streams_autocopy = 0;
+     if (m->type == 'c' || m1->type == 'c')
+         metadata_chapters_autocopy = 0;
+     return 0;
+ }
+ static int opt_input_ts_scale(const char *opt, const char *arg)
+ {
+     unsigned int stream;
+     double scale;
+     char *p;
+     stream = strtol(arg, &p, 0);
+     if (*p)
+         p++;
+     scale= strtod(p, &p);
++    if(stream >= MAX_STREAMS)
++        exit_program(1);
++
+     ts_scale = grow_array(ts_scale, sizeof(*ts_scale), &nb_ts_scale, stream + 1);
+     ts_scale[stream] = scale;
+     return 0;
+ }
+ static int opt_recording_time(const char *opt, const char *arg)
+ {
+     recording_time = parse_time_or_die(opt, arg, 1);
+     return 0;
+ }
+ static int opt_start_time(const char *opt, const char *arg)
+ {
+     start_time = parse_time_or_die(opt, arg, 1);
+     return 0;
+ }
+ static int opt_input_ts_offset(const char *opt, const char *arg)
+ {
+     input_ts_offset = parse_time_or_die(opt, arg, 1);
+     return 0;
+ }
+ static enum CodecID find_codec_or_die(const char *name, int type, int encoder)
+ {
+     const char *codec_string = encoder ? "encoder" : "decoder";
+     AVCodec *codec;
+     if(!name)
+         return CODEC_ID_NONE;
+     codec = encoder ?
+         avcodec_find_encoder_by_name(name) :
+         avcodec_find_decoder_by_name(name);
+     if(!codec) {
+         fprintf(stderr, "Unknown %s '%s'\n", codec_string, name);
+         exit_program(1);
+     }
+     if(codec->type != type) {
+         fprintf(stderr, "Invalid %s type '%s'\n", codec_string, name);
+         exit_program(1);
+     }
+     return codec->id;
+ }
+ static int opt_input_file(const char *opt, const char *filename)
+ {
+     AVFormatContext *ic;
+     AVInputFormat *file_iformat = NULL;
+     int err, i, ret, rfps, rfps_base;
+     int64_t timestamp;
+     uint8_t buf[128];
+     AVDictionary **opts;
+     int orig_nb_streams;                     // number of streams before avformat_find_stream_info
+     if (last_asked_format) {
+         if (!(file_iformat = av_find_input_format(last_asked_format))) {
+             fprintf(stderr, "Unknown input format: '%s'\n", last_asked_format);
+             exit_program(1);
+         }
+         last_asked_format = NULL;
+     }
+     if (!strcmp(filename, "-"))
+         filename = "pipe:";
+     using_stdin |= !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 (audio_sample_rate) {
+         snprintf(buf, sizeof(buf), "%d", audio_sample_rate);
+         av_dict_set(&format_opts, "sample_rate", buf, 0);
+     }
+     if (audio_channels) {
+         snprintf(buf, sizeof(buf), "%d", audio_channels);
+         av_dict_set(&format_opts, "channels", buf, 0);
+     }
+     if (frame_rate.num) {
+         snprintf(buf, sizeof(buf), "%d/%d", frame_rate.num, frame_rate.den);
+         av_dict_set(&format_opts, "framerate", buf, 0);
+     }
+     if (frame_width && frame_height) {
+         snprintf(buf, sizeof(buf), "%dx%d", frame_width, frame_height);
+         av_dict_set(&format_opts, "video_size", buf, 0);
+     }
+     if (frame_pix_fmt != PIX_FMT_NONE)
+         av_dict_set(&format_opts, "pixel_format", av_get_pix_fmt_name(frame_pix_fmt), 0);
+     ic->video_codec_id   =
+         find_codec_or_die(video_codec_name   , AVMEDIA_TYPE_VIDEO   , 0);
+     ic->audio_codec_id   =
+         find_codec_or_die(audio_codec_name   , AVMEDIA_TYPE_AUDIO   , 0);
+     ic->subtitle_codec_id=
+         find_codec_or_die(subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, 0);
+     ic->flags |= AVFMT_FLAG_NONBLOCK;
+     /* open the input file with generic libav 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);
+     if(opt_programid) {
+         int i, j;
+         int found=0;
+         for(i=0; i<ic->nb_streams; i++){
+             ic->streams[i]->discard= AVDISCARD_ALL;
+         }
+         for(i=0; i<ic->nb_programs; i++){
+             AVProgram *p= ic->programs[i];
+             if(p->id != opt_programid){
+                 p->discard = AVDISCARD_ALL;
+             }else{
+                 found=1;
+                 for(j=0; j<p->nb_stream_indexes; j++){
+                     ic->streams[p->stream_index[j]]->discard= AVDISCARD_DEFAULT;
+                 }
+             }
+         }
+         if(!found){
+             fprintf(stderr, "Specified program id not found\n");
+             exit_program(1);
+         }
+         opt_programid=0;
+     }
+     /* 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 && verbose >= 0) {
+         fprintf(stderr, "%s: could not find codec parameters\n", filename);
+         av_close_input_file(ic);
+         exit_program(1);
+     }
+     timestamp = start_time;
+     /* add the stream start time */
+     if (ic->start_time != AV_NOPTS_VALUE)
+         timestamp += ic->start_time;
+     /* if seeking requested, we execute it */
+     if (start_time != 0) {
+         ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD);
+         if (ret < 0) {
+             fprintf(stderr, "%s: could not seek to position %0.3f\n",
+                     filename, (double)timestamp / AV_TIME_BASE);
+         }
+         /* reset seek info */
+         start_time = 0;
+     }
+     /* update the current parameters so that they match the one of the input stream */
+     for(i=0;i<ic->nb_streams;i++) {
+         AVStream *st = ic->streams[i];
+         AVCodecContext *dec = st->codec;
+         InputStream *ist;
+         dec->thread_count = thread_count;
+         input_streams = grow_array(input_streams, sizeof(*input_streams), &nb_input_streams, nb_input_streams + 1);
+         ist = &input_streams[nb_input_streams - 1];
+         ist->st = st;
+         ist->file_index = nb_input_files;
+         ist->discard = 1;
+         ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st);
+         if (i < nb_ts_scale)
+             ist->ts_scale = ts_scale[i];
+         switch (dec->codec_type) {
+         case AVMEDIA_TYPE_AUDIO:
+             ist->dec = avcodec_find_decoder_by_name(audio_codec_name);
++            if(!ist->dec)
++                ist->dec = avcodec_find_decoder(dec->codec_id);
+             if(audio_disable)
+                 st->discard= AVDISCARD_ALL;
+             break;
+         case AVMEDIA_TYPE_VIDEO:
 -                dec->height >>= dec->lowres;
 -                dec->width  >>= dec->lowres;
++            ist->dec= avcodec_find_decoder_by_name(video_codec_name);
++            if(!ist->dec)
++                ist->dec = avcodec_find_decoder(dec->codec_id);
+             rfps      = ic->streams[i]->r_frame_rate.num;
+             rfps_base = ic->streams[i]->r_frame_rate.den;
+             if (dec->lowres) {
+                 dec->flags |= CODEC_FLAG_EMU_EDGE;
 -        ost->avfilter= vfilters;
+             }
+             if(me_threshold)
+                 dec->debug |= FF_DEBUG_MV;
+             if (dec->time_base.den != rfps*dec->ticks_per_frame || dec->time_base.num != rfps_base) {
+                 if (verbose >= 0)
+                     fprintf(stderr,"\nSeems stream %d codec frame rate differs from container frame rate: %2.2f (%d/%d) -> %2.2f (%d/%d)\n",
+                             i, (float)dec->time_base.den / dec->time_base.num, dec->time_base.den, dec->time_base.num,
+                     (float)rfps / rfps_base, rfps, rfps_base);
+             }
+             if(video_disable)
+                 st->discard= AVDISCARD_ALL;
+             else if(video_discard)
+                 st->discard= video_discard;
+             break;
+         case AVMEDIA_TYPE_DATA:
+             break;
+         case AVMEDIA_TYPE_SUBTITLE:
+             ist->dec = avcodec_find_decoder_by_name(subtitle_codec_name);
++            if(!ist->dec)
++                ist->dec = avcodec_find_decoder(dec->codec_id);
+             if(subtitle_disable)
+                 st->discard = AVDISCARD_ALL;
+             break;
+         case AVMEDIA_TYPE_ATTACHMENT:
+         case AVMEDIA_TYPE_UNKNOWN:
+             break;
+         default:
+             abort();
+         }
+     }
+     /* dump the file content */
+     if (verbose >= 0)
+         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);
+     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  = input_ts_offset - (copy_ts ? 0 : timestamp);
++    input_files[nb_input_files - 1].nb_streams = ic->nb_streams;
++    top_field_first = -1;
+     frame_rate    = (AVRational){0, 0};
+     frame_pix_fmt = PIX_FMT_NONE;
+     frame_height = 0;
+     frame_width  = 0;
+     audio_sample_rate = 0;
+     audio_channels    = 0;
+     audio_sample_fmt  = AV_SAMPLE_FMT_NONE;
+     av_freep(&ts_scale);
+     nb_ts_scale = 0;
+     for (i = 0; i < orig_nb_streams; i++)
+         av_dict_free(&opts[i]);
+     av_freep(&opts);
+     av_freep(&video_codec_name);
+     av_freep(&audio_codec_name);
+     av_freep(&subtitle_codec_name);
+     uninit_opts();
+     init_opts();
+     return 0;
+ }
+ static OutputStream *new_video_stream(AVFormatContext *oc, int file_idx)
+ {
+     AVStream *st;
+     OutputStream *ost;
+     AVCodecContext *video_enc;
+     enum CodecID codec_id = CODEC_ID_NONE;
+     AVCodec *codec= NULL;
+     if(!video_stream_copy){
+         if (video_codec_name) {
+             codec_id = find_codec_or_die(video_codec_name, AVMEDIA_TYPE_VIDEO, 1);
+             codec = avcodec_find_encoder_by_name(video_codec_name);
+         } else {
+             codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
+             codec = avcodec_find_encoder(codec_id);
+         }
+     }
+     ost = new_output_stream(oc, file_idx, codec);
+     st  = ost->st;
+     if (!video_stream_copy) {
+         ost->frame_aspect_ratio = frame_aspect_ratio;
+         frame_aspect_ratio = 0;
+ #if CONFIG_AVFILTER
 -    idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, INT_MAX);
++        ost->avfilter = vfilters;
+         vfilters = NULL;
+ #endif
+     }
+     ost->bitstream_filters = video_bitstream_filters;
+     video_bitstream_filters= NULL;
+     st->codec->thread_count= thread_count;
+     video_enc = st->codec;
+     if(video_codec_tag)
+         video_enc->codec_tag= video_codec_tag;
+     if(oc->oformat->flags & AVFMT_GLOBALHEADER) {
+         video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
+     }
+     video_enc->codec_type = AVMEDIA_TYPE_VIDEO;
+     if (video_stream_copy) {
+         st->stream_copy = 1;
+         video_enc->sample_aspect_ratio =
+         st->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255);
+     } else {
+         const char *p;
+         int i;
+         if (frame_rate.num)
+             ost->frame_rate = frame_rate;
+         video_enc->codec_id = codec_id;
+         video_enc->width = frame_width;
+         video_enc->height = frame_height;
+         video_enc->pix_fmt = frame_pix_fmt;
++        video_enc->bits_per_raw_sample = frame_bits_per_raw_sample;
+         st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
+         if (intra_only)
+             video_enc->gop_size = 0;
+         if (video_qscale || same_quality) {
+             video_enc->flags |= CODEC_FLAG_QSCALE;
+             video_enc->global_quality = FF_QP2LAMBDA * video_qscale;
+         }
+         if(intra_matrix)
+             video_enc->intra_matrix = intra_matrix;
+         if(inter_matrix)
+             video_enc->inter_matrix = inter_matrix;
+         p= video_rc_override_string;
+         for(i=0; p; i++){
+             int start, end, q;
+             int e=sscanf(p, "%d,%d,%d", &start, &end, &q);
+             if(e!=3){
+                 fprintf(stderr, "error parsing rc_override\n");
+                 exit_program(1);
+             }
+             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;
+             }
+             p= strchr(p, '/');
+             if(p) p++;
+         }
+         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->me_threshold= me_threshold;
+         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;
+             } else {
+                 video_enc->flags |= CODEC_FLAG_PASS2;
+             }
+         }
+         if (forced_key_frames)
+             parse_forced_key_frames(forced_key_frames, ost, video_enc);
+     }
+     if (video_language) {
+         av_dict_set(&st->metadata, "language", video_language, 0);
+         av_freep(&video_language);
+     }
+     /* reset some key parameters */
+     video_disable = 0;
+     av_freep(&video_codec_name);
+     av_freep(&forced_key_frames);
+     video_stream_copy = 0;
+     frame_pix_fmt = PIX_FMT_NONE;
+     return ost;
+ }
+ static OutputStream *new_audio_stream(AVFormatContext *oc, int file_idx)
+ {
+     AVStream *st;
+     OutputStream *ost;
+     AVCodec *codec= NULL;
+     AVCodecContext *audio_enc;
+     enum CodecID codec_id = CODEC_ID_NONE;
+     if(!audio_stream_copy){
+         if (audio_codec_name) {
+             codec_id = find_codec_or_die(audio_codec_name, AVMEDIA_TYPE_AUDIO, 1);
+             codec = avcodec_find_encoder_by_name(audio_codec_name);
+         } else {
+             codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_AUDIO);
+             codec = avcodec_find_encoder(codec_id);
+         }
+     }
+     ost = new_output_stream(oc, file_idx, codec);
+     st  = ost->st;
+     ost->bitstream_filters = audio_bitstream_filters;
+     audio_bitstream_filters= NULL;
+     st->codec->thread_count= thread_count;
+     audio_enc = st->codec;
+     audio_enc->codec_type = AVMEDIA_TYPE_AUDIO;
+     if(audio_codec_tag)
+         audio_enc->codec_tag= audio_codec_tag;
+     if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
+         audio_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
+     }
+     if (audio_stream_copy) {
+         st->stream_copy = 1;
+     } else {
+         audio_enc->codec_id = codec_id;
+         if (audio_qscale > QSCALE_NONE) {
+             audio_enc->flags |= CODEC_FLAG_QSCALE;
+             audio_enc->global_quality = FF_QP2LAMBDA * audio_qscale;
+         }
+         if (audio_channels)
+             audio_enc->channels = audio_channels;
+         if (audio_sample_fmt != AV_SAMPLE_FMT_NONE)
+             audio_enc->sample_fmt = audio_sample_fmt;
+         if (audio_sample_rate)
+             audio_enc->sample_rate = audio_sample_rate;
+     }
+     if (audio_language) {
+         av_dict_set(&st->metadata, "language", audio_language, 0);
+         av_freep(&audio_language);
+     }
+     /* reset some key parameters */
+     audio_disable = 0;
+     av_freep(&audio_codec_name);
+     audio_stream_copy = 0;
+     return ost;
+ }
+ static OutputStream *new_data_stream(AVFormatContext *oc, int file_idx)
+ {
+     AVStream *st;
+     OutputStream *ost;
+     AVCodecContext *data_enc;
+     ost = new_output_stream(oc, file_idx, NULL);
+     st  = ost->st;
+     data_enc = st->codec;
+     if (!data_stream_copy) {
+         fprintf(stderr, "Data stream encoding not supported yet (only streamcopy)\n");
+         exit_program(1);
+     }
+     data_enc->codec_type = AVMEDIA_TYPE_DATA;
+     if (data_codec_tag)
+         data_enc->codec_tag= data_codec_tag;
+     if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
+         data_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
+     }
+     if (data_stream_copy) {
+         st->stream_copy = 1;
+     }
+     data_disable = 0;
+     av_freep(&data_codec_name);
+     data_stream_copy = 0;
+     return ost;
+ }
+ static OutputStream *new_subtitle_stream(AVFormatContext *oc, int file_idx)
+ {
+     AVStream *st;
+     OutputStream *ost;
+     AVCodec *codec=NULL;
+     AVCodecContext *subtitle_enc;
+     enum CodecID codec_id = CODEC_ID_NONE;
+     if(!subtitle_stream_copy){
+         if (subtitle_codec_name) {
+             codec_id = find_codec_or_die(subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, 1);
+             codec = avcodec_find_encoder_by_name(subtitle_codec_name);
+         } else {
+             codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_SUBTITLE);
+             codec = avcodec_find_encoder(codec_id);
+         }
+     }
+     ost = new_output_stream(oc, file_idx, codec);
+     st  = ost->st;
+     subtitle_enc = st->codec;
+     ost->bitstream_filters = subtitle_bitstream_filters;
+     subtitle_bitstream_filters= NULL;
+     subtitle_enc->codec_type = AVMEDIA_TYPE_SUBTITLE;
+     if(subtitle_codec_tag)
+         subtitle_enc->codec_tag= subtitle_codec_tag;
+     if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
+         subtitle_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
+     }
+     if (subtitle_stream_copy) {
+         st->stream_copy = 1;
+     } else {
+         subtitle_enc->codec_id = codec_id;
+     }
+     if (subtitle_language) {
+         av_dict_set(&st->metadata, "language", subtitle_language, 0);
+         av_freep(&subtitle_language);
+     }
+     subtitle_disable = 0;
+     av_freep(&subtitle_codec_name);
+     subtitle_stream_copy = 0;
+     return ost;
+ }
+ /* arg format is "output-stream-index:streamid-value". */
+ static int opt_streamid(const char *opt, const char *arg)
+ {
+     int idx;
+     char *p;
+     char idx_str[16];
+     av_strlcpy(idx_str, arg, sizeof(idx_str));
+     p = strchr(idx_str, ':');
+     if (!p) {
+         fprintf(stderr,
+                 "Invalid value '%s' for option '%s', required syntax is 'index:value'\n",
+                 arg, opt);
+         exit_program(1);
+     }
+     *p++ = '\0';
 -static void opt_output_file(const char *filename)
++    idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, MAX_STREAMS-1);    
+     streamid_map = grow_array(streamid_map, sizeof(*streamid_map), &nb_streamid_map, idx+1);
+     streamid_map[idx] = parse_number_or_die(opt, p, OPT_INT, 0, INT_MAX);
+     return 0;
+ }
 -    oc = avformat_alloc_context();
++static int opt_output_file(const char *opt, const char *filename)
+ {
+     AVFormatContext *oc;
+     int i, err;
+     AVOutputFormat *file_oformat;
+     OutputStream *ost;
+     InputStream  *ist;
++    if(nb_output_files >= FF_ARRAY_ELEMS(output_files)){
++        fprintf(stderr, "Too many output files\n");
++        exit_program(1);
++    }
++
+     if (!strcmp(filename, "-"))
+         filename = "pipe:";
 -        print_error(filename, AVERROR(ENOMEM));
++    err = avformat_alloc_output_context2(&oc, NULL, last_asked_format, filename);
++    last_asked_format = NULL;
+     if (!oc) {
 -    if (last_asked_format) {
 -        file_oformat = av_guess_format(last_asked_format, NULL, NULL);
 -        if (!file_oformat) {
 -            fprintf(stderr, "Requested output format '%s' is not a suitable output format\n", last_asked_format);
 -            exit_program(1);
 -        }
 -        last_asked_format = NULL;
 -    } else {
 -        file_oformat = av_guess_format(NULL, filename, NULL);
 -        if (!file_oformat) {
 -            fprintf(stderr, "Unable to find a suitable output format for '%s'\n",
 -                    filename);
 -            exit_program(1);
 -        }
 -    }
 -
 -    oc->oformat = file_oformat;
 -    av_strlcpy(oc->filename, filename, sizeof(oc->filename));
++        print_error(filename, err);
+         exit_program(1);
+     }
 -        /* special case for files sent to avserver: we get the stream
 -           parameters from avserver */
 -        int err = read_avserver_streams(oc, filename);
++    file_oformat= oc->oformat;
+     if (!strcmp(file_oformat->name, "ffm") &&
+         av_strstart(filename, "http:", NULL)) {
 -    oc->flags |= AVFMT_FLAG_NONBLOCK;
++        /* special case for files sent to ffserver: we get the stream
++           parameters from ffserver */
++        int err = read_ffserver_streams(oc, filename);
+         if (err < 0) {
+             print_error(filename, err);
+             exit_program(1);
+         }
+     } else if (!nb_stream_maps) {
+         /* pick the "best" stream of each type */
+ #define NEW_STREAM(type, index)\
+         if (index >= 0) {\
+             ost = new_ ## type ## _stream(oc, nb_output_files);\
+             ost->source_index = index;\
+             ost->sync_ist     = &input_streams[index];\
+             input_streams[index].discard = 0;\
+         }
+         /* video: highest resolution */
+         if (!video_disable && oc->oformat->video_codec != CODEC_ID_NONE) {
+             int area = 0, idx = -1;
+             for (i = 0; i < nb_input_streams; i++) {
+                 ist = &input_streams[i];
+                 if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
+                     ist->st->codec->width * ist->st->codec->height > area) {
+                     area = ist->st->codec->width * ist->st->codec->height;
+                     idx = i;
+                 }
+             }
+             NEW_STREAM(video, idx);
+         }
+         /* audio: most channels */
+         if (!audio_disable && oc->oformat->audio_codec != CODEC_ID_NONE) {
+             int channels = 0, idx = -1;
+             for (i = 0; i < nb_input_streams; i++) {
+                 ist = &input_streams[i];
+                 if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
+                     ist->st->codec->channels > channels) {
+                     channels = ist->st->codec->channels;
+                     idx = i;
+                 }
+             }
+             NEW_STREAM(audio, idx);
+         }
+         /* subtitles: pick first */
+         if (!subtitle_disable && oc->oformat->subtitle_codec != CODEC_ID_NONE) {
+             for (i = 0; i < nb_input_streams; i++)
+                 if (input_streams[i].st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
+                     NEW_STREAM(subtitle, i);
+                     break;
+                 }
+         }
+         /* do something with data? */
+     } else {
+         for (i = 0; i < nb_stream_maps; i++) {
+             StreamMap *map = &stream_maps[i];
+             if (map->disabled)
+                 continue;
+             ist = &input_streams[input_files[map->file_index].ist_index + map->stream_index];
+             switch (ist->st->codec->codec_type) {
+             case AVMEDIA_TYPE_VIDEO:    ost = new_video_stream(oc, nb_output_files);    break;
+             case AVMEDIA_TYPE_AUDIO:    ost = new_audio_stream(oc, nb_output_files);    break;
+             case AVMEDIA_TYPE_SUBTITLE: ost = new_subtitle_stream(oc, nb_output_files); break;
+             case AVMEDIA_TYPE_DATA:     ost = new_data_stream(oc, nb_output_files);     break;
+             default:
+                 av_log(NULL, AV_LOG_ERROR, "Cannot map stream #%d.%d - unsupported type.\n",
+                        map->file_index, map->stream_index);
+                 exit_program(1);
+             }
+             ost->source_index = input_files[map->file_index].ist_index + map->stream_index;
+             ost->sync_ist = &input_streams[input_files[map->sync_file_index].ist_index +
+                                            map->sync_stream_index];
+             ist->discard = 0;
+         }
+     }
+     av_dict_copy(&oc->metadata, metadata, 0);
+     av_dict_free(&metadata);
+     av_dict_copy(&output_opts[nb_output_files], format_opts, 0);
+     output_files[nb_output_files++] = oc;
+     /* check filename in case of an image number is expected */
+     if (oc->oformat->flags & AVFMT_NEEDNUMBER) {
+         if (!av_filename_number_test(oc->filename)) {
+             print_error(oc->filename, AVERROR(EINVAL));
+             exit_program(1);
+         }
+     }
+     if (!(oc->oformat->flags & AVFMT_NOFILE)) {
+         /* test if it already exists to avoid loosing precious files */
+         if (!file_overwrite &&
+             (strchr(filename, ':') == NULL ||
+              filename[1] == ':' ||
+              av_strstart(filename, "file:", NULL))) {
+             if (avio_check(filename, 0) == 0) {
+                 if (!using_stdin) {
+                     fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
+                     fflush(stderr);
+                     if (!read_yesno()) {
+                         fprintf(stderr, "Not overwriting - exiting\n");
+                         exit_program(1);
+                     }
+                 }
+                 else {
+                     fprintf(stderr,"File '%s' already exists. Exiting.\n", filename);
+                     exit_program(1);
+                 }
+             }
+         }
+         /* open the file */
+         if ((err = avio_open(&oc->pb, filename, AVIO_FLAG_WRITE)) < 0) {
+             print_error(filename, err);
+             exit_program(1);
+         }
+     }
+     oc->preload= (int)(mux_preload*AV_TIME_BASE);
+     oc->max_delay= (int)(mux_max_delay*AV_TIME_BASE);
 -static void opt_inter_matrix(const char *arg)
+     /* copy chapters */
+     if (chapters_input_file >= nb_input_files) {
+         if (chapters_input_file == INT_MAX) {
+             /* copy chapters from the first input file that has them*/
+             chapters_input_file = -1;
+             for (i = 0; i < nb_input_files; i++)
+                 if (input_files[i].ctx->nb_chapters) {
+                     chapters_input_file = i;
+                     break;
+                 }
+         } else {
+             av_log(NULL, AV_LOG_ERROR, "Invalid input file index %d in chapter mapping.\n",
+                    chapters_input_file);
+             exit_program(1);
+         }
+     }
+     if (chapters_input_file >= 0)
+         copy_chapters(chapters_input_file, nb_output_files - 1);
+     /* copy metadata */
+     for (i = 0; i < nb_meta_data_maps; i++) {
+         AVFormatContext *files[2];
+         AVDictionary    **meta[2];
+         int j;
+ #define METADATA_CHECK_INDEX(index, nb_elems, desc)\
+         if ((index) < 0 || (index) >= (nb_elems)) {\
+             av_log(NULL, AV_LOG_ERROR, "Invalid %s index %d while processing metadata maps\n",\
+                      (desc), (index));\
+             exit_program(1);\
+         }
+         int in_file_index = meta_data_maps[i][1].file;
+         if (in_file_index < 0)
+             continue;
+         METADATA_CHECK_INDEX(in_file_index, nb_input_files, "input file")
+         files[0] = oc;
+         files[1] = input_files[in_file_index].ctx;
+         for (j = 0; j < 2; j++) {
+             MetadataMap *map = &meta_data_maps[i][j];
+             switch (map->type) {
+             case 'g':
+                 meta[j] = &files[j]->metadata;
+                 break;
+             case 's':
+                 METADATA_CHECK_INDEX(map->index, files[j]->nb_streams, "stream")
+                 meta[j] = &files[j]->streams[map->index]->metadata;
+                 break;
+             case 'c':
+                 METADATA_CHECK_INDEX(map->index, files[j]->nb_chapters, "chapter")
+                 meta[j] = &files[j]->chapters[map->index]->metadata;
+                 break;
+             case 'p':
+                 METADATA_CHECK_INDEX(map->index, files[j]->nb_programs, "program")
+                 meta[j] = &files[j]->programs[map->index]->metadata;
+                 break;
+             }
+         }
+         av_dict_copy(meta[0], *meta[1], AV_DICT_DONT_OVERWRITE);
+     }
+     /* copy global metadata by default */
+     if (metadata_global_autocopy)
+         av_dict_copy(&oc->metadata, input_files[0].ctx->metadata,
+                      AV_DICT_DONT_OVERWRITE);
+     if (metadata_streams_autocopy)
+         for (i = 0; i < oc->nb_streams; i++) {
+             InputStream *ist = &input_streams[output_streams_for_file[nb_output_files-1][i]->source_index];
+             av_dict_copy(&oc->streams[i]->metadata, ist->st->metadata, AV_DICT_DONT_OVERWRITE);
+         }
+     frame_rate    = (AVRational){0, 0};
+     frame_width   = 0;
+     frame_height  = 0;
+     audio_sample_rate = 0;
+     audio_channels    = 0;
+     audio_sample_fmt  = AV_SAMPLE_FMT_NONE;
+     chapters_input_file = INT_MAX;
+     av_freep(&meta_data_maps);
+     nb_meta_data_maps = 0;
+     metadata_global_autocopy   = 1;
+     metadata_streams_autocopy  = 1;
+     metadata_chapters_autocopy = 1;
+     av_freep(&stream_maps);
+     nb_stream_maps = 0;
+     av_freep(&forced_key_frames);
+     uninit_opts();
+     init_opts();
++    return 0;
+ }
+ /* same option as mencoder */
+ static int opt_pass(const char *opt, const char *arg)
+ {
+     do_pass = parse_number_or_die(opt, arg, OPT_INT, 1, 2);
+     return 0;
+ }
+ 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 int64_t getmaxrss(void)
+ {
+ #if HAVE_GETRUSAGE && HAVE_STRUCT_RUSAGE_RU_MAXRSS
+     struct rusage rusage;
+     getrusage(RUSAGE_SELF, &rusage);
+     return (int64_t)rusage.ru_maxrss * 1024;
+ #elif HAVE_GETPROCESSMEMORYINFO
+     HANDLE proc;
+     PROCESS_MEMORY_COUNTERS memcounters;
+     proc = GetCurrentProcess();
+     memcounters.cb = sizeof(memcounters);
+     GetProcessMemoryInfo(proc, &memcounters, sizeof(memcounters));
+     return memcounters.PeakPagefileUsage;
+ #else
+     return 0;
+ #endif
+ }
+ static void parse_matrix_coeffs(uint16_t *dest, const char *str)
+ {
+     int i;
+     const char *p = str;
+     for(i = 0;; i++) {
+         dest[i] = atoi(p);
+         if(i == 63)
+             break;
+         p = strchr(p, ',');
+         if(!p) {
+             fprintf(stderr, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
+             exit_program(1);
+         }
+         p++;
+     }
+ }
 -static void opt_intra_matrix(const char *arg)
++static int opt_inter_matrix(const char *opt, const char *arg)
+ {
+     inter_matrix = av_mallocz(sizeof(uint16_t) * 64);
+     parse_matrix_coeffs(inter_matrix, arg);
++    return 0;
+ }
 -static void show_help(void)
++static int opt_intra_matrix(const char *opt, const char *arg)
+ {
+     intra_matrix = av_mallocz(sizeof(uint16_t) * 64);
+     parse_matrix_coeffs(intra_matrix, arg);
++    return 0;
+ }
+ static void show_usage(void)
+ {
+     printf("Hyper fast Audio and Video encoder\n");
+     printf("usage: %s [options] [[infile options] -i infile]... {[outfile options] outfile}...\n", program_name);
+     printf("\n");
+ }
 -        opt_video_codec("vcodec", "mpeg1video");
 -        opt_audio_codec("vcodec", "mp2");
++static int opt_help(const char *opt, const char *arg)
+ {
+     AVCodec *c;
+     AVOutputFormat *oformat = NULL;
+     AVInputFormat  *iformat = NULL;
+     av_log_set_callback(log_callback_help);
+     show_usage();
+     show_help_options(options, "Main options:\n",
+                       OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_GRAB, 0);
+     show_help_options(options, "\nAdvanced options:\n",
+                       OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_GRAB,
+                       OPT_EXPERT);
+     show_help_options(options, "\nVideo options:\n",
+                       OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
+                       OPT_VIDEO);
+     show_help_options(options, "\nAdvanced Video options:\n",
+                       OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
+                       OPT_VIDEO | OPT_EXPERT);
+     show_help_options(options, "\nAudio options:\n",
+                       OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
+                       OPT_AUDIO);
+     show_help_options(options, "\nAdvanced Audio options:\n",
+                       OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
+                       OPT_AUDIO | OPT_EXPERT);
+     show_help_options(options, "\nSubtitle options:\n",
+                       OPT_SUBTITLE | OPT_GRAB,
+                       OPT_SUBTITLE);
+     show_help_options(options, "\nAudio/Video grab options:\n",
+                       OPT_GRAB,
+                       OPT_GRAB);
+     printf("\n");
+     av_opt_show2(avcodec_opts[0], NULL, AV_OPT_FLAG_ENCODING_PARAM|AV_OPT_FLAG_DECODING_PARAM, 0);
+     printf("\n");
+     /* individual codec options */
+     c = NULL;
+     while ((c = av_codec_next(c))) {
+         if (c->priv_class) {
+             av_opt_show2(&c->priv_class, NULL, AV_OPT_FLAG_ENCODING_PARAM|AV_OPT_FLAG_DECODING_PARAM, 0);
+             printf("\n");
+         }
+     }
+     av_opt_show2(avformat_opts, NULL, AV_OPT_FLAG_ENCODING_PARAM|AV_OPT_FLAG_DECODING_PARAM, 0);
+     printf("\n");
+     /* individual muxer options */
+     while ((oformat = av_oformat_next(oformat))) {
+         if (oformat->priv_class) {
+             av_opt_show2(&oformat->priv_class, NULL, AV_OPT_FLAG_ENCODING_PARAM, 0);
+             printf("\n");
+         }
+     }
+     /* individual demuxer options */
+     while ((iformat = av_iformat_next(iformat))) {
+         if (iformat->priv_class) {
+             av_opt_show2(&iformat->priv_class, NULL, AV_OPT_FLAG_DECODING_PARAM, 0);
+             printf("\n");
+         }
+     }
+     av_opt_show2(sws_opts, NULL, AV_OPT_FLAG_ENCODING_PARAM|AV_OPT_FLAG_DECODING_PARAM, 0);
++    return 0;
+ }
+ static int opt_target(const char *opt, const char *arg)
+ {
+     enum { PAL, NTSC, FILM, UNKNOWN } norm = UNKNOWN;
+     static const char *const frame_rates[] = {"25", "30000/1001", "24000/1001"};
+     if(!strncmp(arg, "pal-", 4)) {
+         norm = PAL;
+         arg += 4;
+     } else if(!strncmp(arg, "ntsc-", 5)) {
+         norm = NTSC;
+         arg += 5;
+     } else if(!strncmp(arg, "film-", 5)) {
+         norm = FILM;
+         arg += 5;
+     } else {
+         int fr;
+         /* Calculate FR via float to avoid int overflow */
+         fr = (int)(frame_rate.num * 1000.0 / frame_rate.den);
+         if(fr == 25000) {
+             norm = PAL;
+         } else if((fr == 29970) || (fr == 23976)) {
+             norm = NTSC;
+         } else {
+             /* Try to determine PAL/NTSC by peeking in the input files */
+             if(nb_input_files) {
+                 int i, j;
+                 for (j = 0; j < nb_input_files; j++) {
+                     for (i = 0; i < input_files[j].ctx->nb_streams; i++) {
+                         AVCodecContext *c = input_files[j].ctx->streams[i]->codec;
+                         if(c->codec_type != AVMEDIA_TYPE_VIDEO)
+                             continue;
+                         fr = c->time_base.den * 1000 / c->time_base.num;
+                         if(fr == 25000) {
+                             norm = PAL;
+                             break;
+                         } else if((fr == 29970) || (fr == 23976)) {
+                             norm = NTSC;
+                             break;
+                         }
+                     }
+                     if(norm != UNKNOWN)
+                         break;
+                 }
+             }
+         }
+         if(verbose > 0 && norm != UNKNOWN)
+             fprintf(stderr, "Assuming %s for target.\n", norm == PAL ? "PAL" : "NTSC");
+     }
+     if(norm == UNKNOWN) {
+         fprintf(stderr, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n");
+         fprintf(stderr, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n");
+         fprintf(stderr, "or set a framerate with \"-r xxx\".\n");
+         exit_program(1);
+     }
+     if(!strcmp(arg, "vcd")) {
 -        opt_video_codec("vcodec", "mpeg2video");
 -        opt_audio_codec("acodec", "mp2");
++        opt_codec("vcodec", "mpeg1video");
++        opt_codec("acodec", "mp2");
+         opt_format("f", "vcd");
+         opt_frame_size("s", norm == PAL ? "352x288" : "352x240");
+         opt_frame_rate("r", frame_rates[norm]);
+         opt_default("g", norm == PAL ? "15" : "18");
+         opt_default("b", "1150000");
+         opt_default("maxrate", "1150000");
+         opt_default("minrate", "1150000");
+         opt_default("bufsize", "327680"); // 40*1024*8;
+         opt_default("ab", "224000");
+         audio_sample_rate = 44100;
+         audio_channels = 2;
+         opt_default("packetsize", "2324");
+         opt_default("muxrate", "1411200"); // 2352 * 75 * 8;
+         /* We have to offset the PTS, so that it is consistent with the SCR.
+            SCR starts at 36000, but the first two packs contain only padding
+            and the first pack from the other stream, respectively, may also have
+            been written before.
+            So the real data starts at SCR 36000+3*1200. */
+         mux_preload= (36000+3*1200) / 90000.0; //0.44
+     } else if(!strcmp(arg, "svcd")) {
 -        opt_video_codec("vcodec", "mpeg2video");
 -        opt_audio_codec("vcodec", "ac3");
++        opt_codec("vcodec", "mpeg2video");
++        opt_codec("acodec", "mp2");
+         opt_format("f", "svcd");
+         opt_frame_size("s", norm == PAL ? "480x576" : "480x480");
+         opt_frame_rate("r", frame_rates[norm]);
++        opt_frame_pix_fmt("pix_fmt", "yuv420p");
+         opt_default("g", norm == PAL ? "15" : "18");
+         opt_default("b", "2040000");
+         opt_default("maxrate", "2516000");
+         opt_default("minrate", "0"); //1145000;
+         opt_default("bufsize", "1835008"); //224*1024*8;
+         opt_default("flags", "+scan_offset");
+         opt_default("ab", "224000");
+         audio_sample_rate = 44100;
+         opt_default("packetsize", "2324");
+     } else if(!strcmp(arg, "dvd")) {
 -        if(!strcmp(tmp, "acodec")){
 -            opt_audio_codec(tmp, tmp2);
 -        }else if(!strcmp(tmp, "vcodec")){
 -            opt_video_codec(tmp, tmp2);
 -        }else if(!strcmp(tmp, "scodec")){
 -            opt_subtitle_codec(tmp, tmp2);
 -        }else if(!strcmp(tmp, "dcodec")){
 -            opt_data_codec(tmp, tmp2);
++        opt_codec("vcodec", "mpeg2video");
++        opt_codec("acodec", "ac3");
+         opt_format("f", "dvd");
+         opt_frame_size("vcodec", norm == PAL ? "720x576" : "720x480");
+         opt_frame_rate("r", frame_rates[norm]);
++        opt_frame_pix_fmt("pix_fmt", "yuv420p");
+         opt_default("g", norm == PAL ? "15" : "18");
+         opt_default("b", "6000000");
+         opt_default("maxrate", "9000000");
+         opt_default("minrate", "0"); //1500000;
+         opt_default("bufsize", "1835008"); //224*1024*8;
+         opt_default("packetsize", "2048");  // from www.mpucoder.com: DVD sectors contain 2048 bytes of data, this is also the size of one pack.
+         opt_default("muxrate", "10080000"); // from mplex project: data_rate = 1260000. mux_rate = data_rate * 8
+         opt_default("ab", "448000");
+         audio_sample_rate = 48000;
+     } else if(!strncmp(arg, "dv", 2)) {
+         opt_format("f", "dv");
+         opt_frame_size("s", norm == PAL ? "720x576" : "720x480");
+         opt_frame_pix_fmt("pix_fmt", !strncmp(arg, "dv50", 4) ? "yuv422p" :
+                           norm == PAL ? "yuv420p" : "yuv411p");
+         opt_frame_rate("r", frame_rates[norm]);
+         audio_sample_rate = 48000;
+         audio_channels = 2;
+     } else {
+         fprintf(stderr, "Unknown target: %s\n", arg);
+         return AVERROR(EINVAL);
+     }
+     return 0;
+ }
+ static int opt_vstats_file(const char *opt, const char *arg)
+ {
+     av_free (vstats_filename);
+     vstats_filename=av_strdup (arg);
+     return 0;
+ }
+ static int opt_vstats(const char *opt, const char *arg)
+ {
+     char filename[40];
+     time_t today2 = time(NULL);
+     struct tm *today = localtime(&today2);
+     snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", today->tm_hour, today->tm_min,
+              today->tm_sec);
+     return opt_vstats_file(opt, filename);
+ }
+ static int opt_bsf(const char *opt, const char *arg)
+ {
+     AVBitStreamFilterContext *bsfc= av_bitstream_filter_init(arg); //FIXME split name and args for filter at '='
+     AVBitStreamFilterContext **bsfp;
+     if(!bsfc){
+         fprintf(stderr, "Unknown bitstream filter %s\n", arg);
+         exit_program(1);
+     }
+     bsfp= *opt == 'v' ? &video_bitstream_filters :
+           *opt == 'a' ? &audio_bitstream_filters :
+                         &subtitle_bitstream_filters;
+     while(*bsfp)
+         bsfp= &(*bsfp)->next;
+     *bsfp= bsfc;
+     return 0;
+ }
+ static int opt_preset(const char *opt, const char *arg)
+ {
+     FILE *f=NULL;
+     char filename[1000], tmp[1000], tmp2[1000], line[1000];
+     char *codec_name = *opt == 'v' ? video_codec_name :
+                        *opt == 'a' ? audio_codec_name :
+                                      subtitle_codec_name;
+     if (!(f = get_preset_file(filename, sizeof(filename), arg, *opt == 'f', codec_name))) {
+         fprintf(stderr, "File for preset '%s' not found\n", arg);
+         exit_program(1);
+     }
+     while(!feof(f)){
+         int e= fscanf(f, "%999[^\n]\n", line) - 1;
+         if(line[0] == '#' && !e)
+             continue;
+         e|= sscanf(line, "%999[^=]=%999[^\n]\n", tmp, tmp2) - 2;
+         if(e){
+             fprintf(stderr, "%s: Invalid syntax: '%s'\n", filename, line);
+             exit_program(1);
+         }
 -    { "croptop", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" },
++        if (!strcmp(tmp, "acodec") ||
++            !strcmp(tmp, "vcodec") ||
++            !strcmp(tmp, "scodec") ||
++            !strcmp(tmp, "dcodec")) {
++            opt_codec(tmp, tmp2);
+         }else if(opt_default(tmp, tmp2) < 0){
+             fprintf(stderr, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n", filename, line, tmp, tmp2);
+             exit_program(1);
+         }
+     }
+     fclose(f);
+     return 0;
+ }
++static void log_callback_null(void* ptr, int level, const char* fmt, va_list vl)
++{
++}
++
++static int opt_passlogfile(const char *opt, const char *arg)
++{
++    pass_logfilename_prefix = arg;
++#if CONFIG_LIBX264_ENCODER
++    return opt_default("passlogfile", arg);
++#else
++    return 0;
++#endif
++}
++
+ static const OptionDef options[] = {
+     /* main options */
+ #include "cmdutils_common_opts.h"
+     { "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },
+     { "i", HAS_ARG, {(void*)opt_input_file}, "input file name", "filename" },
+     { "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" },
+     { "map", HAS_ARG | OPT_EXPERT, {(void*)opt_map}, "set input stream mapping", "file.stream[:syncfile.syncstream]" },
+     { "map_metadata", HAS_ARG | OPT_EXPERT, {(void*)opt_map_metadata}, "set metadata information of outfile from infile",
+       "outfile[,metadata]:infile[,metadata]" },
+     { "map_chapters",  OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&chapters_input_file},  "set chapters mapping", "input_file_index" },
+     { "t", HAS_ARG, {(void*)opt_recording_time}, "record or transcode \"duration\" seconds of audio/video", "duration" },
+     { "fs", HAS_ARG | OPT_INT64, {(void*)&limit_filesize}, "set the limit file size in bytes", "limit_size" }, //
+     { "ss", HAS_ARG, {(void*)opt_start_time}, "set the start time offset", "time_off" },
+     { "itsoffset", HAS_ARG, {(void*)opt_input_ts_offset}, "set the input ts offset", "time_off" },
+     { "itsscale", HAS_ARG, {(void*)opt_input_ts_scale}, "set the input ts scale", "stream:scale" },
+     { "metadata", HAS_ARG, {(void*)opt_metadata}, "add metadata", "string=string" },
+     { "dframes", OPT_INT | HAS_ARG, {(void*)&max_frames[AVMEDIA_TYPE_DATA]}, "set the number of data frames to record", "number" },
+     { "benchmark", OPT_BOOL | OPT_EXPERT, {(void*)&do_benchmark},
+       "add timings for benchmarking" },
+     { "timelimit", HAS_ARG, {(void*)opt_timelimit}, "set max runtime in seconds", "limit" },
+     { "dump", OPT_BOOL | OPT_EXPERT, {(void*)&do_pkt_dump},
+       "dump each input packet" },
+     { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump},
+       "when dumping packets, also dump the payload" },
+     { "re", OPT_BOOL | OPT_EXPERT, {(void*)&rate_emu}, "read input at native frame rate", "" },
+     { "v", HAS_ARG, {(void*)opt_verbose}, "set the verbosity level", "number" },
+     { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
+     { "threads",  HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
+     { "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" },
+     { "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" },
+     { "adrift_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&audio_drift_threshold}, "audio drift threshold", "threshold" },
+     { "copyts", OPT_BOOL | OPT_EXPERT, {(void*)&copy_ts}, "copy timestamps" },
+     { "copytb", OPT_BOOL | OPT_EXPERT, {(void*)&copy_tb}, "copy input stream time base when stream copying" },
+     { "shortest", OPT_BOOL | OPT_EXPERT, {(void*)&opt_shortest}, "finish encoding within shortest input" }, //
+     { "dts_delta_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&dts_delta_threshold}, "timestamp discontinuity delta threshold", "threshold" },
+     { "programid", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&opt_programid}, "desired program number", "" },
+     { "xerror", OPT_BOOL, {(void*)&exit_on_error}, "exit on error", "error" },
+     { "copyinkf", OPT_BOOL | OPT_EXPERT, {(void*)&copy_initial_nonkeyframes}, "copy initial non-keyframes" },
+     /* video options */
+     { "vframes", OPT_INT | HAS_ARG | OPT_VIDEO, {(void*)&max_frames[AVMEDIA_TYPE_VIDEO]}, "set the number of video frames to record", "number" },
+     { "r", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_rate}, "set frame rate (Hz value, fraction or abbreviation)", "rate" },
+     { "s", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" },
+     { "aspect", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_aspect_ratio}, "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" },
+     { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_frame_pix_fmt}, "set pixel format, 'list' as argument shows all the pixel formats supported", "format" },
 -    { "vcodec", HAS_ARG | OPT_VIDEO, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" },
++    { "bits_per_raw_sample", OPT_INT | HAS_ARG | OPT_VIDEO, {(void*)&frame_bits_per_raw_sample}, "set the number of bits per raw sample", "number" },
++    { "croptop",  HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" },
+     { "cropbottom", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" },
+     { "cropleft", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" },
+     { "cropright", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" },
+     { "padtop", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
+     { "padbottom", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
+     { "padleft", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
+     { "padright", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
+     { "padcolor", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "color" },
+     { "intra", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_only}, "use only intra frames"},
+     { "vn", OPT_BOOL | OPT_VIDEO, {(void*)&video_disable}, "disable video" },
+     { "vdt", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&video_discard}, "discard threshold", "n" },
+     { "qscale", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qscale}, "use fixed video quantizer scale (VBR)", "q" },
+     { "rc_override", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_override_string}, "rate control override for specific intervals", "override" },
 -    { "passlogfile", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void*)&pass_logfilename_prefix}, "select two pass log file name prefix", "prefix" },
++    { "vcodec", HAS_ARG | OPT_VIDEO, {(void*)opt_codec}, "force video codec ('copy' to copy stream)", "codec" },
+     { "me_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_threshold}, "motion estimaton threshold",  "threshold" },
+     { "sameq", OPT_BOOL | OPT_VIDEO, {(void*)&same_quality},
+       "use same quantizer as source (implies VBR)" },
+     { "pass", HAS_ARG | OPT_VIDEO, {(void*)opt_pass}, "select the pass number (1 or 2)", "n" },
 -    { "acodec", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_codec}, "force audio codec ('copy' to copy stream)", "codec" },
++    { "passlogfile", HAS_ARG | OPT_VIDEO, {(void*)&opt_passlogfile}, "select two pass log file name prefix", "prefix" },
+     { "deinterlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_deinterlace},
+       "deinterlace pictures" },
+     { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" },
+     { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" },
+     { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" },
+ #if CONFIG_AVFILTER
+     { "vf", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" },
+ #endif
+     { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },
+     { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" },
+     { "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" },
+     { "dc", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_dc_precision}, "intra_dc_precision", "precision" },
+     { "vtag", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_codec_tag}, "force video tag/fourcc", "fourcc/tag" },
+     { "vlang", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void *)&video_language}, "set the ISO 639 language code (3 letters) of the current video stream" , "code" },
+     { "qphist", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&qp_hist }, "show QP histogram" },
+     { "force_fps", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&force_fps}, "force the selected framerate, disable the best supported framerate selection" },
+     { "streamid", HAS_ARG | OPT_EXPERT, {(void*)opt_streamid}, "set the value of an outfile streamid", "streamIndex:value" },
+     { "force_key_frames", OPT_STRING | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void *)&forced_key_frames}, "force key frames at specified timestamps", "timestamps" },
+     /* audio options */
+     { "aframes", OPT_INT | HAS_ARG | OPT_AUDIO, {(void*)&max_frames[AVMEDIA_TYPE_AUDIO]}, "set the number of audio frames to record", "number" },
+     { "aq", OPT_FLOAT | HAS_ARG | OPT_AUDIO, {(void*)&audio_qscale}, "set audio quality (codec-specific)", "quality", },
+     { "ar", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_rate}, "set audio sampling rate (in Hz)", "rate" },
+     { "ac", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_channels}, "set number of audio channels", "channels" },
+     { "an", OPT_BOOL | OPT_AUDIO, {(void*)&audio_disable}, "disable audio" },
 -    { "scodec", HAS_ARG | OPT_SUBTITLE, {(void*)opt_subtitle_codec}, "force subtitle codec ('copy' to copy stream)", "codec" },
++    { "acodec", HAS_ARG | OPT_AUDIO, {(void*)opt_codec}, "force audio codec ('copy' to copy stream)", "codec" },
+     { "atag", HAS_ARG | OPT_EXPERT | OPT_AUDIO, {(void*)opt_codec_tag}, "force audio tag/fourcc", "fourcc/tag" },
+     { "vol", OPT_INT | HAS_ARG | OPT_AUDIO, {(void*)&audio_volume}, "change audio volume (256=normal)" , "volume" }, //
+     { "alang", HAS_ARG | OPT_STRING | OPT_AUDIO, {(void *)&audio_language}, "set the ISO 639 language code (3 letters) of the current audio stream" , "code" },
+     { "sample_fmt", HAS_ARG | OPT_EXPERT | OPT_AUDIO, {(void*)opt_audio_sample_fmt}, "set sample format, 'list' as argument shows all the sample formats supported", "format" },
+     /* subtitle options */
+     { "sn", OPT_BOOL | OPT_SUBTITLE, {(void*)&subtitle_disable}, "disable subtitle" },
 -    { "dcodec", HAS_ARG | OPT_DATA, {(void*)opt_data_codec}, "force data codec ('copy' to copy stream)", "codec" },
++    { "scodec", HAS_ARG | OPT_SUBTITLE, {(void*)opt_codec}, "force subtitle codec ('copy' to copy stream)", "codec" },
+     { "slang", HAS_ARG | OPT_STRING | OPT_SUBTITLE, {(void *)&subtitle_language}, "set the ISO 639 language code (3 letters) of the current subtitle stream" , "code" },
+     { "stag", HAS_ARG | OPT_EXPERT | OPT_SUBTITLE, {(void*)opt_codec_tag}, "force subtitle tag/fourcc", "fourcc/tag" },
+     /* grab options */
+     { "isync", OPT_BOOL | OPT_EXPERT | OPT_GRAB, {(void*)&input_sync}, "sync read on input", "" },
+     /* muxer options */
+     { "muxdelay", OPT_FLOAT | HAS_ARG | OPT_EXPERT, {(void*)&mux_max_delay}, "set the maximum demux-decode delay", "seconds" },
+     { "muxpreload", OPT_FLOAT | HAS_ARG | OPT_EXPERT, {(void*)&mux_preload}, "set the initial demux-decode delay", "seconds" },
+     { "absf", HAS_ARG | OPT_AUDIO | OPT_EXPERT, {(void*)opt_bsf}, "", "bitstream_filter" },
+     { "vbsf", HAS_ARG | OPT_VIDEO | OPT_EXPERT, {(void*)opt_bsf}, "", "bitstream_filter" },
+     { "sbsf", HAS_ARG | OPT_SUBTITLE | OPT_EXPERT, {(void*)opt_bsf}, "", "bitstream_filter" },
+     { "apre", HAS_ARG | OPT_AUDIO | OPT_EXPERT, {(void*)opt_preset}, "set the audio options to the indicated preset", "preset" },
+     { "vpre", HAS_ARG | OPT_VIDEO | OPT_EXPERT, {(void*)opt_preset}, "set the video options to the indicated preset", "preset" },
+     { "spre", HAS_ARG | OPT_SUBTITLE | OPT_EXPERT, {(void*)opt_preset}, "set the subtitle options to the indicated preset", "preset" },
+     { "fpre", HAS_ARG | OPT_EXPERT, {(void*)opt_preset}, "set options from indicated preset file", "filename" },
+     /* data codec support */
 -    avio_set_interrupt_cb(decode_interrupt_cb);
++    { "dcodec", HAS_ARG | OPT_DATA, {(void*)opt_codec}, "force data codec ('copy' to copy stream)", "codec" },
+     { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
+     { NULL, },
+ };
+ int main(int argc, char **argv)
+ {
+     int64_t ti;
+     av_log_set_flags(AV_LOG_SKIP_REPEATED);
++    if(argc>1 && !strcmp(argv[1], "-d")){
++        run_as_daemon=1;
++        verbose=-1;
++        av_log_set_callback(log_callback_null);
++        argc--;
++        argv++;
++    }
++
+     avcodec_register_all();
+ #if CONFIG_AVDEVICE
+     avdevice_register_all();
+ #endif
+ #if CONFIG_AVFILTER
+     avfilter_register_all();
+ #endif
+     av_register_all();
 -    show_banner();
++#if HAVE_ISATTY
++    if(isatty(STDIN_FILENO))
++        avio_set_interrupt_cb(decode_interrupt_cb);
++#endif
+     init_opts();
++    if(verbose>=0)
++        show_banner();
+     /* parse options */
+     parse_options(argc, argv, options, opt_output_file);
+     if(nb_output_files <= 0 && nb_input_files == 0) {
+         show_usage();
+         fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
+         exit_program(1);
+     }
+     /* file converter / grab */
+     if (nb_output_files <= 0) {
+         fprintf(stderr, "At least one output file must be specified\n");
+         exit_program(1);
+     }
+     if (nb_input_files == 0) {
+         fprintf(stderr, "At least one input file must be specified\n");
+         exit_program(1);
+     }
+     ti = getutime();
+     if (transcode(output_files, nb_output_files, input_files, nb_input_files) < 0)
+         exit_program(1);
+     ti = getutime() - ti;
+     if (do_benchmark) {
+         int maxrss = getmaxrss() / 1024;
+         printf("bench: utime=%0.3fs maxrss=%ikB\n", ti / 1000000.0, maxrss);
+     }
+     return exit_program(0);
+ }
diff --cc cmdutils.c
@@@ -284,17 -285,24 +287,24 @@@ unknown_opt
      }
  }
  
 -#define FLAGS (o->type == FF_OPT_TYPE_FLAGS) ? AV_DICT_APPEND : 0
 +#define FLAGS(o) ((o)->type == FF_OPT_TYPE_FLAGS) ? AV_DICT_APPEND : 0
  int opt_default(const char *opt, const char *arg)
  {
 -    const AVOption *o;
 +    const AVOption *oc, *of, *os;
-     if ((oc = av_opt_find(avcodec_opts[0], opt, NULL, 0, AV_OPT_SEARCH_CHILDREN)) ||
+     char opt_stripped[128];
+     const char *p;
+     if (!(p = strchr(opt, ':')))
+         p = opt + strlen(opt);
+     av_strlcpy(opt_stripped, opt, FFMIN(sizeof(opt_stripped), p - opt + 1));
 -    if ((o = av_opt_find(avcodec_opts[0], opt_stripped, NULL, 0, AV_OPT_SEARCH_CHILDREN)) ||
++    if ((oc = av_opt_find(avcodec_opts[0], opt_stripped, NULL, 0, AV_OPT_SEARCH_CHILDREN)) ||
           ((opt[0] == 'v' || opt[0] == 'a' || opt[0] == 's') &&
 -          (o = av_opt_find(avcodec_opts[0], opt+1, NULL, 0, 0))))
 -        av_dict_set(&codec_opts, opt, arg, FLAGS);
 -    else if ((o = av_opt_find(avformat_opts, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN)))
 -        av_dict_set(&format_opts, opt, arg, FLAGS);
 -    else if ((o = av_opt_find(sws_opts, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN))) {
 +          (oc = av_opt_find(avcodec_opts[0], opt+1, NULL, 0, 0))))
 +        av_dict_set(&codec_opts, opt, arg, FLAGS(oc));
 +    if ((of = av_opt_find(avformat_opts, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN)))
 +        av_dict_set(&format_opts, opt, arg, FLAGS(of));
 +    if ((os = av_opt_find(sws_opts, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN))) {
          // XXX we only support sws_flags, not arbitrary sws options
          int ret = av_set_string3(sws_opts, opt, arg, 1, NULL);
          if (ret < 0) {
diff --cc cmdutils.h
@@@ -150,9 -146,20 +150,20 @@@ void show_help_options(const OptionDef 
   * not have to be processed.
   */
  void parse_options(int argc, char **argv, const OptionDef *options,
 -                   void (* parse_arg_function)(const char*));
 +                   int (* parse_arg_function)(const char *opt, const char *arg));
  
  /**
+  * Check if the given stream matches a stream specifier.
+  *
+  * @param s  Corresponding format context.
+  * @param st Stream from s to be checked.
+  * @param spec A stream specifier of the [v|a|s|d]:[<stream index>] form.
+  *
+  * @return 1 if the stream matches, 0 if it doesn't, <0 on error
+  */
+ int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec);
+ /**
   * Filter out options for given codec.
   *
   * Create a new options dictionary containing only the options from
diff --cc configure
+++ b/configure
@@@ -81,9 -81,10 +81,10 @@@ Configuration options
                             and binaries will be unredistributable [no]
    --disable-doc            do not build documentation
    --disable-ffmpeg         disable ffmpeg build
 -  --disable-avplay         disable avplay build
 -  --disable-avprobe        disable avprobe build
 -  --disable-avserver       disable avserver build
+   --disable-avconv         disable avconv build
 +  --disable-ffplay         disable ffplay build
 +  --disable-ffprobe        disable ffprobe build
 +  --disable-ffserver       disable ffserver build
    --disable-avdevice       disable libavdevice build
    --disable-avcodec        disable libavcodec build
    --disable-avformat       disable libavformat build
@@@ -917,9 -914,10 +918,10 @@@ CONFIG_LIST=
      dxva2
      fastdiv
      ffmpeg
 -    avplay
 -    avprobe
 -    avserver
+     avconv
 +    ffplay
 +    ffprobe
 +    ffserver
      fft
      frei0r
      golomb
@@@ -1521,12 -1490,14 +1523,14 @@@ postproc_deps="gpl
  
  # programs
  ffmpeg_deps="avcodec avformat swscale"
 -ffmpeg_select="buffer_filter"
 +ffmpeg_select="buffer_filter buffersink_filter"
+ av_deps="avcodec avformat swscale"
+ av_select="buffer_filter"
 -avplay_deps="avcodec avformat swscale sdl"
 -avplay_select="rdft"
 -avprobe_deps="avcodec avformat"
 -avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
 -avserver_extralibs='$ldl'
 +ffplay_deps="avcodec avformat swscale sdl"
 +ffplay_select="buffersink_filter rdft"
 +ffprobe_deps="avcodec avformat"
 +ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
 +ffserver_extralibs='$ldl'
  
  doc_deps="texi2html"
  
@@@ -1670,9 -1639,10 +1674,10 @@@ enable debu
  enable doc
  enable fastdiv
  enable ffmpeg
 -enable avplay
 -enable avprobe
 -enable avserver
+ enable avconv
 +enable ffplay
 +enable ffprobe
 +enable ffserver
  enable network
  enable optimizations
  enable postproc
@@@ -3365,11 -3286,11 +3371,12 @@@ get_version LIBAVFILTER libavfilter/avf
  
  cat > $TMPH <<EOF
  /* Automatically generated by configure - do not modify! */
 -#ifndef LIBAV_CONFIG_H
 -#define LIBAV_CONFIG_H
 -#define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)"
 -#define LIBAV_LICENSE "$(c_escape $license)"
 +#ifndef FFMPEG_CONFIG_H
 +#define FFMPEG_CONFIG_H
 +#define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
 +#define FFMPEG_LICENSE "$(c_escape $license)"
 +#define FFMPEG_DATADIR "$(eval c_escape $datadir)"
+ #define AVCONV_DATADIR "$(eval c_escape $datadir)"
  #define CC_TYPE "$cc_type"
  #define CC_VERSION $cc_version
  #define restrict $_restrict
diff --cc doc/APIchanges
Simple merge
Simple merge
diff --cc ffmpeg.c
Simple merge
diff --cc ffplay.c
index b62e9ef,0000000..6f3130e
mode 100644,000000..100644
--- /dev/null
+++ b/ffplay.c
@@@ -1,3063 -1,0 +1,3063 @@@
-     opts = filter_codec_opts(codec_opts, avctx->codec_id, 0);
 +/*
 + * ffplay : Simple Media Player based on the FFmpeg libraries
 + * Copyright (c) 2003 Fabrice Bellard
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
 + *
 + * FFmpeg is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with FFmpeg; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 + */
 +
 +#include "config.h"
 +#include <inttypes.h>
 +#include <math.h>
 +#include <limits.h>
 +#include "libavutil/avstring.h"
 +#include "libavutil/colorspace.h"
 +#include "libavutil/mathematics.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/imgutils.h"
 +#include "libavutil/dict.h"
 +#include "libavutil/parseutils.h"
 +#include "libavutil/samplefmt.h"
 +#include "libavutil/avassert.h"
 +#include "libavformat/avformat.h"
 +#include "libavdevice/avdevice.h"
 +#include "libswscale/swscale.h"
 +#include "libavcodec/audioconvert.h"
 +#include "libavutil/opt.h"
 +#include "libavcodec/avfft.h"
 +
 +#if CONFIG_AVFILTER
 +# include "libavfilter/avcodec.h"
 +# include "libavfilter/avfilter.h"
 +# include "libavfilter/avfiltergraph.h"
 +# include "libavfilter/vsink_buffer.h"
 +#endif
 +
 +#include <SDL.h>
 +#include <SDL_thread.h>
 +
 +#include "cmdutils.h"
 +
 +#include <unistd.h>
 +#include <assert.h>
 +
 +const char program_name[] = "ffplay";
 +const int program_birth_year = 2003;
 +
 +#define MAX_QUEUE_SIZE (15 * 1024 * 1024)
 +#define MIN_AUDIOQ_SIZE (20 * 16 * 1024)
 +#define MIN_FRAMES 5
 +
 +/* SDL audio buffer size, in samples. Should be small to have precise
 +   A/V sync as SDL does not have hardware buffer fullness info. */
 +#define SDL_AUDIO_BUFFER_SIZE 1024
 +
 +/* no AV sync correction is done if below the AV sync threshold */
 +#define AV_SYNC_THRESHOLD 0.01
 +/* no AV correction is done if too big error */
 +#define AV_NOSYNC_THRESHOLD 10.0
 +
 +#define FRAME_SKIP_FACTOR 0.05
 +
 +/* maximum audio speed change to get correct sync */
 +#define SAMPLE_CORRECTION_PERCENT_MAX 10
 +
 +/* we use about AUDIO_DIFF_AVG_NB A-V differences to make the average */
 +#define AUDIO_DIFF_AVG_NB   20
 +
 +/* NOTE: the size must be big enough to compensate the hardware audio buffersize size */
 +#define SAMPLE_ARRAY_SIZE (2*65536)
 +
 +static int sws_flags = SWS_BICUBIC;
 +
 +typedef struct PacketQueue {
 +    AVPacketList *first_pkt, *last_pkt;
 +    int nb_packets;
 +    int size;
 +    int abort_request;
 +    SDL_mutex *mutex;
 +    SDL_cond *cond;
 +} PacketQueue;
 +
 +#define VIDEO_PICTURE_QUEUE_SIZE 2
 +#define SUBPICTURE_QUEUE_SIZE 4
 +
 +typedef struct VideoPicture {
 +    double pts;                                  ///<presentation time stamp for this picture
 +    double target_clock;                         ///<av_gettime() time at which this should be displayed ideally
 +    double duration;                             ///<expected duration of the frame
 +    int64_t pos;                                 ///<byte position in file
 +    SDL_Overlay *bmp;
 +    int width, height; /* source height & width */
 +    int allocated;
 +    enum PixelFormat pix_fmt;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterBufferRef *picref;
 +#endif
 +} VideoPicture;
 +
 +typedef struct SubPicture {
 +    double pts; /* presentation time stamp for this picture */
 +    AVSubtitle sub;
 +} SubPicture;
 +
 +enum {
 +    AV_SYNC_AUDIO_MASTER, /* default choice */
 +    AV_SYNC_VIDEO_MASTER,
 +    AV_SYNC_EXTERNAL_CLOCK, /* synchronize to an external clock */
 +};
 +
 +typedef struct VideoState {
 +    SDL_Thread *read_tid;
 +    SDL_Thread *video_tid;
 +    SDL_Thread *refresh_tid;
 +    AVInputFormat *iformat;
 +    int no_background;
 +    int abort_request;
 +    int paused;
 +    int last_paused;
 +    int seek_req;
 +    int seek_flags;
 +    int64_t seek_pos;
 +    int64_t seek_rel;
 +    int read_pause_return;
 +    AVFormatContext *ic;
 +
 +    int audio_stream;
 +
 +    int av_sync_type;
 +    double external_clock; /* external clock base */
 +    int64_t external_clock_time;
 +
 +    double audio_clock;
 +    double audio_diff_cum; /* used for AV difference average computation */
 +    double audio_diff_avg_coef;
 +    double audio_diff_threshold;
 +    int audio_diff_avg_count;
 +    AVStream *audio_st;
 +    PacketQueue audioq;
 +    int audio_hw_buf_size;
 +    /* samples output by the codec. we reserve more space for avsync
 +       compensation */
 +    DECLARE_ALIGNED(16,uint8_t,audio_buf1)[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2];
 +    DECLARE_ALIGNED(16,uint8_t,audio_buf2)[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2];
 +    uint8_t *audio_buf;
 +    unsigned int audio_buf_size; /* in bytes */
 +    int audio_buf_index; /* in bytes */
 +    AVPacket audio_pkt_temp;
 +    AVPacket audio_pkt;
 +    enum AVSampleFormat audio_src_fmt;
 +    AVAudioConvert *reformat_ctx;
 +
 +    enum ShowMode {
 +        SHOW_MODE_NONE = -1, SHOW_MODE_VIDEO = 0, SHOW_MODE_WAVES, SHOW_MODE_RDFT, SHOW_MODE_NB
 +    } show_mode;
 +    int16_t sample_array[SAMPLE_ARRAY_SIZE];
 +    int sample_array_index;
 +    int last_i_start;
 +    RDFTContext *rdft;
 +    int rdft_bits;
 +    FFTSample *rdft_data;
 +    int xpos;
 +
 +    SDL_Thread *subtitle_tid;
 +    int subtitle_stream;
 +    int subtitle_stream_changed;
 +    AVStream *subtitle_st;
 +    PacketQueue subtitleq;
 +    SubPicture subpq[SUBPICTURE_QUEUE_SIZE];
 +    int subpq_size, subpq_rindex, subpq_windex;
 +    SDL_mutex *subpq_mutex;
 +    SDL_cond *subpq_cond;
 +
 +    double frame_timer;
 +    double frame_last_pts;
 +    double frame_last_delay;
 +    double video_clock;                          ///<pts of last decoded frame / predicted pts of next decoded frame
 +    int video_stream;
 +    AVStream *video_st;
 +    PacketQueue videoq;
 +    double video_current_pts;                    ///<current displayed pts (different from video_clock if frame fifos are used)
 +    double video_current_pts_drift;              ///<video_current_pts - time (av_gettime) at which we updated video_current_pts - used to have running video pts
 +    int64_t video_current_pos;                   ///<current displayed file pos
 +    VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE];
 +    int pictq_size, pictq_rindex, pictq_windex;
 +    SDL_mutex *pictq_mutex;
 +    SDL_cond *pictq_cond;
 +#if !CONFIG_AVFILTER
 +    struct SwsContext *img_convert_ctx;
 +#endif
 +
 +    char filename[1024];
 +    int width, height, xleft, ytop;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterContext *out_video_filter;          ///<the last filter in the video chain
 +#endif
 +
 +    float skip_frames;
 +    float skip_frames_index;
 +    int refresh;
 +} VideoState;
 +
 +static int opt_help(const char *opt, const char *arg);
 +
 +/* options specified by the user */
 +static AVInputFormat *file_iformat;
 +static const char *input_filename;
 +static const char *window_title;
 +static int fs_screen_width;
 +static int fs_screen_height;
 +static int screen_width = 0;
 +static int screen_height = 0;
 +static int audio_disable;
 +static int video_disable;
 +static int wanted_stream[AVMEDIA_TYPE_NB]={
 +    [AVMEDIA_TYPE_AUDIO]=-1,
 +    [AVMEDIA_TYPE_VIDEO]=-1,
 +    [AVMEDIA_TYPE_SUBTITLE]=-1,
 +};
 +static int seek_by_bytes=-1;
 +static int display_disable;
 +static int show_status = 1;
 +static int av_sync_type = AV_SYNC_AUDIO_MASTER;
 +static int64_t start_time = AV_NOPTS_VALUE;
 +static int64_t duration = AV_NOPTS_VALUE;
 +static int step = 0;
 +static int thread_count = 1;
 +static int workaround_bugs = 1;
 +static int fast = 0;
 +static int genpts = 0;
 +static int lowres = 0;
 +static int idct = FF_IDCT_AUTO;
 +static enum AVDiscard skip_frame= AVDISCARD_DEFAULT;
 +static enum AVDiscard skip_idct= AVDISCARD_DEFAULT;
 +static enum AVDiscard skip_loop_filter= AVDISCARD_DEFAULT;
 +static int error_recognition = FF_ER_CAREFUL;
 +static int error_concealment = 3;
 +static int decoder_reorder_pts= -1;
 +static int autoexit;
 +static int exit_on_keydown;
 +static int exit_on_mousedown;
 +static int loop=1;
 +static int framedrop=-1;
 +static enum ShowMode show_mode = SHOW_MODE_NONE;
 +
 +static int rdftspeed=20;
 +#if CONFIG_AVFILTER
 +static char *vfilters = NULL;
 +#endif
 +
 +/* current context */
 +static int is_full_screen;
 +static VideoState *cur_stream;
 +static int64_t audio_callback_time;
 +
 +static AVPacket flush_pkt;
 +
 +#define FF_ALLOC_EVENT   (SDL_USEREVENT)
 +#define FF_REFRESH_EVENT (SDL_USEREVENT + 1)
 +#define FF_QUIT_EVENT    (SDL_USEREVENT + 2)
 +
 +static SDL_Surface *screen;
 +
 +static int packet_queue_put(PacketQueue *q, AVPacket *pkt)
 +{
 +    AVPacketList *pkt1;
 +
 +    /* duplicate the packet */
 +    if (pkt!=&flush_pkt && av_dup_packet(pkt) < 0)
 +        return -1;
 +
 +    pkt1 = av_malloc(sizeof(AVPacketList));
 +    if (!pkt1)
 +        return -1;
 +    pkt1->pkt = *pkt;
 +    pkt1->next = NULL;
 +
 +
 +    SDL_LockMutex(q->mutex);
 +
 +    if (!q->last_pkt)
 +
 +        q->first_pkt = pkt1;
 +    else
 +        q->last_pkt->next = pkt1;
 +    q->last_pkt = pkt1;
 +    q->nb_packets++;
 +    q->size += pkt1->pkt.size + sizeof(*pkt1);
 +    /* XXX: should duplicate packet data in DV case */
 +    SDL_CondSignal(q->cond);
 +
 +    SDL_UnlockMutex(q->mutex);
 +    return 0;
 +}
 +
 +/* packet queue handling */
 +static void packet_queue_init(PacketQueue *q)
 +{
 +    memset(q, 0, sizeof(PacketQueue));
 +    q->mutex = SDL_CreateMutex();
 +    q->cond = SDL_CreateCond();
 +    packet_queue_put(q, &flush_pkt);
 +}
 +
 +static void packet_queue_flush(PacketQueue *q)
 +{
 +    AVPacketList *pkt, *pkt1;
 +
 +    SDL_LockMutex(q->mutex);
 +    for(pkt = q->first_pkt; pkt != NULL; pkt = pkt1) {
 +        pkt1 = pkt->next;
 +        av_free_packet(&pkt->pkt);
 +        av_freep(&pkt);
 +    }
 +    q->last_pkt = NULL;
 +    q->first_pkt = NULL;
 +    q->nb_packets = 0;
 +    q->size = 0;
 +    SDL_UnlockMutex(q->mutex);
 +}
 +
 +static void packet_queue_end(PacketQueue *q)
 +{
 +    packet_queue_flush(q);
 +    SDL_DestroyMutex(q->mutex);
 +    SDL_DestroyCond(q->cond);
 +}
 +
 +static void packet_queue_abort(PacketQueue *q)
 +{
 +    SDL_LockMutex(q->mutex);
 +
 +    q->abort_request = 1;
 +
 +    SDL_CondSignal(q->cond);
 +
 +    SDL_UnlockMutex(q->mutex);
 +}
 +
 +/* return < 0 if aborted, 0 if no packet and > 0 if packet.  */
 +static int packet_queue_get(PacketQueue *q, AVPacket *pkt, int block)
 +{
 +    AVPacketList *pkt1;
 +    int ret;
 +
 +    SDL_LockMutex(q->mutex);
 +
 +    for(;;) {
 +        if (q->abort_request) {
 +            ret = -1;
 +            break;
 +        }
 +
 +        pkt1 = q->first_pkt;
 +        if (pkt1) {
 +            q->first_pkt = pkt1->next;
 +            if (!q->first_pkt)
 +                q->last_pkt = NULL;
 +            q->nb_packets--;
 +            q->size -= pkt1->pkt.size + sizeof(*pkt1);
 +            *pkt = pkt1->pkt;
 +            av_free(pkt1);
 +            ret = 1;
 +            break;
 +        } else if (!block) {
 +            ret = 0;
 +            break;
 +        } else {
 +            SDL_CondWait(q->cond, q->mutex);
 +        }
 +    }
 +    SDL_UnlockMutex(q->mutex);
 +    return ret;
 +}
 +
 +static inline void fill_rectangle(SDL_Surface *screen,
 +                                  int x, int y, int w, int h, int color)
 +{
 +    SDL_Rect rect;
 +    rect.x = x;
 +    rect.y = y;
 +    rect.w = w;
 +    rect.h = h;
 +    SDL_FillRect(screen, &rect, color);
 +}
 +
 +#define ALPHA_BLEND(a, oldp, newp, s)\
 +((((oldp << s) * (255 - (a))) + (newp * (a))) / (255 << s))
 +
 +#define RGBA_IN(r, g, b, a, s)\
 +{\
 +    unsigned int v = ((const uint32_t *)(s))[0];\
 +    a = (v >> 24) & 0xff;\
 +    r = (v >> 16) & 0xff;\
 +    g = (v >> 8) & 0xff;\
 +    b = v & 0xff;\
 +}
 +
 +#define YUVA_IN(y, u, v, a, s, pal)\
 +{\
 +    unsigned int val = ((const uint32_t *)(pal))[*(const uint8_t*)(s)];\
 +    a = (val >> 24) & 0xff;\
 +    y = (val >> 16) & 0xff;\
 +    u = (val >> 8) & 0xff;\
 +    v = val & 0xff;\
 +}
 +
 +#define YUVA_OUT(d, y, u, v, a)\
 +{\
 +    ((uint32_t *)(d))[0] = (a << 24) | (y << 16) | (u << 8) | v;\
 +}
 +
 +
 +#define BPP 1
 +
 +static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, int imgh)
 +{
 +    int wrap, wrap3, width2, skip2;
 +    int y, u, v, a, u1, v1, a1, w, h;
 +    uint8_t *lum, *cb, *cr;
 +    const uint8_t *p;
 +    const uint32_t *pal;
 +    int dstx, dsty, dstw, dsth;
 +
 +    dstw = av_clip(rect->w, 0, imgw);
 +    dsth = av_clip(rect->h, 0, imgh);
 +    dstx = av_clip(rect->x, 0, imgw - dstw);
 +    dsty = av_clip(rect->y, 0, imgh - dsth);
 +    lum = dst->data[0] + dsty * dst->linesize[0];
 +    cb = dst->data[1] + (dsty >> 1) * dst->linesize[1];
 +    cr = dst->data[2] + (dsty >> 1) * dst->linesize[2];
 +
 +    width2 = ((dstw + 1) >> 1) + (dstx & ~dstw & 1);
 +    skip2 = dstx >> 1;
 +    wrap = dst->linesize[0];
 +    wrap3 = rect->pict.linesize[0];
 +    p = rect->pict.data[0];
 +    pal = (const uint32_t *)rect->pict.data[1];  /* Now in YCrCb! */
 +
 +    if (dsty & 1) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            cb++;
 +            cr++;
 +            lum++;
 +            p += BPP;
 +        }
 +        for(w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += 2 * BPP;
 +            lum += 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            p++;
 +            lum++;
 +        }
 +        p += wrap3 - dstw * BPP;
 +        lum += wrap - dstw - dstx;
 +        cb += dst->linesize[1] - width2 - skip2;
 +        cr += dst->linesize[2] - width2 - skip2;
 +    }
 +    for(h = dsth - (dsty & 1); h >= 2; h -= 2) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += -wrap3 + BPP;
 +            lum += -wrap + 1;
 +        }
 +        for(w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 2);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 2);
 +
 +            cb++;
 +            cr++;
 +            p += -wrap3 + 2 * BPP;
 +            lum += -wrap + 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += -wrap3 + BPP;
 +            lum += -wrap + 1;
 +        }
 +        p += wrap3 + (wrap3 - dstw * BPP);
 +        lum += wrap + (wrap - dstw - dstx);
 +        cb += dst->linesize[1] - width2 - skip2;
 +        cr += dst->linesize[2] - width2 - skip2;
 +    }
 +    /* handle odd height */
 +    if (h) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            cb++;
 +            cr++;
 +            lum++;
 +            p += BPP;
 +        }
 +        for(w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v, 1);
 +            cb++;
 +            cr++;
 +            p += 2 * BPP;
 +            lum += 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +        }
 +    }
 +}
 +
 +static void free_subpicture(SubPicture *sp)
 +{
 +    avsubtitle_free(&sp->sub);
 +}
 +
 +static void video_image_display(VideoState *is)
 +{
 +    VideoPicture *vp;
 +    SubPicture *sp;
 +    AVPicture pict;
 +    float aspect_ratio;
 +    int width, height, x, y;
 +    SDL_Rect rect;
 +    int i;
 +
 +    vp = &is->pictq[is->pictq_rindex];
 +    if (vp->bmp) {
 +#if CONFIG_AVFILTER
 +         if (vp->picref->video->sample_aspect_ratio.num == 0)
 +             aspect_ratio = 0;
 +         else
 +             aspect_ratio = av_q2d(vp->picref->video->sample_aspect_ratio);
 +#else
 +
 +        /* XXX: use variable in the frame */
 +        if (is->video_st->sample_aspect_ratio.num)
 +            aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio);
 +        else if (is->video_st->codec->sample_aspect_ratio.num)
 +            aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio);
 +        else
 +            aspect_ratio = 0;
 +#endif
 +        if (aspect_ratio <= 0.0)
 +            aspect_ratio = 1.0;
 +        aspect_ratio *= (float)vp->width / (float)vp->height;
 +
 +        if (is->subtitle_st) {
 +            if (is->subpq_size > 0) {
 +                sp = &is->subpq[is->subpq_rindex];
 +
 +                if (vp->pts >= sp->pts + ((float) sp->sub.start_display_time / 1000)) {
 +                    SDL_LockYUVOverlay (vp->bmp);
 +
 +                    pict.data[0] = vp->bmp->pixels[0];
 +                    pict.data[1] = vp->bmp->pixels[2];
 +                    pict.data[2] = vp->bmp->pixels[1];
 +
 +                    pict.linesize[0] = vp->bmp->pitches[0];
 +                    pict.linesize[1] = vp->bmp->pitches[2];
 +                    pict.linesize[2] = vp->bmp->pitches[1];
 +
 +                    for (i = 0; i < sp->sub.num_rects; i++)
 +                        blend_subrect(&pict, sp->sub.rects[i],
 +                                      vp->bmp->w, vp->bmp->h);
 +
 +                    SDL_UnlockYUVOverlay (vp->bmp);
 +                }
 +            }
 +        }
 +
 +
 +        /* XXX: we suppose the screen has a 1.0 pixel ratio */
 +        height = is->height;
 +        width = ((int)rint(height * aspect_ratio)) & ~1;
 +        if (width > is->width) {
 +            width = is->width;
 +            height = ((int)rint(width / aspect_ratio)) & ~1;
 +        }
 +        x = (is->width - width) / 2;
 +        y = (is->height - height) / 2;
 +        is->no_background = 0;
 +        rect.x = is->xleft + x;
 +        rect.y = is->ytop  + y;
 +        rect.w = FFMAX(width,  1);
 +        rect.h = FFMAX(height, 1);
 +        SDL_DisplayYUVOverlay(vp->bmp, &rect);
 +    }
 +}
 +
 +/* get the current audio output buffer size, in samples. With SDL, we
 +   cannot have a precise information */
 +static int audio_write_get_buf_size(VideoState *is)
 +{
 +    return is->audio_buf_size - is->audio_buf_index;
 +}
 +
 +static inline int compute_mod(int a, int b)
 +{
 +    return a < 0 ? a%b + b : a%b;
 +}
 +
 +static void video_audio_display(VideoState *s)
 +{
 +    int i, i_start, x, y1, y, ys, delay, n, nb_display_channels;
 +    int ch, channels, h, h2, bgcolor, fgcolor;
 +    int16_t time_diff;
 +    int rdft_bits, nb_freq;
 +
 +    for(rdft_bits=1; (1<<rdft_bits)<2*s->height; rdft_bits++)
 +        ;
 +    nb_freq= 1<<(rdft_bits-1);
 +
 +    /* compute display index : center on currently output samples */
 +    channels = s->audio_st->codec->channels;
 +    nb_display_channels = channels;
 +    if (!s->paused) {
 +        int data_used= s->show_mode == SHOW_MODE_WAVES ? s->width : (2*nb_freq);
 +        n = 2 * channels;
 +        delay = audio_write_get_buf_size(s);
 +        delay /= n;
 +
 +        /* to be more precise, we take into account the time spent since
 +           the last buffer computation */
 +        if (audio_callback_time) {
 +            time_diff = av_gettime() - audio_callback_time;
 +            delay -= (time_diff * s->audio_st->codec->sample_rate) / 1000000;
 +        }
 +
 +        delay += 2*data_used;
 +        if (delay < data_used)
 +            delay = data_used;
 +
 +        i_start= x = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE);
 +        if (s->show_mode == SHOW_MODE_WAVES) {
 +            h= INT_MIN;
 +            for(i=0; i<1000; i+=channels){
 +                int idx= (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE;
 +                int a= s->sample_array[idx];
 +                int b= s->sample_array[(idx + 4*channels)%SAMPLE_ARRAY_SIZE];
 +                int c= s->sample_array[(idx + 5*channels)%SAMPLE_ARRAY_SIZE];
 +                int d= s->sample_array[(idx + 9*channels)%SAMPLE_ARRAY_SIZE];
 +                int score= a-d;
 +                if(h<score && (b^c)<0){
 +                    h= score;
 +                    i_start= idx;
 +                }
 +            }
 +        }
 +
 +        s->last_i_start = i_start;
 +    } else {
 +        i_start = s->last_i_start;
 +    }
 +
 +    bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +    if (s->show_mode == SHOW_MODE_WAVES) {
 +        fill_rectangle(screen,
 +                       s->xleft, s->ytop, s->width, s->height,
 +                       bgcolor);
 +
 +        fgcolor = SDL_MapRGB(screen->format, 0xff, 0xff, 0xff);
 +
 +        /* total height for one channel */
 +        h = s->height / nb_display_channels;
 +        /* graph height / 2 */
 +        h2 = (h * 9) / 20;
 +        for(ch = 0;ch < nb_display_channels; ch++) {
 +            i = i_start + ch;
 +            y1 = s->ytop + ch * h + (h / 2); /* position of center line */
 +            for(x = 0; x < s->width; x++) {
 +                y = (s->sample_array[i] * h2) >> 15;
 +                if (y < 0) {
 +                    y = -y;
 +                    ys = y1 - y;
 +                } else {
 +                    ys = y1;
 +                }
 +                fill_rectangle(screen,
 +                               s->xleft + x, ys, 1, y,
 +                               fgcolor);
 +                i += channels;
 +                if (i >= SAMPLE_ARRAY_SIZE)
 +                    i -= SAMPLE_ARRAY_SIZE;
 +            }
 +        }
 +
 +        fgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0xff);
 +
 +        for(ch = 1;ch < nb_display_channels; ch++) {
 +            y = s->ytop + ch * h;
 +            fill_rectangle(screen,
 +                           s->xleft, y, s->width, 1,
 +                           fgcolor);
 +        }
 +        SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height);
 +    }else{
 +        nb_display_channels= FFMIN(nb_display_channels, 2);
 +        if(rdft_bits != s->rdft_bits){
 +            av_rdft_end(s->rdft);
 +            av_free(s->rdft_data);
 +            s->rdft = av_rdft_init(rdft_bits, DFT_R2C);
 +            s->rdft_bits= rdft_bits;
 +            s->rdft_data= av_malloc(4*nb_freq*sizeof(*s->rdft_data));
 +        }
 +        {
 +            FFTSample *data[2];
 +            for(ch = 0;ch < nb_display_channels; ch++) {
 +                data[ch] = s->rdft_data + 2*nb_freq*ch;
 +                i = i_start + ch;
 +                for(x = 0; x < 2*nb_freq; x++) {
 +                    double w= (x-nb_freq)*(1.0/nb_freq);
 +                    data[ch][x]= s->sample_array[i]*(1.0-w*w);
 +                    i += channels;
 +                    if (i >= SAMPLE_ARRAY_SIZE)
 +                        i -= SAMPLE_ARRAY_SIZE;
 +                }
 +                av_rdft_calc(s->rdft, data[ch]);
 +            }
 +            //least efficient way to do this, we should of course directly access it but its more than fast enough
 +            for(y=0; y<s->height; y++){
 +                double w= 1/sqrt(nb_freq);
 +                int a= sqrt(w*sqrt(data[0][2*y+0]*data[0][2*y+0] + data[0][2*y+1]*data[0][2*y+1]));
 +                int b= (nb_display_channels == 2 ) ? sqrt(w*sqrt(data[1][2*y+0]*data[1][2*y+0]
 +                       + data[1][2*y+1]*data[1][2*y+1])) : a;
 +                a= FFMIN(a,255);
 +                b= FFMIN(b,255);
 +                fgcolor = SDL_MapRGB(screen->format, a, b, (a+b)/2);
 +
 +                fill_rectangle(screen,
 +                            s->xpos, s->height-y, 1, 1,
 +                            fgcolor);
 +            }
 +        }
 +        SDL_UpdateRect(screen, s->xpos, s->ytop, 1, s->height);
 +        s->xpos++;
 +        if(s->xpos >= s->width)
 +            s->xpos= s->xleft;
 +    }
 +}
 +
 +static void stream_close(VideoState *is)
 +{
 +    VideoPicture *vp;
 +    int i;
 +    /* XXX: use a special url_shutdown call to abort parse cleanly */
 +    is->abort_request = 1;
 +    SDL_WaitThread(is->read_tid, NULL);
 +    SDL_WaitThread(is->refresh_tid, NULL);
 +
 +    /* free all pictures */
 +    for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +        vp = &is->pictq[i];
 +#if CONFIG_AVFILTER
 +        if (vp->picref) {
 +            avfilter_unref_buffer(vp->picref);
 +            vp->picref = NULL;
 +        }
 +#endif
 +        if (vp->bmp) {
 +            SDL_FreeYUVOverlay(vp->bmp);
 +            vp->bmp = NULL;
 +        }
 +    }
 +    SDL_DestroyMutex(is->pictq_mutex);
 +    SDL_DestroyCond(is->pictq_cond);
 +    SDL_DestroyMutex(is->subpq_mutex);
 +    SDL_DestroyCond(is->subpq_cond);
 +#if !CONFIG_AVFILTER
 +    if (is->img_convert_ctx)
 +        sws_freeContext(is->img_convert_ctx);
 +#endif
 +    av_free(is);
 +}
 +
 +static void do_exit(void)
 +{
 +    if (cur_stream) {
 +        stream_close(cur_stream);
 +        cur_stream = NULL;
 +    }
 +    uninit_opts();
 +#if CONFIG_AVFILTER
 +    avfilter_uninit();
 +#endif
 +    if (show_status)
 +        printf("\n");
 +    SDL_Quit();
 +    av_log(NULL, AV_LOG_QUIET, "%s", "");
 +    exit(0);
 +}
 +
 +static int video_open(VideoState *is){
 +    int flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL;
 +    int w,h;
 +
 +    if(is_full_screen) flags |= SDL_FULLSCREEN;
 +    else               flags |= SDL_RESIZABLE;
 +
 +    if (is_full_screen && fs_screen_width) {
 +        w = fs_screen_width;
 +        h = fs_screen_height;
 +    } else if(!is_full_screen && screen_width){
 +        w = screen_width;
 +        h = screen_height;
 +#if CONFIG_AVFILTER
 +    }else if (is->out_video_filter && is->out_video_filter->inputs[0]){
 +        w = is->out_video_filter->inputs[0]->w;
 +        h = is->out_video_filter->inputs[0]->h;
 +#else
 +    }else if (is->video_st && is->video_st->codec->width){
 +        w = is->video_st->codec->width;
 +        h = is->video_st->codec->height;
 +#endif
 +    } else {
 +        w = 640;
 +        h = 480;
 +    }
 +    if(screen && is->width == screen->w && screen->w == w
 +       && is->height== screen->h && screen->h == h)
 +        return 0;
 +
 +#ifndef __APPLE__
 +    screen = SDL_SetVideoMode(w, h, 0, flags);
 +#else
 +    /* setting bits_per_pixel = 0 or 32 causes blank video on OS X */
 +    screen = SDL_SetVideoMode(w, h, 24, flags);
 +#endif
 +    if (!screen) {
 +        fprintf(stderr, "SDL: could not set video mode - exiting\n");
 +        do_exit();
 +    }
 +    if (!window_title)
 +        window_title = input_filename;
 +    SDL_WM_SetCaption(window_title, window_title);
 +
 +    is->width = screen->w;
 +    is->height = screen->h;
 +
 +    return 0;
 +}
 +
 +/* display the current picture, if any */
 +static void video_display(VideoState *is)
 +{
 +    if(!screen)
 +        video_open(cur_stream);
 +    if (is->audio_st && is->show_mode != SHOW_MODE_VIDEO)
 +        video_audio_display(is);
 +    else if (is->video_st)
 +        video_image_display(is);
 +}
 +
 +static int refresh_thread(void *opaque)
 +{
 +    VideoState *is= opaque;
 +    while(!is->abort_request){
 +        SDL_Event event;
 +        event.type = FF_REFRESH_EVENT;
 +        event.user.data1 = opaque;
 +        if(!is->refresh){
 +            is->refresh=1;
 +            SDL_PushEvent(&event);
 +        }
 +        //FIXME ideally we should wait the correct time but SDLs event passing is so slow it would be silly
 +        usleep(is->audio_st && is->show_mode != SHOW_MODE_VIDEO ? rdftspeed*1000 : 5000);
 +    }
 +    return 0;
 +}
 +
 +/* get the current audio clock value */
 +static double get_audio_clock(VideoState *is)
 +{
 +    double pts;
 +    int hw_buf_size, bytes_per_sec;
 +    pts = is->audio_clock;
 +    hw_buf_size = audio_write_get_buf_size(is);
 +    bytes_per_sec = 0;
 +    if (is->audio_st) {
 +        bytes_per_sec = is->audio_st->codec->sample_rate *
 +            2 * is->audio_st->codec->channels;
 +    }
 +    if (bytes_per_sec)
 +        pts -= (double)hw_buf_size / bytes_per_sec;
 +    return pts;
 +}
 +
 +/* get the current video clock value */
 +static double get_video_clock(VideoState *is)
 +{
 +    if (is->paused) {
 +        return is->video_current_pts;
 +    } else {
 +        return is->video_current_pts_drift + av_gettime() / 1000000.0;
 +    }
 +}
 +
 +/* get the current external clock value */
 +static double get_external_clock(VideoState *is)
 +{
 +    int64_t ti;
 +    ti = av_gettime();
 +    return is->external_clock + ((ti - is->external_clock_time) * 1e-6);
 +}
 +
 +/* get the current master clock value */
 +static double get_master_clock(VideoState *is)
 +{
 +    double val;
 +
 +    if (is->av_sync_type == AV_SYNC_VIDEO_MASTER) {
 +        if (is->video_st)
 +            val = get_video_clock(is);
 +        else
 +            val = get_audio_clock(is);
 +    } else if (is->av_sync_type == AV_SYNC_AUDIO_MASTER) {
 +        if (is->audio_st)
 +            val = get_audio_clock(is);
 +        else
 +            val = get_video_clock(is);
 +    } else {
 +        val = get_external_clock(is);
 +    }
 +    return val;
 +}
 +
 +/* seek in the stream */
 +static void stream_seek(VideoState *is, int64_t pos, int64_t rel, int seek_by_bytes)
 +{
 +    if (!is->seek_req) {
 +        is->seek_pos = pos;
 +        is->seek_rel = rel;
 +        is->seek_flags &= ~AVSEEK_FLAG_BYTE;
 +        if (seek_by_bytes)
 +            is->seek_flags |= AVSEEK_FLAG_BYTE;
 +        is->seek_req = 1;
 +    }
 +}
 +
 +/* pause or resume the video */
 +static void stream_toggle_pause(VideoState *is)
 +{
 +    if (is->paused) {
 +        is->frame_timer += av_gettime() / 1000000.0 + is->video_current_pts_drift - is->video_current_pts;
 +        if(is->read_pause_return != AVERROR(ENOSYS)){
 +            is->video_current_pts = is->video_current_pts_drift + av_gettime() / 1000000.0;
 +        }
 +        is->video_current_pts_drift = is->video_current_pts - av_gettime() / 1000000.0;
 +    }
 +    is->paused = !is->paused;
 +}
 +
 +static double compute_target_time(double frame_current_pts, VideoState *is)
 +{
 +    double delay, sync_threshold, diff;
 +
 +    /* compute nominal delay */
 +    delay = frame_current_pts - is->frame_last_pts;
 +    if (delay <= 0 || delay >= 10.0) {
 +        /* if incorrect delay, use previous one */
 +        delay = is->frame_last_delay;
 +    } else {
 +        is->frame_last_delay = delay;
 +    }
 +    is->frame_last_pts = frame_current_pts;
 +
 +    /* update delay to follow master synchronisation source */
 +    if (((is->av_sync_type == AV_SYNC_AUDIO_MASTER && is->audio_st) ||
 +         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
 +        /* if video is slave, we try to correct big delays by
 +           duplicating or deleting a frame */
 +        diff = get_video_clock(is) - get_master_clock(is);
 +
 +        /* skip or repeat frame. We take into account the
 +           delay to compute the threshold. I still don't know
 +           if it is the best guess */
 +        sync_threshold = FFMAX(AV_SYNC_THRESHOLD, delay);
 +        if (fabs(diff) < AV_NOSYNC_THRESHOLD) {
 +            if (diff <= -sync_threshold)
 +                delay = 0;
 +            else if (diff >= sync_threshold)
 +                delay = 2 * delay;
 +        }
 +    }
 +    is->frame_timer += delay;
 +
 +    av_dlog(NULL, "video: delay=%0.3f pts=%0.3f A-V=%f\n",
 +            delay, frame_current_pts, -diff);
 +
 +    return is->frame_timer;
 +}
 +
 +/* called to display each frame */
 +static void video_refresh(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +
 +    SubPicture *sp, *sp2;
 +
 +    if (is->video_st) {
 +retry:
 +        if (is->pictq_size == 0) {
 +            //nothing to do, no picture to display in the que
 +        } else {
 +            double time= av_gettime()/1000000.0;
 +            double next_target;
 +            /* dequeue the picture */
 +            vp = &is->pictq[is->pictq_rindex];
 +
 +            if(time < vp->target_clock)
 +                return;
 +            /* update current video pts */
 +            is->video_current_pts = vp->pts;
 +            is->video_current_pts_drift = is->video_current_pts - time;
 +            is->video_current_pos = vp->pos;
 +            if(is->pictq_size > 1){
 +                VideoPicture *nextvp= &is->pictq[(is->pictq_rindex+1)%VIDEO_PICTURE_QUEUE_SIZE];
 +                assert(nextvp->target_clock >= vp->target_clock);
 +                next_target= nextvp->target_clock;
 +            }else{
 +                next_target= vp->target_clock + vp->duration;
 +            }
 +            if((framedrop>0 || (framedrop && is->audio_st)) && time > next_target){
 +                is->skip_frames *= 1.0 + FRAME_SKIP_FACTOR;
 +                if(is->pictq_size > 1 || time > next_target + 0.5){
 +                    /* update queue size and signal for next picture */
 +                    if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE)
 +                        is->pictq_rindex = 0;
 +
 +                    SDL_LockMutex(is->pictq_mutex);
 +                    is->pictq_size--;
 +                    SDL_CondSignal(is->pictq_cond);
 +                    SDL_UnlockMutex(is->pictq_mutex);
 +                    goto retry;
 +                }
 +            }
 +
 +            if(is->subtitle_st) {
 +                if (is->subtitle_stream_changed) {
 +                    SDL_LockMutex(is->subpq_mutex);
 +
 +                    while (is->subpq_size) {
 +                        free_subpicture(&is->subpq[is->subpq_rindex]);
 +
 +                        /* update queue size and signal for next picture */
 +                        if (++is->subpq_rindex == SUBPICTURE_QUEUE_SIZE)
 +                            is->subpq_rindex = 0;
 +
 +                        is->subpq_size--;
 +                    }
 +                    is->subtitle_stream_changed = 0;
 +
 +                    SDL_CondSignal(is->subpq_cond);
 +                    SDL_UnlockMutex(is->subpq_mutex);
 +                } else {
 +                    if (is->subpq_size > 0) {
 +                        sp = &is->subpq[is->subpq_rindex];
 +
 +                        if (is->subpq_size > 1)
 +                            sp2 = &is->subpq[(is->subpq_rindex + 1) % SUBPICTURE_QUEUE_SIZE];
 +                        else
 +                            sp2 = NULL;
 +
 +                        if ((is->video_current_pts > (sp->pts + ((float) sp->sub.end_display_time / 1000)))
 +                                || (sp2 && is->video_current_pts > (sp2->pts + ((float) sp2->sub.start_display_time / 1000))))
 +                        {
 +                            free_subpicture(sp);
 +
 +                            /* update queue size and signal for next picture */
 +                            if (++is->subpq_rindex == SUBPICTURE_QUEUE_SIZE)
 +                                is->subpq_rindex = 0;
 +
 +                            SDL_LockMutex(is->subpq_mutex);
 +                            is->subpq_size--;
 +                            SDL_CondSignal(is->subpq_cond);
 +                            SDL_UnlockMutex(is->subpq_mutex);
 +                        }
 +                    }
 +                }
 +            }
 +
 +            /* display picture */
 +            if (!display_disable)
 +                video_display(is);
 +
 +            /* update queue size and signal for next picture */
 +            if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE)
 +                is->pictq_rindex = 0;
 +
 +            SDL_LockMutex(is->pictq_mutex);
 +            is->pictq_size--;
 +            SDL_CondSignal(is->pictq_cond);
 +            SDL_UnlockMutex(is->pictq_mutex);
 +        }
 +    } else if (is->audio_st) {
 +        /* draw the next audio frame */
 +
 +        /* if only audio stream, then display the audio bars (better
 +           than nothing, just to test the implementation */
 +
 +        /* display picture */
 +        if (!display_disable)
 +            video_display(is);
 +    }
 +    if (show_status) {
 +        static int64_t last_time;
 +        int64_t cur_time;
 +        int aqsize, vqsize, sqsize;
 +        double av_diff;
 +
 +        cur_time = av_gettime();
 +        if (!last_time || (cur_time - last_time) >= 30000) {
 +            aqsize = 0;
 +            vqsize = 0;
 +            sqsize = 0;
 +            if (is->audio_st)
 +                aqsize = is->audioq.size;
 +            if (is->video_st)
 +                vqsize = is->videoq.size;
 +            if (is->subtitle_st)
 +                sqsize = is->subtitleq.size;
 +            av_diff = 0;
 +            if (is->audio_st && is->video_st)
 +                av_diff = get_audio_clock(is) - get_video_clock(is);
 +            printf("%7.2f A-V:%7.3f s:%3.1f aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64"   \r",
 +                   get_master_clock(is),
 +                   av_diff,
 +                   FFMAX(is->skip_frames-1, 0),
 +                   aqsize / 1024,
 +                   vqsize / 1024,
 +                   sqsize,
 +                   is->video_st ? is->video_st->codec->pts_correction_num_faulty_dts : 0,
 +                   is->video_st ? is->video_st->codec->pts_correction_num_faulty_pts : 0);
 +            fflush(stdout);
 +            last_time = cur_time;
 +        }
 +    }
 +}
 +
 +/* allocate a picture (needs to do that in main thread to avoid
 +   potential locking problems */
 +static void alloc_picture(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +
 +    vp = &is->pictq[is->pictq_windex];
 +
 +    if (vp->bmp)
 +        SDL_FreeYUVOverlay(vp->bmp);
 +
 +#if CONFIG_AVFILTER
 +    if (vp->picref)
 +        avfilter_unref_buffer(vp->picref);
 +    vp->picref = NULL;
 +
 +    vp->width   = is->out_video_filter->inputs[0]->w;
 +    vp->height  = is->out_video_filter->inputs[0]->h;
 +    vp->pix_fmt = is->out_video_filter->inputs[0]->format;
 +#else
 +    vp->width   = is->video_st->codec->width;
 +    vp->height  = is->video_st->codec->height;
 +    vp->pix_fmt = is->video_st->codec->pix_fmt;
 +#endif
 +
 +    vp->bmp = SDL_CreateYUVOverlay(vp->width, vp->height,
 +                                   SDL_YV12_OVERLAY,
 +                                   screen);
 +    if (!vp->bmp || vp->bmp->pitches[0] < vp->width) {
 +        /* SDL allocates a buffer smaller than requested if the video
 +         * overlay hardware is unable to support the requested size. */
 +        fprintf(stderr, "Error: the video system does not support an image\n"
 +                        "size of %dx%d pixels. Try using -lowres or -vf \"scale=w:h\"\n"
 +                        "to reduce the image size.\n", vp->width, vp->height );
 +        do_exit();
 +    }
 +
 +    SDL_LockMutex(is->pictq_mutex);
 +    vp->allocated = 1;
 +    SDL_CondSignal(is->pictq_cond);
 +    SDL_UnlockMutex(is->pictq_mutex);
 +}
 +
 +static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_t pos)
 +{
 +    VideoPicture *vp;
 +    double frame_delay, pts = pts1;
 +
 +    /* compute the exact PTS for the picture if it is omitted in the stream
 +     * pts1 is the dts of the pkt / pts of the frame */
 +    if (pts != 0) {
 +        /* update video clock with pts, if present */
 +        is->video_clock = pts;
 +    } else {
 +        pts = is->video_clock;
 +    }
 +    /* update video clock for next frame */
 +    frame_delay = av_q2d(is->video_st->codec->time_base);
 +    /* for MPEG2, the frame can be repeated, so we update the
 +       clock accordingly */
 +    frame_delay += src_frame->repeat_pict * (frame_delay * 0.5);
 +    is->video_clock += frame_delay;
 +
 +#if defined(DEBUG_SYNC) && 0
 +    printf("frame_type=%c clock=%0.3f pts=%0.3f\n",
 +           av_get_picture_type_char(src_frame->pict_type), pts, pts1);
 +#endif
 +
 +    /* wait until we have space to put a new picture */
 +    SDL_LockMutex(is->pictq_mutex);
 +
 +    if(is->pictq_size>=VIDEO_PICTURE_QUEUE_SIZE && !is->refresh)
 +        is->skip_frames= FFMAX(1.0 - FRAME_SKIP_FACTOR, is->skip_frames * (1.0-FRAME_SKIP_FACTOR));
 +
 +    while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE &&
 +           !is->videoq.abort_request) {
 +        SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +    }
 +    SDL_UnlockMutex(is->pictq_mutex);
 +
 +    if (is->videoq.abort_request)
 +        return -1;
 +
 +    vp = &is->pictq[is->pictq_windex];
 +
 +    vp->duration = frame_delay;
 +
 +    /* alloc or resize hardware picture buffer */
 +    if (!vp->bmp ||
 +#if CONFIG_AVFILTER
 +        vp->width  != is->out_video_filter->inputs[0]->w ||
 +        vp->height != is->out_video_filter->inputs[0]->h) {
 +#else
 +        vp->width != is->video_st->codec->width ||
 +        vp->height != is->video_st->codec->height) {
 +#endif
 +        SDL_Event event;
 +
 +        vp->allocated = 0;
 +
 +        /* the allocation must be done in the main thread to avoid
 +           locking problems */
 +        event.type = FF_ALLOC_EVENT;
 +        event.user.data1 = is;
 +        SDL_PushEvent(&event);
 +
 +        /* wait until the picture is allocated */
 +        SDL_LockMutex(is->pictq_mutex);
 +        while (!vp->allocated && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        if (is->videoq.abort_request)
 +            return -1;
 +    }
 +
 +    /* if the frame is not skipped, then display it */
 +    if (vp->bmp) {
 +        AVPicture pict;
 +#if CONFIG_AVFILTER
 +        if(vp->picref)
 +            avfilter_unref_buffer(vp->picref);
 +        vp->picref = src_frame->opaque;
 +#endif
 +
 +        /* get a pointer on the bitmap */
 +        SDL_LockYUVOverlay (vp->bmp);
 +
 +        memset(&pict,0,sizeof(AVPicture));
 +        pict.data[0] = vp->bmp->pixels[0];
 +        pict.data[1] = vp->bmp->pixels[2];
 +        pict.data[2] = vp->bmp->pixels[1];
 +
 +        pict.linesize[0] = vp->bmp->pitches[0];
 +        pict.linesize[1] = vp->bmp->pitches[2];
 +        pict.linesize[2] = vp->bmp->pitches[1];
 +
 +#if CONFIG_AVFILTER
 +        //FIXME use direct rendering
 +        av_picture_copy(&pict, (AVPicture *)src_frame,
 +                        vp->pix_fmt, vp->width, vp->height);
 +#else
 +        sws_flags = av_get_int(sws_opts, "sws_flags", NULL);
 +        is->img_convert_ctx = sws_getCachedContext(is->img_convert_ctx,
 +            vp->width, vp->height, vp->pix_fmt, vp->width, vp->height,
 +            PIX_FMT_YUV420P, sws_flags, NULL, NULL, NULL);
 +        if (is->img_convert_ctx == NULL) {
 +            fprintf(stderr, "Cannot initialize the conversion context\n");
 +            exit(1);
 +        }
 +        sws_scale(is->img_convert_ctx, src_frame->data, src_frame->linesize,
 +                  0, vp->height, pict.data, pict.linesize);
 +#endif
 +        /* update the bitmap content */
 +        SDL_UnlockYUVOverlay(vp->bmp);
 +
 +        vp->pts = pts;
 +        vp->pos = pos;
 +
 +        /* now we can update the picture count */
 +        if (++is->pictq_windex == VIDEO_PICTURE_QUEUE_SIZE)
 +            is->pictq_windex = 0;
 +        SDL_LockMutex(is->pictq_mutex);
 +        vp->target_clock= compute_target_time(vp->pts, is);
 +
 +        is->pictq_size++;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +    }
 +    return 0;
 +}
 +
 +static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacket *pkt)
 +{
 +    int got_picture, i;
 +
 +    if (packet_queue_get(&is->videoq, pkt, 1) < 0)
 +        return -1;
 +
 +    if (pkt->data == flush_pkt.data) {
 +        avcodec_flush_buffers(is->video_st->codec);
 +
 +        SDL_LockMutex(is->pictq_mutex);
 +        //Make sure there are no long delay timers (ideally we should just flush the que but thats harder)
 +        for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +            is->pictq[i].target_clock= 0;
 +        }
 +        while (is->pictq_size && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        is->video_current_pos = -1;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        is->frame_last_pts = AV_NOPTS_VALUE;
 +        is->frame_last_delay = 0;
 +        is->frame_timer = (double)av_gettime() / 1000000.0;
 +        is->skip_frames = 1;
 +        is->skip_frames_index = 0;
 +        return 0;
 +    }
 +
 +    avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt);
 +
 +    if (got_picture) {
 +        if (decoder_reorder_pts == -1) {
 +            *pts = frame->best_effort_timestamp;
 +        } else if (decoder_reorder_pts) {
 +            *pts = frame->pkt_pts;
 +        } else {
 +            *pts = frame->pkt_dts;
 +        }
 +
 +        if (*pts == AV_NOPTS_VALUE) {
 +            *pts = 0;
 +        }
 +
 +        is->skip_frames_index += 1;
 +        if(is->skip_frames_index >= is->skip_frames){
 +            is->skip_frames_index -= FFMAX(is->skip_frames, 1.0);
 +            return 1;
 +        }
 +
 +    }
 +    return 0;
 +}
 +
 +#if CONFIG_AVFILTER
 +typedef struct {
 +    VideoState *is;
 +    AVFrame *frame;
 +    int use_dr1;
 +} FilterPriv;
 +
 +static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    AVFilterContext *ctx = codec->opaque;
 +    AVFilterBufferRef  *ref;
 +    int perms = AV_PERM_WRITE;
 +    int i, w, h, stride[4];
 +    unsigned edge;
 +    int pixel_size;
 +
 +    av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE);
 +
 +    if (codec->codec->capabilities & CODEC_CAP_NEG_LINESIZES)
 +        perms |= AV_PERM_NEG_LINESIZES;
 +
 +    if(pic->buffer_hints & FF_BUFFER_HINTS_VALID) {
 +        if(pic->buffer_hints & FF_BUFFER_HINTS_READABLE) perms |= AV_PERM_READ;
 +        if(pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) perms |= AV_PERM_PRESERVE;
 +        if(pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) perms |= AV_PERM_REUSE2;
 +    }
 +    if(pic->reference) perms |= AV_PERM_READ | AV_PERM_PRESERVE;
 +
 +    w = codec->width;
 +    h = codec->height;
 +
 +    if(av_image_check_size(w, h, 0, codec))
 +        return -1;
 +
 +    avcodec_align_dimensions2(codec, &w, &h, stride);
 +    edge = codec->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width();
 +    w += edge << 1;
 +    h += edge << 1;
 +
 +    if(!(ref = avfilter_get_video_buffer(ctx->outputs[0], perms, w, h)))
 +        return -1;
 +
 +    pixel_size = av_pix_fmt_descriptors[ref->format].comp[0].step_minus1+1;
 +    ref->video->w = codec->width;
 +    ref->video->h = codec->height;
 +    for(i = 0; i < 4; i ++) {
 +        unsigned hshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_w : 0;
 +        unsigned vshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_h : 0;
 +
 +        if (ref->data[i]) {
 +            ref->data[i]    += ((edge * pixel_size) >> hshift) + ((edge * ref->linesize[i]) >> vshift);
 +        }
 +        pic->data[i]     = ref->data[i];
 +        pic->linesize[i] = ref->linesize[i];
 +    }
 +    pic->opaque = ref;
 +    pic->age    = INT_MAX;
 +    pic->type   = FF_BUFFER_TYPE_USER;
 +    pic->reordered_opaque = codec->reordered_opaque;
 +    if(codec->pkt) pic->pkt_pts = codec->pkt->pts;
 +    else           pic->pkt_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +static void input_release_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    memset(pic->data, 0, sizeof(pic->data));
 +    avfilter_unref_buffer(pic->opaque);
 +}
 +
 +static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    AVFilterBufferRef *ref = pic->opaque;
 +
 +    if (pic->data[0] == NULL) {
 +        pic->buffer_hints |= FF_BUFFER_HINTS_READABLE;
 +        return codec->get_buffer(codec, pic);
 +    }
 +
 +    if ((codec->width != ref->video->w) || (codec->height != ref->video->h) ||
 +        (codec->pix_fmt != ref->format)) {
 +        av_log(codec, AV_LOG_ERROR, "Picture properties changed.\n");
 +        return -1;
 +    }
 +
 +    pic->reordered_opaque = codec->reordered_opaque;
 +    if(codec->pkt) pic->pkt_pts = codec->pkt->pts;
 +    else           pic->pkt_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +static int input_init(AVFilterContext *ctx, const char *args, void *opaque)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    AVCodecContext *codec;
 +    if(!opaque) return -1;
 +
 +    priv->is = opaque;
 +    codec    = priv->is->video_st->codec;
 +    codec->opaque = ctx;
 +    if((codec->codec->capabilities & CODEC_CAP_DR1)
 +    ) {
 +        av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE);
 +        priv->use_dr1 = 1;
 +        codec->get_buffer     = input_get_buffer;
 +        codec->release_buffer = input_release_buffer;
 +        codec->reget_buffer   = input_reget_buffer;
 +        codec->thread_safe_callbacks = 1;
 +    }
 +
 +    priv->frame = avcodec_alloc_frame();
 +
 +    return 0;
 +}
 +
 +static void input_uninit(AVFilterContext *ctx)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    av_free(priv->frame);
 +}
 +
 +static int input_request_frame(AVFilterLink *link)
 +{
 +    FilterPriv *priv = link->src->priv;
 +    AVFilterBufferRef *picref;
 +    int64_t pts = 0;
 +    AVPacket pkt;
 +    int ret;
 +
 +    while (!(ret = get_video_frame(priv->is, priv->frame, &pts, &pkt)))
 +        av_free_packet(&pkt);
 +    if (ret < 0)
 +        return -1;
 +
 +    if(priv->use_dr1 && priv->frame->opaque) {
 +        picref = avfilter_ref_buffer(priv->frame->opaque, ~0);
 +    } else {
 +        picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h);
 +        av_image_copy(picref->data, picref->linesize,
 +                      priv->frame->data, priv->frame->linesize,
 +                      picref->format, link->w, link->h);
 +    }
 +    av_free_packet(&pkt);
 +
 +    avfilter_copy_frame_props(picref, priv->frame);
 +    picref->pts = pts;
 +
 +    avfilter_start_frame(link, picref);
 +    avfilter_draw_slice(link, 0, link->h, 1);
 +    avfilter_end_frame(link);
 +
 +    return 0;
 +}
 +
 +static int input_query_formats(AVFilterContext *ctx)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    enum PixelFormat pix_fmts[] = {
 +        priv->is->video_st->codec->pix_fmt, PIX_FMT_NONE
 +    };
 +
 +    avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts));
 +    return 0;
 +}
 +
 +static int input_config_props(AVFilterLink *link)
 +{
 +    FilterPriv *priv  = link->src->priv;
 +    AVCodecContext *c = priv->is->video_st->codec;
 +
 +    link->w = c->width;
 +    link->h = c->height;
 +    link->sample_aspect_ratio = priv->is->video_st->sample_aspect_ratio;
 +    link->time_base = priv->is->video_st->time_base;
 +
 +    return 0;
 +}
 +
 +static AVFilter input_filter =
 +{
 +    .name      = "ffplay_input",
 +
 +    .priv_size = sizeof(FilterPriv),
 +
 +    .init      = input_init,
 +    .uninit    = input_uninit,
 +
 +    .query_formats = input_query_formats,
 +
 +    .inputs    = (AVFilterPad[]) {{ .name = NULL }},
 +    .outputs   = (AVFilterPad[]) {{ .name = "default",
 +                                    .type = AVMEDIA_TYPE_VIDEO,
 +                                    .request_frame = input_request_frame,
 +                                    .config_props  = input_config_props, },
 +                                  { .name = NULL }},
 +};
 +
 +static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const char *vfilters)
 +{
 +    char sws_flags_str[128];
 +    int ret;
 +    enum PixelFormat pix_fmts[] = { PIX_FMT_YUV420P, PIX_FMT_NONE };
 +    AVFilterContext *filt_src = NULL, *filt_out = NULL;
 +    snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags);
 +    graph->scale_sws_opts = av_strdup(sws_flags_str);
 +
 +    if ((ret = avfilter_graph_create_filter(&filt_src, &input_filter, "src",
 +                                            NULL, is, graph)) < 0)
 +        return ret;
 +    if ((ret = avfilter_graph_create_filter(&filt_out, avfilter_get_by_name("buffersink"), "out",
 +                                            NULL, pix_fmts, graph)) < 0)
 +        return ret;
 +
 +    if(vfilters) {
 +        AVFilterInOut *outputs = avfilter_inout_alloc();
 +        AVFilterInOut *inputs  = avfilter_inout_alloc();
 +
 +        outputs->name    = av_strdup("in");
 +        outputs->filter_ctx = filt_src;
 +        outputs->pad_idx = 0;
 +        outputs->next    = NULL;
 +
 +        inputs->name    = av_strdup("out");
 +        inputs->filter_ctx = filt_out;
 +        inputs->pad_idx = 0;
 +        inputs->next    = NULL;
 +
 +        if ((ret = avfilter_graph_parse(graph, vfilters, &inputs, &outputs, NULL)) < 0)
 +            return ret;
 +        av_freep(&vfilters);
 +    } else {
 +        if ((ret = avfilter_link(filt_src, 0, filt_out, 0)) < 0)
 +            return ret;
 +    }
 +
 +    if ((ret = avfilter_graph_config(graph, NULL)) < 0)
 +        return ret;
 +
 +    is->out_video_filter = filt_out;
 +
 +    return ret;
 +}
 +
 +#endif  /* CONFIG_AVFILTER */
 +
 +static int video_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    AVFrame *frame= avcodec_alloc_frame();
 +    int64_t pts_int = AV_NOPTS_VALUE, pos = -1;
 +    double pts;
 +    int ret;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterGraph *graph = avfilter_graph_alloc();
 +    AVFilterContext *filt_out = NULL;
 +
 +    if ((ret = configure_video_filters(graph, is, vfilters)) < 0)
 +        goto the_end;
 +    filt_out = is->out_video_filter;
 +#endif
 +
 +    for(;;) {
 +#if !CONFIG_AVFILTER
 +        AVPacket pkt;
 +#else
 +        AVFilterBufferRef *picref;
 +        AVRational tb = filt_out->inputs[0]->time_base;
 +#endif
 +        while (is->paused && !is->videoq.abort_request)
 +            SDL_Delay(10);
 +#if CONFIG_AVFILTER
 +        ret = av_vsink_buffer_get_video_buffer_ref(filt_out, &picref, 0);
 +        if (picref) {
 +            avfilter_fill_frame_from_video_buffer_ref(frame, picref);
 +            pts_int = picref->pts;
 +            pos     = picref->pos;
 +            frame->opaque = picref;
 +        }
 +
 +        if (av_cmp_q(tb, is->video_st->time_base)) {
 +            av_unused int64_t pts1 = pts_int;
 +            pts_int = av_rescale_q(pts_int, tb, is->video_st->time_base);
 +            av_dlog(NULL, "video_thread(): "
 +                    "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n",
 +                    tb.num, tb.den, pts1,
 +                    is->video_st->time_base.num, is->video_st->time_base.den, pts_int);
 +        }
 +#else
 +        ret = get_video_frame(is, frame, &pts_int, &pkt);
 +        pos = pkt.pos;
 +        av_free_packet(&pkt);
 +#endif
 +
 +        if (ret < 0) goto the_end;
 +
 +        if (!picref)
 +            continue;
 +
 +        pts = pts_int*av_q2d(is->video_st->time_base);
 +
 +        ret = queue_picture(is, frame, pts, pos);
 +
 +        if (ret < 0)
 +            goto the_end;
 +
 +        if (step)
 +            if (cur_stream)
 +                stream_toggle_pause(cur_stream);
 +    }
 + the_end:
 +#if CONFIG_AVFILTER
 +    avfilter_graph_free(&graph);
 +#endif
 +    av_free(frame);
 +    return 0;
 +}
 +
 +static int subtitle_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    SubPicture *sp;
 +    AVPacket pkt1, *pkt = &pkt1;
 +    int got_subtitle;
 +    double pts;
 +    int i, j;
 +    int r, g, b, y, u, v, a;
 +
 +    for(;;) {
 +        while (is->paused && !is->subtitleq.abort_request) {
 +            SDL_Delay(10);
 +        }
 +        if (packet_queue_get(&is->subtitleq, pkt, 1) < 0)
 +            break;
 +
 +        if(pkt->data == flush_pkt.data){
 +            avcodec_flush_buffers(is->subtitle_st->codec);
 +            continue;
 +        }
 +        SDL_LockMutex(is->subpq_mutex);
 +        while (is->subpq_size >= SUBPICTURE_QUEUE_SIZE &&
 +               !is->subtitleq.abort_request) {
 +            SDL_CondWait(is->subpq_cond, is->subpq_mutex);
 +        }
 +        SDL_UnlockMutex(is->subpq_mutex);
 +
 +        if (is->subtitleq.abort_request)
 +            return 0;
 +
 +        sp = &is->subpq[is->subpq_windex];
 +
 +       /* NOTE: ipts is the PTS of the _first_ picture beginning in
 +           this packet, if any */
 +        pts = 0;
 +        if (pkt->pts != AV_NOPTS_VALUE)
 +            pts = av_q2d(is->subtitle_st->time_base)*pkt->pts;
 +
 +        avcodec_decode_subtitle2(is->subtitle_st->codec, &sp->sub,
 +                                 &got_subtitle, pkt);
 +
 +        if (got_subtitle && sp->sub.format == 0) {
 +            sp->pts = pts;
 +
 +            for (i = 0; i < sp->sub.num_rects; i++)
 +            {
 +                for (j = 0; j < sp->sub.rects[i]->nb_colors; j++)
 +                {
 +                    RGBA_IN(r, g, b, a, (uint32_t*)sp->sub.rects[i]->pict.data[1] + j);
 +                    y = RGB_TO_Y_CCIR(r, g, b);
 +                    u = RGB_TO_U_CCIR(r, g, b, 0);
 +                    v = RGB_TO_V_CCIR(r, g, b, 0);
 +                    YUVA_OUT((uint32_t*)sp->sub.rects[i]->pict.data[1] + j, y, u, v, a);
 +                }
 +            }
 +
 +            /* now we can update the picture count */
 +            if (++is->subpq_windex == SUBPICTURE_QUEUE_SIZE)
 +                is->subpq_windex = 0;
 +            SDL_LockMutex(is->subpq_mutex);
 +            is->subpq_size++;
 +            SDL_UnlockMutex(is->subpq_mutex);
 +        }
 +        av_free_packet(pkt);
 +    }
 +    return 0;
 +}
 +
 +/* copy samples for viewing in editor window */
 +static void update_sample_display(VideoState *is, short *samples, int samples_size)
 +{
 +    int size, len;
 +
 +    size = samples_size / sizeof(short);
 +    while (size > 0) {
 +        len = SAMPLE_ARRAY_SIZE - is->sample_array_index;
 +        if (len > size)
 +            len = size;
 +        memcpy(is->sample_array + is->sample_array_index, samples, len * sizeof(short));
 +        samples += len;
 +        is->sample_array_index += len;
 +        if (is->sample_array_index >= SAMPLE_ARRAY_SIZE)
 +            is->sample_array_index = 0;
 +        size -= len;
 +    }
 +}
 +
 +/* return the new audio buffer size (samples can be added or deleted
 +   to get better sync if video or external master clock) */
 +static int synchronize_audio(VideoState *is, short *samples,
 +                             int samples_size1, double pts)
 +{
 +    int n, samples_size;
 +    double ref_clock;
 +
 +    n = 2 * is->audio_st->codec->channels;
 +    samples_size = samples_size1;
 +
 +    /* if not master, then we try to remove or add samples to correct the clock */
 +    if (((is->av_sync_type == AV_SYNC_VIDEO_MASTER && is->video_st) ||
 +         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
 +        double diff, avg_diff;
 +        int wanted_size, min_size, max_size, nb_samples;
 +
 +        ref_clock = get_master_clock(is);
 +        diff = get_audio_clock(is) - ref_clock;
 +
 +        if (diff < AV_NOSYNC_THRESHOLD) {
 +            is->audio_diff_cum = diff + is->audio_diff_avg_coef * is->audio_diff_cum;
 +            if (is->audio_diff_avg_count < AUDIO_DIFF_AVG_NB) {
 +                /* not enough measures to have a correct estimate */
 +                is->audio_diff_avg_count++;
 +            } else {
 +                /* estimate the A-V difference */
 +                avg_diff = is->audio_diff_cum * (1.0 - is->audio_diff_avg_coef);
 +
 +                if (fabs(avg_diff) >= is->audio_diff_threshold) {
 +                    wanted_size = samples_size + ((int)(diff * is->audio_st->codec->sample_rate) * n);
 +                    nb_samples = samples_size / n;
 +
 +                    min_size = ((nb_samples * (100 - SAMPLE_CORRECTION_PERCENT_MAX)) / 100) * n;
 +                    max_size = ((nb_samples * (100 + SAMPLE_CORRECTION_PERCENT_MAX)) / 100) * n;
 +                    if (wanted_size < min_size)
 +                        wanted_size = min_size;
 +                    else if (wanted_size > max_size)
 +                        wanted_size = max_size;
 +
 +                    /* add or remove samples to correction the synchro */
 +                    if (wanted_size < samples_size) {
 +                        /* remove samples */
 +                        samples_size = wanted_size;
 +                    } else if (wanted_size > samples_size) {
 +                        uint8_t *samples_end, *q;
 +                        int nb;
 +
 +                        /* add samples */
 +                        nb = (samples_size - wanted_size);
 +                        samples_end = (uint8_t *)samples + samples_size - n;
 +                        q = samples_end + n;
 +                        while (nb > 0) {
 +                            memcpy(q, samples_end, n);
 +                            q += n;
 +                            nb -= n;
 +                        }
 +                        samples_size = wanted_size;
 +                    }
 +                }
 +#if 0
 +                printf("diff=%f adiff=%f sample_diff=%d apts=%0.3f vpts=%0.3f %f\n",
 +                       diff, avg_diff, samples_size - samples_size1,
 +                       is->audio_clock, is->video_clock, is->audio_diff_threshold);
 +#endif
 +            }
 +        } else {
 +            /* too big difference : may be initial PTS errors, so
 +               reset A-V filter */
 +            is->audio_diff_avg_count = 0;
 +            is->audio_diff_cum = 0;
 +        }
 +    }
 +
 +    return samples_size;
 +}
 +
 +/* decode one audio frame and returns its uncompressed size */
 +static int audio_decode_frame(VideoState *is, double *pts_ptr)
 +{
 +    AVPacket *pkt_temp = &is->audio_pkt_temp;
 +    AVPacket *pkt = &is->audio_pkt;
 +    AVCodecContext *dec= is->audio_st->codec;
 +    int n, len1, data_size;
 +    double pts;
 +
 +    for(;;) {
 +        /* NOTE: the audio packet can contain several frames */
 +        while (pkt_temp->size > 0) {
 +            data_size = sizeof(is->audio_buf1);
 +            len1 = avcodec_decode_audio3(dec,
 +                                        (int16_t *)is->audio_buf1, &data_size,
 +                                        pkt_temp);
 +            if (len1 < 0) {
 +                /* if error, we skip the frame */
 +                pkt_temp->size = 0;
 +                break;
 +            }
 +
 +            pkt_temp->data += len1;
 +            pkt_temp->size -= len1;
 +            if (data_size <= 0)
 +                continue;
 +
 +            if (dec->sample_fmt != is->audio_src_fmt) {
 +                if (is->reformat_ctx)
 +                    av_audio_convert_free(is->reformat_ctx);
 +                is->reformat_ctx= av_audio_convert_alloc(AV_SAMPLE_FMT_S16, 1,
 +                                                         dec->sample_fmt, 1, NULL, 0);
 +                if (!is->reformat_ctx) {
 +                    fprintf(stderr, "Cannot convert %s sample format to %s sample format\n",
 +                        av_get_sample_fmt_name(dec->sample_fmt),
 +                        av_get_sample_fmt_name(AV_SAMPLE_FMT_S16));
 +                        break;
 +                }
 +                is->audio_src_fmt= dec->sample_fmt;
 +            }
 +
 +            if (is->reformat_ctx) {
 +                const void *ibuf[6]= {is->audio_buf1};
 +                void *obuf[6]= {is->audio_buf2};
 +                int istride[6]= {av_get_bytes_per_sample(dec->sample_fmt)};
 +                int ostride[6]= {2};
 +                int len= data_size/istride[0];
 +                if (av_audio_convert(is->reformat_ctx, obuf, ostride, ibuf, istride, len)<0) {
 +                    printf("av_audio_convert() failed\n");
 +                    break;
 +                }
 +                is->audio_buf= is->audio_buf2;
 +                /* FIXME: existing code assume that data_size equals framesize*channels*2
 +                          remove this legacy cruft */
 +                data_size= len*2;
 +            }else{
 +                is->audio_buf= is->audio_buf1;
 +            }
 +
 +            /* if no pts, then compute it */
 +            pts = is->audio_clock;
 +            *pts_ptr = pts;
 +            n = 2 * dec->channels;
 +            is->audio_clock += (double)data_size /
 +                (double)(n * dec->sample_rate);
 +#ifdef DEBUG
 +            {
 +                static double last_clock;
 +                printf("audio: delay=%0.3f clock=%0.3f pts=%0.3f\n",
 +                       is->audio_clock - last_clock,
 +                       is->audio_clock, pts);
 +                last_clock = is->audio_clock;
 +            }
 +#endif
 +            return data_size;
 +        }
 +
 +        /* free the current packet */
 +        if (pkt->data)
 +            av_free_packet(pkt);
 +
 +        if (is->paused || is->audioq.abort_request) {
 +            return -1;
 +        }
 +
 +        /* read next packet */
 +        if (packet_queue_get(&is->audioq, pkt, 1) < 0)
 +            return -1;
 +        if(pkt->data == flush_pkt.data){
 +            avcodec_flush_buffers(dec);
 +            continue;
 +        }
 +
 +        pkt_temp->data = pkt->data;
 +        pkt_temp->size = pkt->size;
 +
 +        /* if update the audio clock with the pts */
 +        if (pkt->pts != AV_NOPTS_VALUE) {
 +            is->audio_clock = av_q2d(is->audio_st->time_base)*pkt->pts;
 +        }
 +    }
 +}
 +
 +/* prepare a new audio buffer */
 +static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
 +{
 +    VideoState *is = opaque;
 +    int audio_size, len1;
 +    double pts;
 +
 +    audio_callback_time = av_gettime();
 +
 +    while (len > 0) {
 +        if (is->audio_buf_index >= is->audio_buf_size) {
 +           audio_size = audio_decode_frame(is, &pts);
 +           if (audio_size < 0) {
 +                /* if error, just output silence */
 +               is->audio_buf = is->audio_buf1;
 +               is->audio_buf_size = 1024;
 +               memset(is->audio_buf, 0, is->audio_buf_size);
 +           } else {
 +               if (is->show_mode != SHOW_MODE_VIDEO)
 +                   update_sample_display(is, (int16_t *)is->audio_buf, audio_size);
 +               audio_size = synchronize_audio(is, (int16_t *)is->audio_buf, audio_size,
 +                                              pts);
 +               is->audio_buf_size = audio_size;
 +           }
 +           is->audio_buf_index = 0;
 +        }
 +        len1 = is->audio_buf_size - is->audio_buf_index;
 +        if (len1 > len)
 +            len1 = len;
 +        memcpy(stream, (uint8_t *)is->audio_buf + is->audio_buf_index, len1);
 +        len -= len1;
 +        stream += len1;
 +        is->audio_buf_index += len1;
 +    }
 +}
 +
 +/* open a given stream. Return 0 if OK */
 +static int stream_component_open(VideoState *is, int stream_index)
 +{
 +    AVFormatContext *ic = is->ic;
 +    AVCodecContext *avctx;
 +    AVCodec *codec;
 +    SDL_AudioSpec wanted_spec, spec;
 +    AVDictionary *opts;
 +    AVDictionaryEntry *t = NULL;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return -1;
 +    avctx = ic->streams[stream_index]->codec;
 +
++    opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index]);
 +
 +    /* prepare audio output */
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        if (avctx->channels > 0) {
 +            avctx->request_channels = FFMIN(2, avctx->channels);
 +        } else {
 +            avctx->request_channels = 2;
 +        }
 +    }
 +
 +    codec = avcodec_find_decoder(avctx->codec_id);
 +    if (!codec)
 +        return -1;
 +
 +    avctx->workaround_bugs = workaround_bugs;
 +    avctx->lowres = lowres;
 +    if(lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +    avctx->idct_algo= idct;
 +    if(fast) avctx->flags2 |= CODEC_FLAG2_FAST;
 +    avctx->skip_frame= skip_frame;
 +    avctx->skip_idct= skip_idct;
 +    avctx->skip_loop_filter= skip_loop_filter;
 +    avctx->error_recognition= error_recognition;
 +    avctx->error_concealment= error_concealment;
 +    avctx->thread_count= thread_count;
 +
 +    if(codec->capabilities & CODEC_CAP_DR1)
 +        avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +
 +    if (!codec ||
 +        avcodec_open2(avctx, codec, &opts) < 0)
 +        return -1;
 +    if ((t = av_dict_get(opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        return AVERROR_OPTION_NOT_FOUND;
 +    }
 +
 +    /* prepare audio output */
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        if(avctx->sample_rate <= 0 || avctx->channels <= 0){
 +            fprintf(stderr, "Invalid sample rate or channel count\n");
 +            return -1;
 +        }
 +        wanted_spec.freq = avctx->sample_rate;
 +        wanted_spec.format = AUDIO_S16SYS;
 +        wanted_spec.channels = avctx->channels;
 +        wanted_spec.silence = 0;
 +        wanted_spec.samples = SDL_AUDIO_BUFFER_SIZE;
 +        wanted_spec.callback = sdl_audio_callback;
 +        wanted_spec.userdata = is;
 +        if (SDL_OpenAudio(&wanted_spec, &spec) < 0) {
 +            fprintf(stderr, "SDL_OpenAudio: %s\n", SDL_GetError());
 +            return -1;
 +        }
 +        is->audio_hw_buf_size = spec.size;
 +        is->audio_src_fmt= AV_SAMPLE_FMT_S16;
 +    }
 +
 +    ic->streams[stream_index]->discard = AVDISCARD_DEFAULT;
 +    switch(avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        is->audio_stream = stream_index;
 +        is->audio_st = ic->streams[stream_index];
 +        is->audio_buf_size = 0;
 +        is->audio_buf_index = 0;
 +
 +        /* init averaging filter */
 +        is->audio_diff_avg_coef = exp(log(0.01) / AUDIO_DIFF_AVG_NB);
 +        is->audio_diff_avg_count = 0;
 +        /* since we do not have a precise anough audio fifo fullness,
 +           we correct audio sync only if larger than this threshold */
 +        is->audio_diff_threshold = 2.0 * SDL_AUDIO_BUFFER_SIZE / avctx->sample_rate;
 +
 +        memset(&is->audio_pkt, 0, sizeof(is->audio_pkt));
 +        packet_queue_init(&is->audioq);
 +        SDL_PauseAudio(0);
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_stream = stream_index;
 +        is->video_st = ic->streams[stream_index];
 +
 +        packet_queue_init(&is->videoq);
 +        is->video_tid = SDL_CreateThread(video_thread, is);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_stream = stream_index;
 +        is->subtitle_st = ic->streams[stream_index];
 +        packet_queue_init(&is->subtitleq);
 +
 +        is->subtitle_tid = SDL_CreateThread(subtitle_thread, is);
 +        break;
 +    default:
 +        break;
 +    }
 +    return 0;
 +}
 +
 +static void stream_component_close(VideoState *is, int stream_index)
 +{
 +    AVFormatContext *ic = is->ic;
 +    AVCodecContext *avctx;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return;
 +    avctx = ic->streams[stream_index]->codec;
 +
 +    switch(avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        packet_queue_abort(&is->audioq);
 +
 +        SDL_CloseAudio();
 +
 +        packet_queue_end(&is->audioq);
 +        if (is->reformat_ctx)
 +            av_audio_convert_free(is->reformat_ctx);
 +        is->reformat_ctx = NULL;
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        packet_queue_abort(&is->videoq);
 +
 +        /* note: we also signal this mutex to make sure we deblock the
 +           video thread in all cases */
 +        SDL_LockMutex(is->pictq_mutex);
 +        SDL_CondSignal(is->pictq_cond);
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        SDL_WaitThread(is->video_tid, NULL);
 +
 +        packet_queue_end(&is->videoq);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        packet_queue_abort(&is->subtitleq);
 +
 +        /* note: we also signal this mutex to make sure we deblock the
 +           video thread in all cases */
 +        SDL_LockMutex(is->subpq_mutex);
 +        is->subtitle_stream_changed = 1;
 +
 +        SDL_CondSignal(is->subpq_cond);
 +        SDL_UnlockMutex(is->subpq_mutex);
 +
 +        SDL_WaitThread(is->subtitle_tid, NULL);
 +
 +        packet_queue_end(&is->subtitleq);
 +        break;
 +    default:
 +        break;
 +    }
 +
 +    ic->streams[stream_index]->discard = AVDISCARD_ALL;
 +    avcodec_close(avctx);
 +    switch(avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        is->audio_st = NULL;
 +        is->audio_stream = -1;
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_st = NULL;
 +        is->video_stream = -1;
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_st = NULL;
 +        is->subtitle_stream = -1;
 +        break;
 +    default:
 +        break;
 +    }
 +}
 +
 +/* since we have only one decoding thread, we can use a global
 +   variable instead of a thread local variable */
 +static VideoState *global_video_state;
 +
 +static int decode_interrupt_cb(void)
 +{
 +    return (global_video_state && global_video_state->abort_request);
 +}
 +
 +/* this thread gets the stream from the disk or the network */
 +static int read_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    AVFormatContext *ic = NULL;
 +    int err, i, ret;
 +    int st_index[AVMEDIA_TYPE_NB];
 +    AVPacket pkt1, *pkt = &pkt1;
 +    int eof=0;
 +    int pkt_in_play_range = 0;
 +    AVDictionaryEntry *t;
 +    AVDictionary **opts;
 +    int orig_nb_streams;
 +
 +    memset(st_index, -1, sizeof(st_index));
 +    is->video_stream = -1;
 +    is->audio_stream = -1;
 +    is->subtitle_stream = -1;
 +
 +    global_video_state = is;
 +    avio_set_interrupt_cb(decode_interrupt_cb);
 +
 +    err = avformat_open_input(&ic, is->filename, is->iformat, &format_opts);
 +    if (err < 0) {
 +        print_error(is->filename, err);
 +        ret = -1;
 +        goto fail;
 +    }
 +    if ((t = av_dict_get(format_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        ret = AVERROR_OPTION_NOT_FOUND;
 +        goto fail;
 +    }
 +    is->ic = ic;
 +
 +    if(genpts)
 +        ic->flags |= AVFMT_FLAG_GENPTS;
 +
 +    opts = setup_find_stream_info_opts(ic, codec_opts);
 +    orig_nb_streams = ic->nb_streams;
 +
 +    err = avformat_find_stream_info(ic, opts);
 +    if (err < 0) {
 +        fprintf(stderr, "%s: could not find codec parameters\n", is->filename);
 +        ret = -1;
 +        goto fail;
 +    }
 +    for (i = 0; i < orig_nb_streams; i++)
 +        av_dict_free(&opts[i]);
 +    av_freep(&opts);
 +
 +    if(ic->pb)
 +        ic->pb->eof_reached= 0; //FIXME hack, ffplay maybe should not use url_feof() to test for the end
 +
 +    if(seek_by_bytes<0)
 +        seek_by_bytes= !!(ic->iformat->flags & AVFMT_TS_DISCONT);
 +
 +    /* if seeking requested, we execute it */
 +    if (start_time != AV_NOPTS_VALUE) {
 +        int64_t timestamp;
 +
 +        timestamp = start_time;
 +        /* add the stream start time */
 +        if (ic->start_time != AV_NOPTS_VALUE)
 +            timestamp += ic->start_time;
 +        ret = avformat_seek_file(ic, -1, INT64_MIN, timestamp, INT64_MAX, 0);
 +        if (ret < 0) {
 +            fprintf(stderr, "%s: could not seek to position %0.3f\n",
 +                    is->filename, (double)timestamp / AV_TIME_BASE);
 +        }
 +    }
 +
 +    for (i = 0; i < ic->nb_streams; i++)
 +        ic->streams[i]->discard = AVDISCARD_ALL;
 +    if (!video_disable)
 +        st_index[AVMEDIA_TYPE_VIDEO] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_VIDEO,
 +                                wanted_stream[AVMEDIA_TYPE_VIDEO], -1, NULL, 0);
 +    if (!audio_disable)
 +        st_index[AVMEDIA_TYPE_AUDIO] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO,
 +                                wanted_stream[AVMEDIA_TYPE_AUDIO],
 +                                st_index[AVMEDIA_TYPE_VIDEO],
 +                                NULL, 0);
 +    if (!video_disable)
 +        st_index[AVMEDIA_TYPE_SUBTITLE] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_SUBTITLE,
 +                                wanted_stream[AVMEDIA_TYPE_SUBTITLE],
 +                                (st_index[AVMEDIA_TYPE_AUDIO] >= 0 ?
 +                                 st_index[AVMEDIA_TYPE_AUDIO] :
 +                                 st_index[AVMEDIA_TYPE_VIDEO]),
 +                                NULL, 0);
 +    if (show_status) {
 +        av_dump_format(ic, 0, is->filename, 0);
 +    }
 +
 +    is->show_mode = show_mode;
 +
 +    /* open the streams */
 +    if (st_index[AVMEDIA_TYPE_AUDIO] >= 0) {
 +        stream_component_open(is, st_index[AVMEDIA_TYPE_AUDIO]);
 +    }
 +
 +    ret=-1;
 +    if (st_index[AVMEDIA_TYPE_VIDEO] >= 0) {
 +        ret= stream_component_open(is, st_index[AVMEDIA_TYPE_VIDEO]);
 +    }
 +    is->refresh_tid = SDL_CreateThread(refresh_thread, is);
 +    if (is->show_mode == SHOW_MODE_NONE)
 +        is->show_mode = ret >= 0 ? SHOW_MODE_VIDEO : SHOW_MODE_RDFT;
 +
 +    if (st_index[AVMEDIA_TYPE_SUBTITLE] >= 0) {
 +        stream_component_open(is, st_index[AVMEDIA_TYPE_SUBTITLE]);
 +    }
 +
 +    if (is->video_stream < 0 && is->audio_stream < 0) {
 +        fprintf(stderr, "%s: could not open codecs\n", is->filename);
 +        ret = -1;
 +        goto fail;
 +    }
 +
 +    for(;;) {
 +        if (is->abort_request)
 +            break;
 +        if (is->paused != is->last_paused) {
 +            is->last_paused = is->paused;
 +            if (is->paused)
 +                is->read_pause_return= av_read_pause(ic);
 +            else
 +                av_read_play(ic);
 +        }
 +#if CONFIG_RTSP_DEMUXER
 +        if (is->paused && !strcmp(ic->iformat->name, "rtsp")) {
 +            /* wait 10 ms to avoid trying to get another packet */
 +            /* XXX: horrible */
 +            SDL_Delay(10);
 +            continue;
 +        }
 +#endif
 +        if (is->seek_req) {
 +            int64_t seek_target= is->seek_pos;
 +            int64_t seek_min= is->seek_rel > 0 ? seek_target - is->seek_rel + 2: INT64_MIN;
 +            int64_t seek_max= is->seek_rel < 0 ? seek_target - is->seek_rel - 2: INT64_MAX;
 +//FIXME the +-2 is due to rounding being not done in the correct direction in generation
 +//      of the seek_pos/seek_rel variables
 +
 +            ret = avformat_seek_file(is->ic, -1, seek_min, seek_target, seek_max, is->seek_flags);
 +            if (ret < 0) {
 +                fprintf(stderr, "%s: error while seeking\n", is->ic->filename);
 +            }else{
 +                if (is->audio_stream >= 0) {
 +                    packet_queue_flush(&is->audioq);
 +                    packet_queue_put(&is->audioq, &flush_pkt);
 +                }
 +                if (is->subtitle_stream >= 0) {
 +                    packet_queue_flush(&is->subtitleq);
 +                    packet_queue_put(&is->subtitleq, &flush_pkt);
 +                }
 +                if (is->video_stream >= 0) {
 +                    packet_queue_flush(&is->videoq);
 +                    packet_queue_put(&is->videoq, &flush_pkt);
 +                }
 +            }
 +            is->seek_req = 0;
 +            eof= 0;
 +        }
 +
 +        /* if the queue are full, no need to read more */
 +        if (   is->audioq.size + is->videoq.size + is->subtitleq.size > MAX_QUEUE_SIZE
 +            || (   (is->audioq   .size  > MIN_AUDIOQ_SIZE || is->audio_stream<0)
 +                && (is->videoq   .nb_packets > MIN_FRAMES || is->video_stream<0)
 +                && (is->subtitleq.nb_packets > MIN_FRAMES || is->subtitle_stream<0))) {
 +            /* wait 10 ms */
 +            SDL_Delay(10);
 +            continue;
 +        }
 +        if(eof) {
 +            if(is->video_stream >= 0){
 +                av_init_packet(pkt);
 +                pkt->data=NULL;
 +                pkt->size=0;
 +                pkt->stream_index= is->video_stream;
 +                packet_queue_put(&is->videoq, pkt);
 +            }
 +            SDL_Delay(10);
 +            if(is->audioq.size + is->videoq.size + is->subtitleq.size ==0){
 +                if(loop!=1 && (!loop || --loop)){
 +                    stream_seek(cur_stream, start_time != AV_NOPTS_VALUE ? start_time : 0, 0, 0);
 +                }else if(autoexit){
 +                    ret=AVERROR_EOF;
 +                    goto fail;
 +                }
 +            }
 +            eof=0;
 +            continue;
 +        }
 +        ret = av_read_frame(ic, pkt);
 +        if (ret < 0) {
 +            if (ret == AVERROR_EOF || url_feof(ic->pb))
 +                eof=1;
 +            if (ic->pb && ic->pb->error)
 +                break;
 +            SDL_Delay(100); /* wait for user event */
 +            continue;
 +        }
 +        /* check if packet is in play range specified by user, then queue, otherwise discard */
 +        pkt_in_play_range = duration == AV_NOPTS_VALUE ||
 +                (pkt->pts - ic->streams[pkt->stream_index]->start_time) *
 +                av_q2d(ic->streams[pkt->stream_index]->time_base) -
 +                (double)(start_time != AV_NOPTS_VALUE ? start_time : 0)/1000000
 +                <= ((double)duration/1000000);
 +        if (pkt->stream_index == is->audio_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->audioq, pkt);
 +        } else if (pkt->stream_index == is->video_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->videoq, pkt);
 +        } else if (pkt->stream_index == is->subtitle_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->subtitleq, pkt);
 +        } else {
 +            av_free_packet(pkt);
 +        }
 +    }
 +    /* wait until the end */
 +    while (!is->abort_request) {
 +        SDL_Delay(100);
 +    }
 +
 +    ret = 0;
 + fail:
 +    /* disable interrupting */
 +    global_video_state = NULL;
 +
 +    /* close each stream */
 +    if (is->audio_stream >= 0)
 +        stream_component_close(is, is->audio_stream);
 +    if (is->video_stream >= 0)
 +        stream_component_close(is, is->video_stream);
 +    if (is->subtitle_stream >= 0)
 +        stream_component_close(is, is->subtitle_stream);
 +    if (is->ic) {
 +        av_close_input_file(is->ic);
 +        is->ic = NULL; /* safety */
 +    }
 +    avio_set_interrupt_cb(NULL);
 +
 +    if (ret != 0) {
 +        SDL_Event event;
 +
 +        event.type = FF_QUIT_EVENT;
 +        event.user.data1 = is;
 +        SDL_PushEvent(&event);
 +    }
 +    return 0;
 +}
 +
 +static VideoState *stream_open(const char *filename, AVInputFormat *iformat)
 +{
 +    VideoState *is;
 +
 +    is = av_mallocz(sizeof(VideoState));
 +    if (!is)
 +        return NULL;
 +    av_strlcpy(is->filename, filename, sizeof(is->filename));
 +    is->iformat = iformat;
 +    is->ytop = 0;
 +    is->xleft = 0;
 +
 +    /* start video display */
 +    is->pictq_mutex = SDL_CreateMutex();
 +    is->pictq_cond = SDL_CreateCond();
 +
 +    is->subpq_mutex = SDL_CreateMutex();
 +    is->subpq_cond = SDL_CreateCond();
 +
 +    is->av_sync_type = av_sync_type;
 +    is->read_tid = SDL_CreateThread(read_thread, is);
 +    if (!is->read_tid) {
 +        av_free(is);
 +        return NULL;
 +    }
 +    return is;
 +}
 +
 +static void stream_cycle_channel(VideoState *is, int codec_type)
 +{
 +    AVFormatContext *ic = is->ic;
 +    int start_index, stream_index;
 +    AVStream *st;
 +
 +    if (codec_type == AVMEDIA_TYPE_VIDEO)
 +        start_index = is->video_stream;
 +    else if (codec_type == AVMEDIA_TYPE_AUDIO)
 +        start_index = is->audio_stream;
 +    else
 +        start_index = is->subtitle_stream;
 +    if (start_index < (codec_type == AVMEDIA_TYPE_SUBTITLE ? -1 : 0))
 +        return;
 +    stream_index = start_index;
 +    for(;;) {
 +        if (++stream_index >= is->ic->nb_streams)
 +        {
 +            if (codec_type == AVMEDIA_TYPE_SUBTITLE)
 +            {
 +                stream_index = -1;
 +                goto the_end;
 +            } else
 +                stream_index = 0;
 +        }
 +        if (stream_index == start_index)
 +            return;
 +        st = ic->streams[stream_index];
 +        if (st->codec->codec_type == codec_type) {
 +            /* check that parameters are OK */
 +            switch(codec_type) {
 +            case AVMEDIA_TYPE_AUDIO:
 +                if (st->codec->sample_rate != 0 &&
 +                    st->codec->channels != 0)
 +                    goto the_end;
 +                break;
 +            case AVMEDIA_TYPE_VIDEO:
 +            case AVMEDIA_TYPE_SUBTITLE:
 +                goto the_end;
 +            default:
 +                break;
 +            }
 +        }
 +    }
 + the_end:
 +    stream_component_close(is, start_index);
 +    stream_component_open(is, stream_index);
 +}
 +
 +
 +static void toggle_full_screen(void)
 +{
 +    is_full_screen = !is_full_screen;
 +    video_open(cur_stream);
 +}
 +
 +static void toggle_pause(void)
 +{
 +    if (cur_stream)
 +        stream_toggle_pause(cur_stream);
 +    step = 0;
 +}
 +
 +static void step_to_next_frame(void)
 +{
 +    if (cur_stream) {
 +        /* if the stream is paused unpause it, then step */
 +        if (cur_stream->paused)
 +            stream_toggle_pause(cur_stream);
 +    }
 +    step = 1;
 +}
 +
 +static void toggle_audio_display(void)
 +{
 +    if (cur_stream) {
 +        int bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +        cur_stream->show_mode = (cur_stream->show_mode + 1) % SHOW_MODE_NB;
 +        fill_rectangle(screen,
 +                    cur_stream->xleft, cur_stream->ytop, cur_stream->width, cur_stream->height,
 +                    bgcolor);
 +        SDL_UpdateRect(screen, cur_stream->xleft, cur_stream->ytop, cur_stream->width, cur_stream->height);
 +    }
 +}
 +
 +/* handle an event sent by the GUI */
 +static void event_loop(void)
 +{
 +    SDL_Event event;
 +    double incr, pos, frac;
 +
 +    for(;;) {
 +        double x;
 +        SDL_WaitEvent(&event);
 +        switch(event.type) {
 +        case SDL_KEYDOWN:
 +            if (exit_on_keydown) {
 +                do_exit();
 +                break;
 +            }
 +            switch(event.key.keysym.sym) {
 +            case SDLK_ESCAPE:
 +            case SDLK_q:
 +                do_exit();
 +                break;
 +            case SDLK_f:
 +                toggle_full_screen();
 +                break;
 +            case SDLK_p:
 +            case SDLK_SPACE:
 +                toggle_pause();
 +                break;
 +            case SDLK_s: //S: Step to next frame
 +                step_to_next_frame();
 +                break;
 +            case SDLK_a:
 +                if (cur_stream)
 +                    stream_cycle_channel(cur_stream, AVMEDIA_TYPE_AUDIO);
 +                break;
 +            case SDLK_v:
 +                if (cur_stream)
 +                    stream_cycle_channel(cur_stream, AVMEDIA_TYPE_VIDEO);
 +                break;
 +            case SDLK_t:
 +                if (cur_stream)
 +                    stream_cycle_channel(cur_stream, AVMEDIA_TYPE_SUBTITLE);
 +                break;
 +            case SDLK_w:
 +                toggle_audio_display();
 +                break;
 +            case SDLK_LEFT:
 +                incr = -10.0;
 +                goto do_seek;
 +            case SDLK_RIGHT:
 +                incr = 10.0;
 +                goto do_seek;
 +            case SDLK_UP:
 +                incr = 60.0;
 +                goto do_seek;
 +            case SDLK_DOWN:
 +                incr = -60.0;
 +            do_seek:
 +                if (cur_stream) {
 +                    if (seek_by_bytes) {
 +                        if (cur_stream->video_stream >= 0 && cur_stream->video_current_pos>=0){
 +                            pos= cur_stream->video_current_pos;
 +                        }else if(cur_stream->audio_stream >= 0 && cur_stream->audio_pkt.pos>=0){
 +                            pos= cur_stream->audio_pkt.pos;
 +                        }else
 +                            pos = avio_tell(cur_stream->ic->pb);
 +                        if (cur_stream->ic->bit_rate)
 +                            incr *= cur_stream->ic->bit_rate / 8.0;
 +                        else
 +                            incr *= 180000.0;
 +                        pos += incr;
 +                        stream_seek(cur_stream, pos, incr, 1);
 +                    } else {
 +                        pos = get_master_clock(cur_stream);
 +                        pos += incr;
 +                        stream_seek(cur_stream, (int64_t)(pos * AV_TIME_BASE), (int64_t)(incr * AV_TIME_BASE), 0);
 +                    }
 +                }
 +                break;
 +            default:
 +                break;
 +            }
 +            break;
 +        case SDL_MOUSEBUTTONDOWN:
 +            if (exit_on_mousedown) {
 +                do_exit();
 +                break;
 +            }
 +        case SDL_MOUSEMOTION:
 +            if(event.type ==SDL_MOUSEBUTTONDOWN){
 +                x= event.button.x;
 +            }else{
 +                if(event.motion.state != SDL_PRESSED)
 +                    break;
 +                x= event.motion.x;
 +            }
 +            if (cur_stream) {
 +                if(seek_by_bytes || cur_stream->ic->duration<=0){
 +                    uint64_t size=  avio_size(cur_stream->ic->pb);
 +                    stream_seek(cur_stream, size*x/cur_stream->width, 0, 1);
 +                }else{
 +                    int64_t ts;
 +                    int ns, hh, mm, ss;
 +                    int tns, thh, tmm, tss;
 +                    tns = cur_stream->ic->duration/1000000LL;
 +                    thh = tns/3600;
 +                    tmm = (tns%3600)/60;
 +                    tss = (tns%60);
 +                    frac = x/cur_stream->width;
 +                    ns = frac*tns;
 +                    hh = ns/3600;
 +                    mm = (ns%3600)/60;
 +                    ss = (ns%60);
 +                    fprintf(stderr, "Seek to %2.0f%% (%2d:%02d:%02d) of total duration (%2d:%02d:%02d)       \n", frac*100,
 +                            hh, mm, ss, thh, tmm, tss);
 +                    ts = frac*cur_stream->ic->duration;
 +                    if (cur_stream->ic->start_time != AV_NOPTS_VALUE)
 +                        ts += cur_stream->ic->start_time;
 +                    stream_seek(cur_stream, ts, 0, 0);
 +                }
 +            }
 +            break;
 +        case SDL_VIDEORESIZE:
 +            if (cur_stream) {
 +                screen = SDL_SetVideoMode(event.resize.w, event.resize.h, 0,
 +                                          SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL);
 +                screen_width = cur_stream->width = event.resize.w;
 +                screen_height= cur_stream->height= event.resize.h;
 +            }
 +            break;
 +        case SDL_QUIT:
 +        case FF_QUIT_EVENT:
 +            do_exit();
 +            break;
 +        case FF_ALLOC_EVENT:
 +            video_open(event.user.data1);
 +            alloc_picture(event.user.data1);
 +            break;
 +        case FF_REFRESH_EVENT:
 +            video_refresh(event.user.data1);
 +            cur_stream->refresh=0;
 +            break;
 +        default:
 +            break;
 +        }
 +    }
 +}
 +
 +static int opt_frame_size(const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "Option -s is deprecated, use -video_size.\n");
 +    return opt_default("video_size", arg);
 +}
 +
 +static int opt_width(const char *opt, const char *arg)
 +{
 +    screen_width = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX);
 +    return 0;
 +}
 +
 +static int opt_height(const char *opt, const char *arg)
 +{
 +    screen_height = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX);
 +    return 0;
 +}
 +
 +static int opt_format(const char *opt, const char *arg)
 +{
 +    file_iformat = av_find_input_format(arg);
 +    if (!file_iformat) {
 +        fprintf(stderr, "Unknown input format: %s\n", arg);
 +        return AVERROR(EINVAL);
 +    }
 +    return 0;
 +}
 +
 +static int opt_frame_pix_fmt(const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "Option -pix_fmt is deprecated, use -pixel_format.\n");
 +    return opt_default("pixel_format", arg);
 +}
 +
 +static int opt_sync(const char *opt, const char *arg)
 +{
 +    if (!strcmp(arg, "audio"))
 +        av_sync_type = AV_SYNC_AUDIO_MASTER;
 +    else if (!strcmp(arg, "video"))
 +        av_sync_type = AV_SYNC_VIDEO_MASTER;
 +    else if (!strcmp(arg, "ext"))
 +        av_sync_type = AV_SYNC_EXTERNAL_CLOCK;
 +    else {
 +        fprintf(stderr, "Unknown value for %s: %s\n", opt, arg);
 +        exit(1);
 +    }
 +    return 0;
 +}
 +
 +static int opt_seek(const char *opt, const char *arg)
 +{
 +    start_time = parse_time_or_die(opt, arg, 1);
 +    return 0;
 +}
 +
 +static int opt_duration(const char *opt, const char *arg)
 +{
 +    duration = parse_time_or_die(opt, arg, 1);
 +    return 0;
 +}
 +
 +static int opt_thread_count(const char *opt, const char *arg)
 +{
 +    thread_count= parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX);
 +#if !HAVE_THREADS
 +    fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n");
 +#endif
 +    return 0;
 +}
 +
 +static int opt_show_mode(const char *opt, const char *arg)
 +{
 +    show_mode = !strcmp(arg, "video") ? SHOW_MODE_VIDEO :
 +                !strcmp(arg, "waves") ? SHOW_MODE_WAVES :
 +                !strcmp(arg, "rdft" ) ? SHOW_MODE_RDFT  :
 +                parse_number_or_die(opt, arg, OPT_INT, 0, SHOW_MODE_NB-1);
 +    return 0;
 +}
 +
 +static int opt_input_file(const char *opt, const char *filename)
 +{
 +    if (input_filename) {
 +        fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
 +                filename, input_filename);
 +        exit(1);
 +    }
 +    if (!strcmp(filename, "-"))
 +        filename = "pipe:";
 +    input_filename = filename;
 +    return 0;
 +}
 +
 +static const OptionDef options[] = {
 +#include "cmdutils_common_opts.h"
 +    { "x", HAS_ARG, {(void*)opt_width}, "force displayed width", "width" },
 +    { "y", HAS_ARG, {(void*)opt_height}, "force displayed height", "height" },
 +    { "s", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" },
 +    { "fs", OPT_BOOL, {(void*)&is_full_screen}, "force full screen" },
 +    { "an", OPT_BOOL, {(void*)&audio_disable}, "disable audio" },
 +    { "vn", OPT_BOOL, {(void*)&video_disable}, "disable video" },
 +    { "ast", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_AUDIO]}, "select desired audio stream", "stream_number" },
 +    { "vst", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_VIDEO]}, "select desired video stream", "stream_number" },
 +    { "sst", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_SUBTITLE]}, "select desired subtitle stream", "stream_number" },