Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Nov 2011 01:41:01 +0000 (02:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Nov 2011 02:01:43 +0000 (03:01 +0100)
* qatar/master: (23 commits)
  x86inc: use sse versions of common macros instead of sse2 when applicable
  doc/APIchanges: add missing dates and hashes
  lavf: don't return from void av_update_cur_dts()
  Changelog: add more entries.
  Changelog: update ffmpeg/avconv incompatibility list.
  avconv: remove some redundant temporary variables.
  avconv: fix broken indentation
  avconv: move copy_initial_nonkeyframes to the options context.
  avconv: use file:stream instead of file.stream in log messages.
  doc/avconv: elaborate on basic functionality.
  doc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats
  openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0
  Call avformat_network_init/deinit in the programs
  Remove leftover includes of strings.h
  avutil: Don't allow using strcasecmp/strncasecmp
  Replace all usage of strcasecmp/strncasecmp
  avstring: Add locale independent implementations of strcasecmp/strncasecmp
  avstring: Add locale independent implementations of toupper/tolower
  cosmetics: insert some spaces in explicit enum value assignments
  move 8SVX audio codecs to the audio codec list part on the next bump
  ...

Conflicts:
avprobe.c
doc/APIchanges
ffplay.c
ffserver.c
libavcodec/avcodec.h
libavdevice/bktr.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavformat/matroskaenc.c
libavformat/wtv.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/avutil.h
libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
23 files changed:
1  2 
Changelog
avconv.c
doc/APIchanges
doc/avconv.texi
ffmpeg.c
ffplay.c
ffprobe.c
ffserver.c
libavcodec/avcodec.h
libavdevice/bktr.c
libavdevice/dv1394.c
libavdevice/v4l.c
libavformat/network.c
libavformat/os_support.c
libavformat/rtpdec_latm.c
libavformat/utils.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/avutil.h
libavutil/dict.c
libswscale/x86/scale.asm
libswscale/x86/swscale_mmx.c
libswscale/x86/swscale_template.c

diff --cc Changelog
+++ b/Changelog
  Entries are sorted chronologically from oldest to youngest within each release,
  releases are sorted from youngest to oldest.
  
 +version next:
  
 -version <next>:
 +- openal input device added
 +- boxblur filter added
  - BWF muxer
  - Flash Screen Video 2 decoder
 -- ffplay/ffprobe/ffserver renamed to avplay/avprobe/avserver
 -- ffmpeg deprecated, added avconv, which is almost the same for now, except
 +- lavfi input device added
 +- added avconv, which is almost the same for now, except
  for a few incompatible changes in the options, which will hopefully make them
  easier to use. The changes are:
-     * -newvideo/-newaudio/-newsubtitle are gone, because they were redundant and
-       worked in a nonstandard way. -map is sufficient to add streams to output
-       files.
-     * -map now has slightly different and more powerful syntax.
-         + it's possible to specify stream type. E.g. -map 0:a:2 means 'third
-           audio stream'.
-         + omitting the stream index now maps all the streams of the given
-           type, not just the first. E.g. -map 0:s maps all the subtitle streams.
-         + colons (':') are used to separate file index/stream type/stream
-           index. Comma (',') is used to separate the sync stream. This is done
-           for consistency with other options.
-         + since -map can now match multiple streams, negative mappings were
+     * The options placement is now strictly enforced! While in theory the
+       options for ffmpeg should be given in [input options] -i INPUT [output
+       options] OUTPUT order, in practice it was possible to give output options
+       before the -i and it mostly worked. Except when it didn't - the behavior was
+       a bit inconsistent. In avconv, it is not possible to mix input and output
+       options. All non-global options are reset after an input or output filename.
+     * All per-file options are now truly per-file - they apply only to the next
+       input or output file and specifying different values for different files
+       will now work properly (notably -ss and -t options).
+     * All per-stream options are now truly per-stream - it is possible to
+       specify which stream(s) should a given option apply to. See the Stream
+       specifiers section in the avconv manual for details.
+     * In ffmpeg some options (like -newvideo/-newaudio/...) are irregular in the
+       sense that they're specified after the output filename instead of before,
+       like all other options. In avconv this irregularity is removed, all options
+       apply to the next input or output file.
+     * -newvideo/-newaudio/-newsubtitle options were removed. Not only were they
+       irregular and highly confusing, they were also redundant. In avconv the -map
+       option will create new streams in the output file and map input streams to
+       them. E.g. avconv -i INPUT -map 0 OUTPUT will create an output stream for
+       each stream in the first input file.
+     * The -map option now has slightly different and more powerful syntax:
+         + Colons (':') are used to separate file index/stream type/stream index
+           instead of dots. Comma (',') is used to separate the sync stream instead
+           of colon.. This is done for consistency with other options.
+         + It's possible to specify stream type. E.g. -map 0:a:2 creates an
+           output stream from the third input audio stream.
+         + Omitting the stream index now maps all the streams of the given type,
+           not just the first. E.g. -map 0:s creates output streams for all the
+           subtitle streams in the first input file.
+         + Since -map can now match multiple streams, negative mappings were
            introduced. Negative mappings disable some streams from an already
-           defined map. E.g. '-map 0 -map -0:a:1' means 'map everything except
-           for the second audio stream'.
-     * -vcodec/-acodec/-scodec are replaced by -c (or -codec), which
-       allows to precisely specify target stream(s) consistently with other
-       options. E.g. '-c:v libx264' sets the codec for all video streams,
-       '-c:a:0 libvorbis' sets the codec for the first audio stream and '-c
-       copy' copies all the streams.
+           defined map. E.g. '-map 0 -map -0:a:1' means 'create output streams for
+           all the stream in the first input file, except for the second audio
+           stream'.
+     * There is a new option -c (or -codec) for choosing the decoder/encoder to
+       use, which allows to precisely specify target stream(s) consistently with
+       other options. E.g. -c:v lib264 sets the codec for all video streams, -c:a:0
+       libvorbis sets the codec for the first audio stream and -c copy copies all
+       the streams without reencoding. Old -vcodec/-acodec/-scodec options are now
+       aliases to -c:v/a/s
      * It is now possible to precisely specify which stream should an AVOption
-       apply to. See the manual for detailed explanation.
+       apply to. E.g. -b:v:0 2M sets the bitrate for the first video stream, while
+       -b:a 128k sets the bitrate for all audio streams. Note that the old -ab 128k
+       syntax is deprecated and will stop working soon.
      * -map_chapters now takes only an input file index and applies to the next
        output file. This is consistent with how all the other options work.
      * -map_metadata now takes only an input metadata specifier and applies to
        the next output file. Output metadata specifier is now part of the option
        name, similarly to the AVOptions/map/codec feature above.
-     * Presets in avconv are disabled, because only libx264 used them and
-       presets for libx264 can now be specified using a private option
-       '-preset <presetname>'.
-     * -intra option was removed, it's equivalent to -g 0.
+     * -metadata can now be used to set metadata on streams and chapters, e.g.
+       -metadata:s:1 language=eng sets the language of the first stream to 'eng'.
+       This made -vlang/-alang/-slang options redundant, so they were removed.
+     * -qscale option now uses stream specifiers and applies to all streams, not
+       just video. I.e. plain -qscale number would now apply to all streams. To get
+       the old behavior, use -qscale:v. Also there is now a shortcut -q for -qscale
+       and -aq is now an alias for -q:a.
+     * -vbsf/-absf/-sbsf options were removed and replaced by a -bsf option which
+       uses stream specifiers. Use -bsf:v/a/s instead of the old options.
+     * -itsscale option now uses stream specifiers, so its argument is only the
+       scale parameter.
+     * -intra option was removed, use -g 0 for the same effect.
+     * -psnr option was removed, use -flags +psnr for the same effect.
+     * -vf option is now an alias to the new -filter option, which uses stream specifiers.
+     * -vframes/-aframes/-dframes options are now aliases to the new -frames option.
+     * -vtag/-atag/-stag options are now aliases to the new -tag option.
  - XMV demuxer
 +- LOAS demuxer
 +- ashowinfo filter added
  - Windows Media Image decoder
 +- amovie source added
  - LATM muxer/demuxer
 -- showinfo filter
 -- split filter
 +- Speex encoder via libspeex
 +- JSON output in ffprobe
 +- WTV muxer
 +- Optional C++ Support (needed for libstagefright)
 +- H.264 Decoding on Android via Stagefright
 +- Prores decoder
 +- BIN/XBIN/ADF/IDF text file decoder
 +- aconvert audio filter added
 +- audio support to lavfi input device added
  - libcdio-paranoia input device for audio CD grabbing
 -- select filter
  - Apple ProRes decoder
  - CELT in Ogg demuxing
 +- G.723.1 demuxer and decoder
 +- libmodplug support (--enable-libmodplug)
  - VC-1 interlaced decoding
 -- lut, lutrgb, and lutyuv filters
 -- boxblur filter
 +- libutvideo wrapper (--enable-libutvideo)
 +- aevalsrc audio source added
  - Ut Video decoder
  - Speex encoding via libspeex
  - 4:2:2 H.264 decoding support
+ - 4:2:2 and 4:4:4 H.264 encoding with libx264
  - Pulseaudio input device
 +- Prores encoder
 +- Video Decoder Acceleration (VDA) HWAccel module.
  - replacement Indeo 3 decoder
 +- new ffmpeg option: -map_channel
 +- volume audio filter added
 +- earwax audio filter added
 +- libv4l2 support (--enable-libv4l2)
  - TLS/SSL and HTTPS protocol support
+ - AVOptions API rewritten and documented
+ - most of CODEC_FLAG2_*, some CODEC_FLAG_* and many codec-specific fields in
+   AVCodecContext deprecated. Codec private options should be used instead.
+ - Properly working defaults in libx264 wrapper, support for native presets.
+ - Encrypted OMA files support
  
  
 -version 0.7:
 -
 -- E-AC-3 audio encoder
 -- ac3enc: add channel coupling support
 -- floating-point sample format support for (E-)AC-3, DCA, AAC, Vorbis decoders
 -- H.264/MPEG frame-level multithreading
 -- av_metadata_* functions renamed to av_dict_* and moved to libavutil
 -- 4:4:4 H.264 decoding support
 -- 10-bit H.264 optimizations for x86
 -- bump libswscale for recently reported ABI break
 +version 0.8:
  
  
 -version 0.7_beta2:
 -
 -- VP8 frame-level multithreading
 -- NEON optimizations for VP8
 -- removed a lot of deprecated API cruft
 -- FFT and IMDCT optimizations for AVX (Sandy Bridge) processors
 -- DPX image encoder
 -- SMPTE 302M AES3 audio decoder
 -- ffmpeg no longer quits after the 'q' key is pressed; use 'ctrl+c' instead
 -- 9bit and 10bit per sample support in the H.264 decoder
 -
 -
 -version 0.7_beta1:
 -
 +- many many things we forgot because we rather write code than changelogs
  - WebM support in Matroska de/muxer
  - low overhead Ogg muxing
  - MMS-TCP support
diff --cc avconv.c
+++ b/avconv.c
@@@ -240,18 -223,14 +239,19 @@@ typedef struct OutputStream 
      AVFilterGraph *graph;
  #endif
  
-    int64_t sws_flags;
-    AVDictionary *opts;
-    int is_past_recording_time;
-    int stream_copy;
-    const char *attachment_filename;
+     int64_t sws_flags;
+     AVDictionary *opts;
+     int is_past_recording_time;
+     int stream_copy;
+     const char *attachment_filename;
+     int copy_initial_nonkeyframes;
  } OutputStream;
  
 +#if HAVE_TERMIOS_H
 +
 +/* init terminal so that we can grab keys */
 +static struct termios oldtty;
 +#endif
  
  typedef struct OutputFile {
      AVFormatContext *ctx;
@@@ -1134,10 -1087,9 +1137,10 @@@ static void do_video_resample(OutputStr
                         ost->resample_height  != dec->height ||
                         ost->resample_pix_fmt != dec->pix_fmt;
  
 +#if !CONFIG_AVFILTER
      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",
+                "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));
@@@ -1881,12 -1814,13 +1884,13 @@@ static int output_packet(InputStream *i
                          abort();
                      }
                  } else {
 +                    AVPicture pict;
                      AVPacket opkt;
                      int64_t ost_tb_start_time= av_rescale_q(of->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 ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) &&
+                         !ost->copy_initial_nonkeyframes)
  #if !CONFIG_AVFILTER
                          continue;
  #else
@@@ -1999,8 -1926,18 +2003,8 @@@ static int init_input_stream(int ist_in
              return AVERROR(EINVAL);
          }
  
 -        /* update requested sample format for the decoder based on the
 -           corresponding encoder sample format */
 -        for (i = 0; i < nb_output_streams; i++) {
 -            OutputStream *ost = &output_streams[i];
 -            if (ost->source_index == ist_index) {
 -                update_sample_fmt(ist->st->codec, codec, ost->st->codec);
 -                break;
 -            }
 -        }
 -
          if (avcodec_open2(ist->st->codec, codec, &ist->opts) < 0) {
-             snprintf(error, error_len, "Error while opening decoder for input stream #%d.%d",
+             snprintf(error, error_len, "Error while opening decoder for input stream #%d:%d",
                      ist->file_index, ist->st->index);
              return AVERROR(EINVAL);
          }
@@@ -4349,11 -4221,9 +4352,12 @@@ int main(int argc, char **argv
      avfilter_register_all();
  #endif
      av_register_all();
+     avformat_network_init();
  
 -    avio_set_interrupt_cb(decode_interrupt_cb);
 +#if HAVE_ISATTY
 +    if(isatty(STDIN_FILENO))
 +        avio_set_interrupt_cb(decode_interrupt_cb);
 +#endif
  
      show_banner();
  
diff --cc doc/APIchanges
@@@ -13,13 -13,13 +13,19 @@@ libavutil:   2011-04-1
  
  API changes, most recent first:
  
- 2011-11-xx - xxxxxxx - lavf 53.13.0
 +2011-11-03 - 96949da - lavu 51.23.0
 +  Add av_strcasecmp() and av_strncasecmp() to avstring.h.
 +
 +2011-10-20 - b35e9e1 - lavu 51.22.0
 +  Add av_strtok() to avstring.h.
 +
+ 2011-11-06 - ba04ecf - lavu 51.14.0
+   Add av_strcasecmp() and av_strncasecmp() to avstring.h.
+ 2011-11-06 - 07b172f - lavu 51.13.0
+   Add av_toupper()/av_tolower()
+ 2011-11-05 - b6d08f4 - lavf 53.13.0
    Add avformat_network_init()/avformat_network_uninit()
  
  2011-10-27 - 512557b - lavc 53.15.0
diff --cc doc/avconv.texi
Simple merge
diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -144,7 -201,10 +144,6 @@@ 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;
  
@@@ -255,185 -290,46 +254,188 @@@ typedef struct OutputStream 
      AVFilterGraph *graph;
  #endif
  
-    int64_t sws_flags;
 -   int sws_flags;
--   AVDictionary *opts;
-    int is_past_recording_time;
-    int stream_copy;
-    const char *attachment_filename;
++    int64_t sws_flags;
++    AVDictionary *opts;
++    int is_past_recording_time;
++    int stream_copy;
++    const char *attachment_filename;
++    int copy_initial_nonkeyframes;
  } 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;
 +#if HAVE_TERMIOS_H
  
 -    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 */
 -    PtsCorrectionContext pts_ctx;
 -    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;
 +/* init terminal so that we can grab keys */
 +static struct termios oldtty;
 +#endif
  
 -typedef struct InputFile {
 +typedef struct OutputFile {
      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 */
 -    int64_t ts_offset;
 -    int nb_streams;       /* nb streams we are aware of */
 -} InputFile;
 +    AVDictionary *opts;
 +    int ost_index;       /* index of the first stream in output_streams */
 +    int64_t recording_time; /* desired length of the resulting file in microseconds */
 +    int64_t start_time;     /* start time in microseconds */
 +    uint64_t limit_filesize;
 +} OutputFile;
  
  static InputStream *input_streams = NULL;
  static int         nb_input_streams = 0;
  static InputFile   *input_files   = NULL;
  static int         nb_input_files   = 0;
  
 +static OutputStream *output_streams = NULL;
 +static int        nb_output_streams = 0;
 +static OutputFile   *output_files   = NULL;
 +static int        nb_output_files   = 0;
 +
 +typedef struct OptionsContext {
 +    /* input/output options */
 +    int64_t start_time;
 +    const char *format;
 +
 +    SpecifierOpt *codec_names;
 +    int        nb_codec_names;
 +    SpecifierOpt *audio_channels;
 +    int        nb_audio_channels;
 +    SpecifierOpt *audio_sample_rate;
 +    int        nb_audio_sample_rate;
 +    SpecifierOpt *rematrix_volume;
 +    int        nb_rematrix_volume;
 +    SpecifierOpt *frame_rates;
 +    int        nb_frame_rates;
 +    SpecifierOpt *frame_sizes;
 +    int        nb_frame_sizes;
 +    SpecifierOpt *frame_pix_fmts;
 +    int        nb_frame_pix_fmts;
 +
 +    /* input options */
 +    int64_t input_ts_offset;
 +    int rate_emu;
 +
 +    SpecifierOpt *ts_scale;
 +    int        nb_ts_scale;
 +    SpecifierOpt *dump_attachment;
 +    int        nb_dump_attachment;
 +
 +    /* output options */
 +    StreamMap *stream_maps;
 +    int     nb_stream_maps;
 +    AudioChannelMap *audio_channel_maps; ///< one info entry per -map_channel
 +    int           nb_audio_channel_maps; ///< number of (valid) -map_channel settings
 +    /* first item specifies output metadata, second is input */
 +    MetadataMap (*meta_data_maps)[2];
 +    int nb_meta_data_maps;
 +    int metadata_global_manual;
 +    int metadata_streams_manual;
 +    int metadata_chapters_manual;
 +    const char **attachments;
 +    int       nb_attachments;
 +
 +    int chapters_input_file;
 +
 +    int64_t recording_time;
 +    uint64_t limit_filesize;
 +    float mux_preload;
 +    float mux_max_delay;
 +
 +    int video_disable;
 +    int audio_disable;
 +    int subtitle_disable;
 +    int data_disable;
 +
 +    /* indexed by output file stream index */
 +    int   *streamid_map;
 +    int nb_streamid_map;
 +
 +    SpecifierOpt *metadata;
 +    int        nb_metadata;
 +    SpecifierOpt *max_frames;
 +    int        nb_max_frames;
 +    SpecifierOpt *bitstream_filters;
 +    int        nb_bitstream_filters;
 +    SpecifierOpt *codec_tags;
 +    int        nb_codec_tags;
 +    SpecifierOpt *sample_fmts;
 +    int        nb_sample_fmts;
 +    SpecifierOpt *qscale;
 +    int        nb_qscale;
 +    SpecifierOpt *forced_key_frames;
 +    int        nb_forced_key_frames;
 +    SpecifierOpt *force_fps;
 +    int        nb_force_fps;
 +    SpecifierOpt *frame_aspect_ratios;
 +    int        nb_frame_aspect_ratios;
 +    SpecifierOpt *rc_overrides;
 +    int        nb_rc_overrides;
 +    SpecifierOpt *intra_matrices;
 +    int        nb_intra_matrices;
 +    SpecifierOpt *inter_matrices;
 +    int        nb_inter_matrices;
 +    SpecifierOpt *top_field_first;
 +    int        nb_top_field_first;
 +    SpecifierOpt *presets;
 +    int        nb_presets;
++    SpecifierOpt *copy_initial_nonkeyframes;
++    int        nb_copy_initial_nonkeyframes;
 +#if CONFIG_AVFILTER
 +    SpecifierOpt *filters;
 +    int        nb_filters;
 +#endif
 +} OptionsContext;
 +
 +#define MATCH_PER_STREAM_OPT(name, type, outvar, fmtctx, st)\
 +{\
 +    int i, ret;\
 +    for (i = 0; i < o->nb_ ## name; i++) {\
 +        char *spec = o->name[i].specifier;\
 +        if ((ret = check_stream_specifier(fmtctx, st, spec)) > 0)\
 +            outvar = o->name[i].u.type;\
 +        else if (ret < 0)\
 +            exit_program(1);\
 +    }\
 +}
 +
 +static void reset_options(OptionsContext *o, int is_input)
 +{
 +    const OptionDef *po = options;
 +    OptionsContext bak= *o;
 +
 +    /* all OPT_SPEC and OPT_STRING can be freed in generic way */
 +    while (po->name) {
 +        void *dst = (uint8_t*)o + po->u.off;
 +
 +        if (po->flags & OPT_SPEC) {
 +            SpecifierOpt **so = dst;
 +            int i, *count = (int*)(so + 1);
 +            for (i = 0; i < *count; i++) {
 +                av_freep(&(*so)[i].specifier);
 +                if (po->flags & OPT_STRING)
 +                    av_freep(&(*so)[i].u.str);
 +            }
 +            av_freep(so);
 +            *count = 0;
 +        } else if (po->flags & OPT_OFFSET && po->flags & OPT_STRING)
 +            av_freep(dst);
 +        po++;
 +    }
 +
 +    av_freep(&o->stream_maps);
 +    av_freep(&o->audio_channel_maps);
 +    av_freep(&o->meta_data_maps);
 +    av_freep(&o->streamid_map);
 +
 +    memset(o, 0, sizeof(*o));
 +
 +    if(is_input) o->recording_time = bak.recording_time;
 +    else         o->recording_time = INT64_MAX;
 +    o->mux_max_delay  = 0.7;
 +    o->limit_filesize = UINT64_MAX;
 +    o->chapters_input_file = INT_MAX;
 +
 +    uninit_opts();
 +    init_opts();
 +}
 +
  #if CONFIG_AVFILTER
  
  static int configure_video_filters(InputStream *ist, OutputStream *ost)
@@@ -548,28 -434,6 +550,29 @@@ static void sigterm_handler(int sig
  
  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
++    avformat_network_deinit();
 +
      signal(SIGINT , sigterm_handler); /* Interrupt (ANSI).  */
      signal(SIGTERM, sigterm_handler); /* Termination (ANSI).  */
  #ifdef SIGXCPU
@@@ -672,12 -493,12 +675,13 @@@ void exit_program(int ret
  #if CONFIG_AVFILTER
      avfilter_uninit();
  #endif
+     avformat_network_deinit();
  
 +    av_freep(&input_tmp);
 +
      if (received_sigterm) {
 -        fprintf(stderr,
 -            "Received signal %d: terminating.\n",
 -            (int) received_sigterm);
 +        av_log(NULL, AV_LOG_INFO, "Received signal %d: terminating.\n",
 +               (int) received_sigterm);
          exit (255);
      }
  
@@@ -867,9 -800,9 +871,9 @@@ need_realloc
                         ost->resample_channels    != dec->channels   ||
                         ost->resample_sample_rate != dec->sample_rate;
  
 -    if ((ost->audio_resample && !ost->resample) || resample_changed) {
 +    if ((ost->audio_resample && !ost->swr) || resample_changed || ost->audio_channels_mapped) {
          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",
++            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);
@@@ -1148,65 -1105,6 +1152,65 @@@ static void do_subtitle_out(AVFormatCon
  static int bit_buffer_size= 1024*256;
  static uint8_t *bit_buffer= NULL;
  
-                "Input stream #%d.%d frame changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s\n",
 +static void do_video_resample(OutputStream *ost,
 +                              InputStream *ist,
 +                              AVFrame *in_picture,
 +                              AVFrame **out_picture)
 +{
 +#if CONFIG_AVFILTER
 +    *out_picture = in_picture;
 +#else
 +    AVCodecContext *dec = ist->st->codec;
 +    AVCodecContext *enc = ost->st->codec;
 +    int resample_changed = ost->resample_width   != dec->width  ||
 +                           ost->resample_height  != dec->height ||
 +                           ost->resample_pix_fmt != dec->pix_fmt;
 +
 +    *out_picture = in_picture;
 +    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));
 +        ost->resample_width   = dec->width;
 +        ost->resample_height  = dec->height;
 +        ost->resample_pix_fmt = dec->pix_fmt;
 +    }
 +
 +    ost->video_resample = dec->width   != enc->width  ||
 +                          dec->height  != enc->height ||
 +                          dec->pix_fmt != enc->pix_fmt;
 +
 +    if (ost->video_resample) {
 +        *out_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)) {
 +                    av_log(NULL, AV_LOG_FATAL, "Cannot allocate temp picture, check pix fmt\n");
 +                    exit_program(1);
 +                }
 +            }
 +            /* initialize a new scaler context */
 +            sws_freeContext(ost->img_resample_ctx);
 +            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) {
 +                av_log(NULL, AV_LOG_FATAL, "Cannot get resampling context\n");
 +                exit_program(1);
 +            }
 +        }
 +        sws_scale(ost->img_resample_ctx, in_picture->data, in_picture->linesize,
 +              0, ost->resample_height, (*out_picture)->data, (*out_picture)->linesize);
 +    }
 +#endif
 +}
 +
 +
  static void do_video_out(AVFormatContext *s,
                           OutputStream *ost,
                           InputStream *ist,
@@@ -1845,146 -1640,121 +1849,147 @@@ static int output_packet(InputStream *i
          }
          /* 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;
 +        for (i = 0; i < nb_ostreams; i++) {
 +            OutputFile *of = &output_files[ost_table[i].file_index];
 +            int frame_size;
 +
 +            ost = &ost_table[i];
 +            if (ost->source_index != ist_index)
 +                continue;
 +
 +            if (of->start_time && ist->pts < of->start_time)
 +                continue;
 +
 +            if (of->recording_time != INT64_MAX &&
 +                av_compare_ts(ist->pts, AV_TIME_BASE_Q, of->recording_time + of->start_time,
 +                              (AVRational){1, 1000000}) >= 0) {
 +                ost->is_past_recording_time = 1;
 +                continue;
 +            }
  
 -                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) {
 -                    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)
 +            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) {
 +                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_buffersink_get_buffer_ref(ost->output_video_filter, &ost->picref, 0) < 0)
 +                        goto cont;
 +                    if (!filtered_frame && !(filtered_frame = avcodec_alloc_frame())) {
 +                        ret = AVERROR(ENOMEM);
 +                        goto fail;
 +                    }
 +                    *filtered_frame= *decoded_frame; //for me_threshold
 +                    if (ost->picref) {
 +                        avfilter_fill_frame_from_video_buffer_ref(filtered_frame, ost->picref);
                          ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q);
 +                    }
 +                }
 +#else
 +                filtered_frame = decoded_frame;
  #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:
 +                os = output_files[ost->file_index].ctx;
 +
 +                /* 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)
 -                                ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect;
 +                        if (ost->picref->video && !ost->frame_aspect_ratio)
 +                            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
 -                        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);
 +                        do_video_out(os, ost, ist, filtered_frame, &frame_size,
 +                                     same_quant ? 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 {
 +                    AVPicture pict;
 +                    AVPacket opkt;
 +                    int64_t ost_tb_start_time= av_rescale_q(of->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 ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) && !copy_initial_nonkeyframes)
++                    if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) &&
++                        !ost->copy_initial_nonkeyframes)
  #if !CONFIG_AVFILTER
 -                            continue;
 +                        continue;
  #else
 -                            goto cont;
 +                        goto cont;
  #endif
  
 -                        /* no reencoding needed : output the packet directly */
 -                        /* force the input stream PTS */
 +                    /* 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++;
 +                    }
  
 -                        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;
  
 -                        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 (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;
 +                    }
  
 -                        write_frame(os, &opkt, ost->st->codec, ost->bitstream_filters);
 -                        ost->st->codec->frame_number++;
 -                        ost->frame_number++;
 -                        av_free_packet(&opkt);
 +                    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;
                      }
 -#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]);
 -                    if (ost->picref)
 -                        avfilter_unref_buffer(ost->picref);
 -                }
 -#endif
 +                    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]);
 +                avfilter_unref_buffer(ost->picref);
              }
 +            av_freep(&filtered_frame);
 +#endif
 +        }
  
 +fail:
          av_free(buffer_to_free);
          /* XXX: allocate the subtitles in the codec ? */
          if (subtitle_to_free) {
@@@ -2014,43 -1858,84 +2019,43 @@@ static void print_sdp(OutputFile *outpu
      av_sdp_create(avc, n, sdp, sizeof(sdp));
      printf("SDP:\n%s\n", sdp);
      fflush(stdout);
 +    av_freep(&avc);
  }
  
 -static int copy_chapters(int infile, int outfile)
 +static int init_input_stream(int ist_index, OutputStream *output_streams, int nb_output_streams,
 +                             char *error, int error_len)
  {
 -    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;
 +    InputStream *ist = &input_streams[ist_index];
 +    if (ist->decoding_needed) {
 +        AVCodec *codec = ist->dec;
 +        if (!codec) {
-             snprintf(error, error_len, "Decoder (codec %s) not found for input stream #%d.%d",
++            snprintf(error, error_len, "Decoder (codec %s) not found for input stream #%d:%d",
 +                    avcodec_get_name(ist->st->codec->codec_id), ist->file_index, ist->st->index);
 +            return AVERROR(EINVAL);
 +        }
 +        if (avcodec_open2(ist->st->codec, codec, &ist->opts) < 0) {
-             snprintf(error, error_len, "Error while opening decoder for input stream #%d.%d",
++            snprintf(error, error_len, "Error while opening decoder for input stream #%d:%d",
 +                    ist->file_index, ist->st->index);
 +            return AVERROR(EINVAL);
 +        }
 +        assert_codec_experimental(ist->st->codec, 0);
 +        assert_avoptions(ist->opts);
      }
 -    return 0;
 -}
  
 -static void parse_forced_key_frames(char *kf, OutputStream *ost,
 -                                    AVCodecContext *avctx)
 -{
 -    char *p;
 -    int n = 1, i;
 -    int64_t t;
 +    ist->pts = ist->st->avg_frame_rate.num ? - ist->st->codec->has_b_frames*AV_TIME_BASE / av_q2d(ist->st->avg_frame_rate) : 0;
 +    ist->next_pts = AV_NOPTS_VALUE;
 +    ist->is_start = 1;
  
 -    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);
 -    }
 +    return 0;
  }
  
 -/*
 - * 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,
 -                     StreamMap *stream_maps, int nb_stream_maps)
 +static int transcode_init(OutputFile *output_files, int nb_output_files,
 +                          InputFile  *input_files,  int nb_input_files)
  {
 -    int ret = 0, i, j, k, n, nb_ostreams = 0;
 -    AVFormatContext *is, *os;
 +    int ret = 0, i, j, k;
 +    AVFormatContext *os;
      AVCodecContext *codec, *icodec;
 -    OutputStream *ost, **ost_table = NULL;
 +    OutputStream *ost;
      InputStream *ist;
      char error[1024];
      int want_sdp = 1;
              AVCodec *codec = ost->enc;
              AVCodecContext *dec = input_streams[ost->source_index].st->codec;
              if (!codec) {
-                 snprintf(error, sizeof(error), "Encoder (codec %s) not found for output stream #%d.%d",
 -                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);
++                snprintf(error, sizeof(error), "Encoder (codec %s) not found for output stream #%d:%d",
 +                         avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index);
                  ret = AVERROR(EINVAL);
                  goto dump_format;
              }
                  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",
++                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;
      }
  
      /* 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");
 +    av_log(NULL, AV_LOG_INFO, "Stream mapping:\n");
 +    for (i = 0; i < nb_output_streams; i++) {
 +        ost = &output_streams[i];
 +
 +        if (ost->attachment_filename) {
 +            /* an attached file */
 +            av_log(NULL, AV_LOG_INFO, "  File %s -> Stream #%d:%d\n",
 +                   ost->attachment_filename, ost->file_index, ost->index);
 +            continue;
          }
-         av_log(NULL, AV_LOG_INFO, "  Stream #%d.%d -> #%d.%d",
++        av_log(NULL, AV_LOG_INFO, "  Stream #%d:%d -> #%d:%d",
 +               input_streams[ost->source_index].file_index,
 +               input_streams[ost->source_index].st->index,
 +               ost->file_index,
 +               ost->index);
 +        if (ost->audio_channels_mapped) {
 +            av_log(NULL, AV_LOG_INFO, " [ch:");
 +            for (j = 0; j < ost->audio_channels_mapped; j++)
 +                if (ost->audio_channels_map[j] == -1)
 +                    av_log(NULL, AV_LOG_INFO, " M");
 +                else
 +                    av_log(NULL, AV_LOG_INFO, " %d", ost->audio_channels_map[j]);
 +            av_log(NULL, AV_LOG_INFO, "]");
 +        }
 +        if (ost->sync_ist != &input_streams[ost->source_index])
-             av_log(NULL, AV_LOG_INFO, " [sync #%d.%d]",
++            av_log(NULL, AV_LOG_INFO, " [sync #%d:%d]",
 +                   ost->sync_ist->file_index,
 +                   ost->sync_ist->st->index);
 +        if (ost->stream_copy)
 +            av_log(NULL, AV_LOG_INFO, " (copy)");
 +        else
 +            av_log(NULL, AV_LOG_INFO, " (%s -> %s)", input_streams[ost->source_index].dec ?
 +                   input_streams[ost->source_index].dec->name : "?",
 +                   ost->enc ? ost->enc->name : "?");
 +        av_log(NULL, AV_LOG_INFO, "\n");
      }
  
      if (ret) {
@@@ -2688,11 -2637,19 +2693,11 @@@ static int transcode(OutputFile *output
              }
          }
  
 -        /* finish if recording time exhausted */
 -        if (recording_time != INT64_MAX &&
 -            av_compare_ts(pkt.pts, ist->st->time_base, 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 (output_packet(ist, ist_index, output_streams, nb_output_streams, &pkt) < 0) {
  
-             av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d.%d\n",
 -            if (verbose >= 0)
 -                fprintf(stderr, "Error while decoding stream #%d.%d\n",
 -                        ist->file_index, ist->st->index);
++            av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n",
 +                   ist->file_index, ist->st->index);
              if (exit_on_error)
                  exit_program(1);
              av_free_packet(&pkt);
@@@ -3069,175 -3064,75 +3074,174 @@@ static int opt_recording_timestamp(Opti
      return 0;
  }
  
 -static int opt_input_ts_scale(const char *opt, const char *arg)
 +static AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder)
  {
 -    unsigned int stream;
 -    double scale;
 -    char *p;
 -
 -    stream = strtol(arg, &p, 0);
 -    if (*p)
 -        p++;
 -    scale= strtod(p, &p);
 +    const char *codec_string = encoder ? "encoder" : "decoder";
 +    AVCodec *codec;
  
 -    ts_scale = grow_array(ts_scale, sizeof(*ts_scale), &nb_ts_scale, stream + 1);
 -    ts_scale[stream] = scale;
 -    return 0;
 +    codec = encoder ?
 +        avcodec_find_encoder_by_name(name) :
 +        avcodec_find_decoder_by_name(name);
 +    if(!codec) {
 +        av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name);
 +        exit_program(1);
 +    }
 +    if(codec->type != type) {
 +        av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, name);
 +        exit_program(1);
 +    }
 +    return codec;
  }
  
 -static int opt_recording_time(const char *opt, const char *arg)
 +static AVCodec *choose_decoder(OptionsContext *o, AVFormatContext *s, AVStream *st)
  {
 -    recording_time = parse_time_or_die(opt, arg, 1);
 -    return 0;
 -}
 +    char *codec_name = NULL;
  
 -static int opt_start_time(const char *opt, const char *arg)
 -{
 -    start_time = parse_time_or_die(opt, arg, 1);
 -    return 0;
 +    MATCH_PER_STREAM_OPT(codec_names, str, codec_name, s, st);
 +    if (codec_name) {
 +        AVCodec *codec = find_codec_or_die(codec_name, st->codec->codec_type, 0);
 +        st->codec->codec_id = codec->id;
 +        return codec;
 +    } else
 +        return avcodec_find_decoder(st->codec->codec_id);
  }
  
 -static int opt_recording_timestamp(const char *opt, const char *arg)
 +/**
 + * Add all the streams from the given input file to the global
 + * list of input streams.
 + */
 +static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
  {
 -    char buf[128];
 -    int64_t recording_timestamp = parse_time_or_die(opt, arg, 0) / 1E6;
 -    struct tm time = *gmtime((time_t*)&recording_timestamp);
 -    strftime(buf, sizeof(buf), "creation_time=%FT%T%z", &time);
 -    opt_metadata("metadata", buf);
 +    int i, rfps, rfps_base;
 +    char *next, *codec_tag = NULL;
  
 -    av_log(NULL, AV_LOG_WARNING, "%s is deprecated, set the 'creation_time' metadata "
 -                                 "tag instead.\n", opt);
 -    return 0;
 +    for (i = 0; i < ic->nb_streams; i++) {
 +        AVStream *st = ic->streams[i];
 +        AVCodecContext *dec = st->codec;
 +        InputStream *ist;
-         double scale = 1.0;
 +
 +        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);
 +
-         MATCH_PER_STREAM_OPT(ts_scale, dbl, scale, ic, st);
-         ist->ts_scale = scale;
++        ist->ts_scale = 1.0;
++        MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st);
 +
 +        MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, ic, st);
 +        if (codec_tag) {
 +            uint32_t tag = strtol(codec_tag, &next, 0);
 +            if (*next)
 +                tag = AV_RL32(codec_tag);
 +            st->codec->codec_tag = tag;
 +        }
 +
 +        ist->dec = choose_decoder(o, ic, st);
 +
 +        switch (dec->codec_type) {
 +        case AVMEDIA_TYPE_AUDIO:
 +            if(!ist->dec)
 +                ist->dec = avcodec_find_decoder(dec->codec_id);
 +            if(o->audio_disable)
 +                st->discard= AVDISCARD_ALL;
 +            break;
 +        case AVMEDIA_TYPE_VIDEO:
 +            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;
 +            }
 +
 +            if (dec->time_base.den != rfps*dec->ticks_per_frame || dec->time_base.num != rfps_base) {
 +
 +                av_log(NULL, AV_LOG_INFO,"\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 (o->video_disable)
 +                st->discard= AVDISCARD_ALL;
 +            else if(video_discard)
 +                st->discard= video_discard;
 +            break;
 +        case AVMEDIA_TYPE_DATA:
 +            break;
 +        case AVMEDIA_TYPE_SUBTITLE:
 +            if(!ist->dec)
 +                ist->dec = avcodec_find_decoder(dec->codec_id);
 +            if(o->subtitle_disable)
 +                st->discard = AVDISCARD_ALL;
 +            break;
 +        case AVMEDIA_TYPE_ATTACHMENT:
 +        case AVMEDIA_TYPE_UNKNOWN:
 +            break;
 +        default:
 +            abort();
 +        }
 +    }
  }
  
 -static int opt_input_ts_offset(const char *opt, const char *arg)
 +static void assert_file_overwrite(const char *filename)
  {
 -    input_ts_offset = parse_time_or_die(opt, arg, 1);
 -    return 0;
 +    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);
 +                term_exit();
 +                if (!read_yesno()) {
 +                    av_log(0, AV_LOG_FATAL, "Not overwriting - exiting\n");
 +                    exit_program(1);
 +                }
 +                term_init();
 +            }
 +            else {
 +                av_log(0, AV_LOG_FATAL, "File '%s' already exists. Exiting.\n", filename);
 +                exit_program(1);
 +            }
 +        }
 +    }
  }
  
 -static enum CodecID find_codec_or_die(const char *name, int type, int encoder)
 +static void dump_attachment(AVStream *st, const char *filename)
  {
 -    const char *codec_string = encoder ? "encoder" : "decoder";
 -    AVCodec *codec;
 +    int ret;
 +    AVIOContext *out = NULL;
 +    AVDictionaryEntry *e;
  
 -    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);
 +    if (!st->codec->extradata_size) {
 +        av_log(NULL, AV_LOG_WARNING, "No extradata to dump in stream #%d:%d.\n",
 +               nb_input_files - 1, st->index);
 +        return;
 +    }
 +    if (!*filename && (e = av_dict_get(st->metadata, "filename", NULL, 0)))
 +        filename = e->value;
 +    if (!*filename) {
 +        av_log(NULL, AV_LOG_FATAL, "No filename specified and no 'filename' tag"
 +               "in stream #%d:%d.\n", nb_input_files - 1, st->index);
          exit_program(1);
      }
 -    if(codec->type != type) {
 -        fprintf(stderr, "Invalid %s type '%s'\n", codec_string, name);
 +
 +    assert_file_overwrite(filename);
 +
 +    if ((ret = avio_open (&out, filename, AVIO_FLAG_WRITE)) < 0) {
 +        av_log(NULL, AV_LOG_FATAL, "Could not open file %s for writing.\n",
 +               filename);
          exit_program(1);
      }
 -    return codec->id;
 +
 +    avio_write(out, st->codec->extradata, st->codec->extradata_size);
 +    avio_flush(out);
 +    avio_close(out);
  }
  
 -static int opt_input_file(const char *opt, const char *filename)
 +static int opt_input_file(OptionsContext *o, const char *opt, const char *filename)
  {
      AVFormatContext *ic;
      AVInputFormat *file_iformat = NULL;
      return 0;
  }
  
 -static void check_inputs(int *has_video_ptr,
 -                         int *has_audio_ptr,
 -                         int *has_subtitle_ptr,
 -                         int *has_data_ptr)
 +static void parse_forced_key_frames(char *kf, OutputStream *ost)
  {
 -    int has_video, has_audio, has_subtitle, has_data, i, j;
 -    AVFormatContext *ic;
 +    char *p;
 +    int n = 1, i;
 +
 +    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;
 +        ost->forced_kf_pts[i] = parse_time_or_die("force_key_frames", p, 1);
 +    }
 +}
  
 -    has_video = 0;
 -    has_audio = 0;
 -    has_subtitle = 0;
 -    has_data = 0;
 +static uint8_t *get_line(AVIOContext *s)
 +{
 +    AVIOContext *line;
 +    uint8_t *buf;
 +    char c;
  
 -    for(j=0;j<nb_input_files;j++) {
 -        ic = input_files[j].ctx;
 -        for(i=0;i<ic->nb_streams;i++) {
 -            AVCodecContext *enc = ic->streams[i]->codec;
 -            switch(enc->codec_type) {
 -            case AVMEDIA_TYPE_AUDIO:
 -                has_audio = 1;
 -                break;
 -            case AVMEDIA_TYPE_VIDEO:
 -                has_video = 1;
 -                break;
 -            case AVMEDIA_TYPE_SUBTITLE:
 -                has_subtitle = 1;
 -                break;
 -            case AVMEDIA_TYPE_DATA:
 -            case AVMEDIA_TYPE_ATTACHMENT:
 -            case AVMEDIA_TYPE_UNKNOWN:
 -                has_data = 1;
 -                break;
 -            default:
 -                abort();
 -            }
 +    if (avio_open_dyn_buf(&line) < 0) {
 +        av_log(NULL, AV_LOG_FATAL, "Could not alloc buffer for reading preset.\n");
 +        exit_program(1);
 +    }
 +
 +    while ((c = avio_r8(s)) && c != '\n')
 +        avio_w8(line, c);
 +    avio_w8(line, 0);
 +    avio_close_dyn_buf(line, &buf);
 +
 +    return buf;
 +}
 +
 +static int get_preset_file_2(const char *preset_name, const char *codec_name, AVIOContext **s)
 +{
 +    int i, ret = 1;
 +    char filename[1000];
 +    const char *base[3] = { getenv("AVCONV_DATADIR"),
 +                            getenv("HOME"),
 +                            AVCONV_DATADIR,
 +                            };
 +
 +    for (i = 0; i < FF_ARRAY_ELEMS(base) && ret; i++) {
 +        if (!base[i])
 +            continue;
 +        if (codec_name) {
 +            snprintf(filename, sizeof(filename), "%s%s/%s-%s.avpreset", base[i],
 +                     i != 1 ? "" : "/.avconv", codec_name, preset_name);
 +            ret = avio_open(s, filename, AVIO_FLAG_READ);
 +        }
 +        if (ret) {
 +            snprintf(filename, sizeof(filename), "%s%s/%s.avpreset", base[i],
 +                     i != 1 ? "" : "/.avconv", preset_name);
 +            ret = avio_open(s, filename, AVIO_FLAG_READ);
          }
      }
 -    *has_video_ptr = has_video;
 -    *has_audio_ptr = has_audio;
 -    *has_subtitle_ptr = has_subtitle;
 -    *has_data_ptr = has_data;
 +    return ret;
  }
  
 -static void new_video_stream(AVFormatContext *oc, int file_idx)
 +static void choose_encoder(OptionsContext *o, AVFormatContext *s, OutputStream *ost)
 +{
 +    char *codec_name = NULL;
 +
 +    MATCH_PER_STREAM_OPT(codec_names, str, codec_name, s, ost->st);
 +    if (!codec_name) {
 +        ost->st->codec->codec_id = av_guess_codec(s->oformat, NULL, s->filename,
 +                                                  NULL, ost->st->codec->codec_type);
 +        ost->enc = avcodec_find_encoder(ost->st->codec->codec_id);
 +    } else if (!strcmp(codec_name, "copy"))
 +        ost->stream_copy = 1;
 +    else {
 +        ost->enc = find_codec_or_die(codec_name, ost->st->codec->codec_type, 1);
 +        ost->st->codec->codec_id = ost->enc->id;
 +    }
 +}
 +
 +static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, enum AVMediaType type)
  {
 -    AVStream *st;
      OutputStream *ost;
 -    AVCodecContext *video_enc;
 -    enum CodecID codec_id = CODEC_ID_NONE;
 -    AVCodec *codec= NULL;
 +    AVStream *st = avformat_new_stream(oc, NULL);
 +    int idx      = oc->nb_streams - 1, ret = 0;
-     int64_t max_frames = INT64_MAX;
 +    char *bsf = NULL, *next, *codec_tag = NULL;
 +    AVBitStreamFilterContext *bsfc, *bsfc_prev = NULL;
 +    double qscale = -1;
 +    char *buf = NULL, *arg = NULL, *preset = NULL;
 +    AVIOContext *s = NULL;
  
 -    if(!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);
 -        }
 +    if (!st) {
 +        av_log(NULL, AV_LOG_FATAL, "Could not alloc stream.\n");
 +        exit_program(1);
      }
  
 -    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
 -        ost->avfilter= vfilters;
 -        vfilters = NULL;
 -#endif
 +    if (oc->nb_streams - 1 < o->nb_streamid_map)
 +        st->id = o->streamid_map[oc->nb_streams - 1];
 +
 +    output_streams = grow_array(output_streams, sizeof(*output_streams), &nb_output_streams,
 +                                nb_output_streams + 1);
 +    ost = &output_streams[nb_output_streams - 1];
 +    ost->file_index = nb_output_files;
 +    ost->index = idx;
 +    ost->st    = st;
 +    st->codec->codec_type = type;
 +    choose_encoder(o, oc, ost);
 +    if (ost->enc) {
 +        ost->opts  = filter_codec_opts(codec_opts, ost->enc->id, oc, st);
      }
  
 -    ost->bitstream_filters = video_bitstream_filters;
 -    video_bitstream_filters= NULL;
 +    avcodec_get_context_defaults3(st->codec, ost->enc);
 +    st->codec->codec_type = type; // XXX hack, avcodec_get_context_defaults2() sets type to unknown for stream copy
  
 -    st->codec->thread_count= thread_count;
 +    MATCH_PER_STREAM_OPT(presets, str, preset, oc, st);
 +    if (preset && (!(ret = get_preset_file_2(preset, ost->enc->name, &s)))) {
 +        do  {
 +            buf = get_line(s);
 +            if (!buf[0] || buf[0] == '#') {
 +                av_free(buf);
 +                continue;
 +            }
 +            if (!(arg = strchr(buf, '='))) {
 +                av_log(NULL, AV_LOG_FATAL, "Invalid line found in the preset file.\n");
 +                exit_program(1);
 +            }
 +            *arg++ = 0;
 +            av_dict_set(&ost->opts, buf, arg, AV_DICT_DONT_OVERWRITE);
 +            av_free(buf);
 +        } while (!s->eof_reached);
 +        avio_close(s);
 +    }
 +    if (ret) {
 +        av_log(NULL, AV_LOG_FATAL,
 +               "Preset %s specified for stream %d:%d, but could not be opened.\n",
 +               preset, ost->file_index, ost->index);
 +        exit_program(1);
 +    }
  
-     MATCH_PER_STREAM_OPT(max_frames, i64, max_frames, oc, st);
-     ost->max_frames = max_frames;
 -    video_enc = st->codec;
++    ost->max_frames = INT64_MAX;
++    MATCH_PER_STREAM_OPT(max_frames, i64, ost->max_frames, oc, st);
  
 -    if(video_codec_tag)
 -        video_enc->codec_tag= video_codec_tag;
 +    MATCH_PER_STREAM_OPT(bitstream_filters, str, bsf, oc, st);
 +    while (bsf) {
 +        if (next = strchr(bsf, ','))
 +            *next++ = 0;
 +        if (!(bsfc = av_bitstream_filter_init(bsf))) {
 +            av_log(NULL, AV_LOG_FATAL, "Unknown bitstream filter %s\n", bsf);
 +            exit_program(1);
 +        }
 +        if (bsfc_prev)
 +            bsfc_prev->next = bsfc;
 +        else
 +            ost->bitstream_filters = bsfc;
  
 -    if(oc->oformat->flags & AVFMT_GLOBALHEADER) {
 -        video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
 +        bsfc_prev = bsfc;
 +        bsf       = next;
      }
  
 -    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;
 +    MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, oc, st);
 +    if (codec_tag) {
 +        uint32_t tag = strtol(codec_tag, &next, 0);
 +        if (*next)
 +            tag = AV_RL32(codec_tag);
 +        st->codec->codec_tag = tag;
 +    }
 +
 +    MATCH_PER_STREAM_OPT(qscale, dbl, qscale, oc, st);
 +    if (qscale >= 0 || same_quant) {
 +        st->codec->flags |= CODEC_FLAG_QSCALE;
 +        st->codec->global_quality = FF_QP2LAMBDA * qscale;
 +    }
 +
 +    if (oc->oformat->flags & AVFMT_GLOBALHEADER)
 +        st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
 +
 +    av_opt_get_int(sws_opts, "sws_flags", 0, &ost->sws_flags);
 +    return ost;
 +}
 +
 +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) {
 +            av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
 +            exit_program(1);
 +        }
 +        p++;
 +    }
 +}
 +
 +static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
 +{
 +    AVStream *st;
 +    OutputStream *ost;
 +    AVCodecContext *video_enc;
 +
 +    ost = new_output_stream(o, oc, AVMEDIA_TYPE_VIDEO);
 +    st  = ost->st;
 +    video_enc = st->codec;
 +
 +    if (!ost->stream_copy) {
 +        const char *p = NULL;
 +        char *forced_key_frames = NULL, *frame_rate = NULL, *frame_size = NULL;
 +        char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL;
 +        char *intra_matrix = NULL, *inter_matrix = NULL, *filters = NULL;
-         int i, force_fps = 0, top_field_first = -1;
+         int i;
  
 -        if (frame_rate.num)
 -            ost->frame_rate = frame_rate;
 -        video_enc->codec_id = codec_id;
 +        MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st);
 +        if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) {
 +            av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate);
 +            exit_program(1);
 +        }
 +
 +        MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st);
 +        if (frame_size && av_parse_video_size(&video_enc->width, &video_enc->height, frame_size) < 0) {
 +            av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size);
 +            exit_program(1);
 +        }
 +
 +        MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st);
 +        if (frame_aspect_ratio)
 +            ost->frame_aspect_ratio = parse_frame_aspect_ratio(frame_aspect_ratio);
  
 -        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;
 +        MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st);
 +        if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == PIX_FMT_NONE) {
 +            av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt);
 +            exit_program(1);
 +        }
          st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
  
          if (intra_only)
              }
          }
  
 +        MATCH_PER_STREAM_OPT(forced_key_frames, str, forced_key_frames, oc, st);
          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);
 +            parse_forced_key_frames(forced_key_frames, ost);
 +
-         MATCH_PER_STREAM_OPT(force_fps, i, force_fps, oc, st);
-         ost->force_fps = force_fps;
++        MATCH_PER_STREAM_OPT(force_fps, i, ost->force_fps, oc, st);
++
++        ost->top_field_first = -1;
++        MATCH_PER_STREAM_OPT(top_field_first, i, ost->top_field_first, oc, st);
 +
-         MATCH_PER_STREAM_OPT(top_field_first, i, top_field_first, oc, st);
-         ost->top_field_first = top_field_first;
++        MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st);
 +
 +#if CONFIG_AVFILTER
 +        MATCH_PER_STREAM_OPT(filters, str, filters, oc, st);
 +        if (filters)
 +            ost->avfilter = av_strdup(filters);
 +#endif
      }
  
 -    /* 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 void new_audio_stream(AVFormatContext *oc, int file_idx)
 +static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc)
  {
 +    int n;
      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);
 +    ost = new_output_stream(o, oc, AVMEDIA_TYPE_AUDIO);
      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;
  
@@@ -3882,113 -3715,25 +3886,113 @@@ static void opt_output_file(void *optct
      if (!strcmp(filename, "-"))
          filename = "pipe:";
  
 -    oc = avformat_alloc_context();
 +    err = avformat_alloc_output_context2(&oc, NULL, o->format, filename);
      if (!oc) {
 -        print_error(filename, AVERROR(ENOMEM));
 +        print_error(filename, err);
          exit_program(1);
      }
 +    file_oformat= oc->oformat;
  
 -    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);
 +    if (!strcmp(file_oformat->name, "ffm") &&
 +        av_strstart(filename, "http:", NULL)) {
 +        int j;
 +        /* special case for files sent to ffserver: we get the stream
 +           parameters from ffserver */
 +        int err = read_ffserver_streams(o, oc, filename);
 +        if (err < 0) {
 +            print_error(filename, err);
              exit_program(1);
          }
 -        last_asked_format = NULL;
 +        for(j = nb_output_streams - oc->nb_streams; j < nb_output_streams; j++) {
 +            ost = &output_streams[j];
 +            for (i = 0; i < nb_input_streams; i++) {
 +                ist = &input_streams[i];
 +                if(ist->st->codec->codec_type == ost->st->codec->codec_type){
 +                    ost->sync_ist= ist;
 +                    ost->source_index= i;
 +                    ist->discard = 0;
 +                    break;
 +                }
 +            }
 +        }
 +    } else if (!o->nb_stream_maps) {
 +        /* pick the "best" stream of each type */
 +#define NEW_STREAM(type, index)\
 +        if (index >= 0) {\
 +            ost = new_ ## type ## _stream(o, oc);\
 +            ost->source_index = index;\
 +            ost->sync_ist     = &input_streams[index];\
 +            input_streams[index].discard = 0;\
 +        }
 +
 +        /* video: highest resolution */
 +        if (!o->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 (!o->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 (!o->subtitle_disable && (oc->oformat->subtitle_codec != CODEC_ID_NONE || subtitle_codec_name)) {
 +            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 {
 -        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);
 +        for (i = 0; i < o->nb_stream_maps; i++) {
 +            StreamMap *map = &o->stream_maps[i];
 +
 +            if (map->disabled)
 +                continue;
 +
 +            ist = &input_streams[input_files[map->file_index].ist_index + map->stream_index];
 +            if(o->subtitle_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE)
 +                continue;
 +            if(o->   audio_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
 +                continue;
 +            if(o->   video_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
 +                continue;
 +
 +            switch (ist->st->codec->codec_type) {
 +            case AVMEDIA_TYPE_VIDEO:    ost = new_video_stream(o, oc);    break;
 +            case AVMEDIA_TYPE_AUDIO:    ost = new_audio_stream(o, oc);    break;
 +            case AVMEDIA_TYPE_SUBTITLE: ost = new_subtitle_stream(o, oc); break;
 +            case AVMEDIA_TYPE_DATA:     ost = new_data_stream(o, oc);     break;
 +            case AVMEDIA_TYPE_ATTACHMENT: ost = new_attachment_stream(o, oc); break;
 +            default:
-                 av_log(NULL, AV_LOG_FATAL, "Cannot map stream #%d.%d - unsupported type.\n",
++                av_log(NULL, AV_LOG_FATAL, "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;
          }
      }
  
@@@ -4579,27 -4259,17 +4583,27 @@@ static const OptionDef options[] = 
      { "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" },
++    { "copyinkf", OPT_BOOL | OPT_EXPERT | OPT_SPEC, {.off = OFFSET(copy_initial_nonkeyframes)}, "copy initial non-keyframes" },
 +    { "frames", OPT_INT64 | HAS_ARG | OPT_SPEC, {.off = OFFSET(max_frames)}, "set the number of frames to record", "number" },
 +    { "tag",   OPT_STRING | HAS_ARG | OPT_SPEC, {.off = OFFSET(codec_tags)}, "force codec tag/fourcc", "fourcc/tag" },
 +    { "q", HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC, {.off = OFFSET(qscale)}, "use fixed quality scale (VBR)", "q" },
 +    { "qscale", HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC, {.off = OFFSET(qscale)}, "use fixed quality scale (VBR)", "q" },
 +#if CONFIG_AVFILTER
 +    { "filter", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(filters)}, "set stream filterchain", "filter_list" },
 +#endif
 +    { "stats", OPT_BOOL, {&print_stats}, "print progress report during encoding", },
 +    { "attach", HAS_ARG | OPT_FUNC2, {(void*)opt_attach}, "add an attachment to the output file", "filename" },
 +    { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(dump_attachment)}, "extract an attachment into a file", "filename" },
  
      /* 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" },
 -    { "croptop", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" },
 +    { "vframes", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_frames}, "set the number of video frames to record", "number" },
 +    { "r", HAS_ARG | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(frame_rates)}, "set frame rate (Hz value, fraction or abbreviation)", "rate" },
 +    { "s", HAS_ARG | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(frame_sizes)}, "set frame size (WxH or abbreviation)", "size" },
 +    { "aspect", HAS_ARG | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(frame_aspect_ratios)}, "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" },
 +    { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(frame_pix_fmts)}, "set pixel format", "format" },
 +    { "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" },
@@@ -4702,11 -4368,11 +4706,12 @@@ int main(int argc, char **argv
      avfilter_register_all();
  #endif
      av_register_all();
+     avformat_network_init();
  
 -    avio_set_interrupt_cb(decode_interrupt_cb);
 -
 -    init_opts();
 +#if HAVE_ISATTY
 +    if(isatty(STDIN_FILENO))
 +        avio_set_interrupt_cb(decode_interrupt_cb);
 +#endif
  
      show_banner();
  
diff --cc ffplay.c
index ebcb8c0,0000000..1d14c08
mode 100644,000000..100644
--- /dev/null
+++ b/ffplay.c
@@@ -1,3206 -1,0 +1,3208 @@@
 +/*
 + * 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"
 +#include "libswresample/swresample.h"
 +
 +#if CONFIG_AVFILTER
 +# include "libavfilter/avcodec.h"
 +# include "libavfilter/avfilter.h"
 +# include "libavfilter/avfiltergraph.h"
 +# include "libavfilter/buffersink.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
 +
 +/* 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 duration;                             ///<expected duration of the frame
 +    int64_t pos;                                 ///<byte position in file
 +    int skip;
 +    SDL_Overlay *bmp;
 +    int width, height; /* source height & width */
 +    int allocated;
 +    int reallocate;
 +    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, resampling and format conversion */
 +    DECLARE_ALIGNED(16,uint8_t,audio_buf1)[AVCODEC_MAX_AUDIO_FRAME_SIZE * 4];
 +    DECLARE_ALIGNED(16,uint8_t,audio_buf2)[AVCODEC_MAX_AUDIO_FRAME_SIZE * 4];
 +    uint8_t *audio_buf;
 +    unsigned int audio_buf_size; /* in bytes */
 +    int audio_buf_index; /* in bytes */
 +    int audio_write_buf_size;
 +    AVPacket audio_pkt_temp;
 +    AVPacket audio_pkt;
 +    enum AVSampleFormat audio_src_fmt;
 +    enum AVSampleFormat audio_tgt_fmt;
 +    int audio_src_channels;
 +    int audio_tgt_channels;
 +    int64_t audio_src_channel_layout;
 +    int64_t audio_tgt_channel_layout;
 +    int audio_src_freq;
 +    int audio_tgt_freq;
 +    struct SwrContext *swr_ctx;
 +    double audio_current_pts;
 +    double audio_current_pts_drift;
 +    int frame_drops_early;
 +    int frame_drops_late;
 +
 +    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_duration;
 +    double frame_last_dropped_pts;
 +    double frame_last_returned_time;
 +    double frame_last_filter_delay;
 +    int64_t frame_last_dropped_pos;
 +    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;
 +    int step;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterContext *out_video_filter;          ///<the last filter in the video chain
 +#endif
 +
 +    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 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 const char *audio_codec_name;
 +static const char *subtitle_codec_name;
 +static const char *video_codec_name;
 +
 +static int rdftspeed=20;
 +#if CONFIG_AVFILTER
 +static char *vfilters = NULL;
 +#endif
 +
 +/* current context */
 +static int is_full_screen;
 +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;
 +
 +void exit_program(int ret)
 +{
 +    exit(ret);
 +}
 +
 +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);
 +    }
 +}
 +
 +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_tgt_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 = s->audio_write_buf_size;
 +        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_tgt_freq) / 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(VideoState *is)
 +{
 +    if (is) {
 +        stream_close(is);
 +    }
 +    av_lockmgr_register(NULL);
 +    uninit_opts();
 +#if CONFIG_AVFILTER
 +    avfilter_uninit();
 +#endif
++    avformat_network_deinit();
 +    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;
 +    screen = SDL_SetVideoMode(w, h, 0, flags);
 +    if (!screen) {
 +        fprintf(stderr, "SDL: could not set video mode - exiting\n");
 +        do_exit(is);
 +    }
 +    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(is);
 +    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)
 +{
 +    if (is->paused) {
 +        return is->audio_current_pts;
 +    } else {
 +        return is->audio_current_pts_drift + av_gettime() / 1000000.0;
 +    }
 +}
 +
 +/* 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_delay(double delay, VideoState *is)
 +{
 +    double sync_threshold, diff;
 +
 +    /* 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;
 +        }
 +    }
 +
 +    av_dlog(NULL, "video: delay=%0.3f A-V=%f\n",
 +            delay, -diff);
 +
 +    return delay;
 +}
 +
 +static void pictq_next_picture(VideoState *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);
 +}
 +
 +static void update_video_pts(VideoState *is, double pts, int64_t pos) {
 +    double time = av_gettime() / 1000000.0;
 +    /* update current video pts */
 +    is->video_current_pts = pts;
 +    is->video_current_pts_drift = is->video_current_pts - time;
 +    is->video_current_pos = pos;
 +    is->frame_last_pts = pts;
 +}
 +
 +/* called to display each frame */
 +static void video_refresh(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +    double time;
 +
 +    SubPicture *sp, *sp2;
 +
 +    if (is->video_st) {
 +retry:
 +        if (is->pictq_size == 0) {
 +            SDL_LockMutex(is->pictq_mutex);
 +            if (is->frame_last_dropped_pts != AV_NOPTS_VALUE && is->frame_last_dropped_pts > is->frame_last_pts) {
 +                update_video_pts(is, is->frame_last_dropped_pts, is->frame_last_dropped_pos);
 +                is->frame_last_dropped_pts = AV_NOPTS_VALUE;
 +            }
 +            SDL_UnlockMutex(is->pictq_mutex);
 +            //nothing to do, no picture to display in the que
 +        } else {
 +            double last_duration, duration, delay;
 +            /* dequeue the picture */
 +            vp = &is->pictq[is->pictq_rindex];
 +
 +            if (vp->skip) {
 +                pictq_next_picture(is);
 +                goto retry;
 +            }
 +
 +            /* compute nominal last_duration */
 +            last_duration = vp->pts - is->frame_last_pts;
 +            if (last_duration > 0 && last_duration < 10.0) {
 +                /* if duration of the last frame was sane, update last_duration in video state */
 +                is->frame_last_duration = last_duration;
 +            }
 +            delay = compute_target_delay(is->frame_last_duration, is);
 +
 +            time= av_gettime()/1000000.0;
 +            if(time < is->frame_timer + delay)
 +                return;
 +
 +            if (delay > 0)
 +                is->frame_timer += delay * FFMAX(1, floor((time-is->frame_timer) / delay));
 +
 +            SDL_LockMutex(is->pictq_mutex);
 +            update_video_pts(is, vp->pts, vp->pos);
 +            SDL_UnlockMutex(is->pictq_mutex);
 +
 +            if(is->pictq_size > 1) {
 +                 VideoPicture *nextvp= &is->pictq[(is->pictq_rindex+1)%VIDEO_PICTURE_QUEUE_SIZE];
 +                 duration = nextvp->pts - vp->pts; // More accurate this way, 1/time_base is often not reflecting FPS
 +            } else {
 +                 duration = vp->duration;
 +            }
 +
 +            if((framedrop>0 || (framedrop && is->audio_st)) && time > is->frame_timer + duration){
 +                if(is->pictq_size > 1){
 +                    is->frame_drops_late++;
 +                    pictq_next_picture(is);
 +                    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);
 +
 +            pictq_next_picture(is);
 +        }
 +    } 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 fd=%4d aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64"   \r",
 +                   get_master_clock(is),
 +                   av_diff,
 +                   is->frame_drops_early + is->frame_drops_late,
 +                   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(is);
 +    }
 +
 +    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);
 +
 +    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 || vp->reallocate ||
 +#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;
 +        vp->reallocate = 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);
 +        }
 +        /* if the queue is aborted, we have to pop the pending ALLOC event or wait for the allocation to complete */
 +        if (is->videoq.abort_request && SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_EVENTMASK(FF_ALLOC_EVENT)) != 1) {
 +            while (!vp->allocated) {
 +                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;
 +        vp->skip = 0;
 +
 +        /* now we can update the picture count */
 +        if (++is->pictq_windex == VIDEO_PICTURE_QUEUE_SIZE)
 +            is->pictq_windex = 0;
 +        SDL_LockMutex(is->pictq_mutex);
 +        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].skip = 1;
 +        }
 +        while (is->pictq_size && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        is->video_current_pos = -1;
 +        is->frame_last_pts = AV_NOPTS_VALUE;
 +        is->frame_last_duration = 0;
 +        is->frame_timer = (double)av_gettime() / 1000000.0;
 +        is->frame_last_dropped_pts = AV_NOPTS_VALUE;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        return 0;
 +    }
 +
 +    avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt);
 +
 +    if (got_picture) {
 +        int ret = 1;
 +
 +        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;
 +        }
 +
 +        if (((is->av_sync_type == AV_SYNC_AUDIO_MASTER && is->audio_st) || is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK) &&
 +             (framedrop>0 || (framedrop && is->audio_st))) {
 +            SDL_LockMutex(is->pictq_mutex);
 +            if (is->frame_last_pts != AV_NOPTS_VALUE && *pts) {
 +                double clockdiff = get_video_clock(is) - get_master_clock(is);
 +                double dpts = av_q2d(is->video_st->time_base) * *pts;
 +                double ptsdiff = dpts - is->frame_last_pts;
 +                if (fabs(clockdiff) < AV_NOSYNC_THRESHOLD &&
 +                     ptsdiff > 0 && ptsdiff < AV_NOSYNC_THRESHOLD &&
 +                     clockdiff + ptsdiff - is->frame_last_filter_delay < 0) {
 +                    is->frame_last_dropped_pos = pkt->pos;
 +                    is->frame_last_dropped_pts = dpts;
 +                    is->frame_drops_early++;
 +                    ret = 0;
 +                }
 +            }
 +            SDL_UnlockMutex(is->pictq_mutex);
 +        }
 +
 +        if (ret)
 +            is->frame_last_returned_time = av_gettime() / 1000000.0;
 +
 +        return ret;
 +    }
 +    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;
 +    AVStream *s = priv->is->video_st;
 +
 +    link->w = s->codec->width;
 +    link->h = s->codec->height;
 +    link->sample_aspect_ratio = s->sample_aspect_ratio.num ?
 +        s->sample_aspect_ratio : s->codec->sample_aspect_ratio;
 +    link->time_base = s->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 };
 +    AVBufferSinkParams *buffersink_params = av_buffersink_params_alloc();
 +    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 FF_API_OLD_VSINK_API
 +    ret = avfilter_graph_create_filter(&filt_out, avfilter_get_by_name("buffersink"), "out",
 +                                       NULL, pix_fmts, graph);
 +#else
 +    buffersink_params->pixel_fmts = pix_fmts;
 +    ret = avfilter_graph_create_filter(&filt_out, avfilter_get_by_name("buffersink"), "out",
 +                                       NULL, buffersink_params, graph);
 +#endif
 +    av_freep(&buffersink_params);
 +    if (ret < 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;
 +    } 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;
 +    int last_w = is->video_st->codec->width;
 +    int last_h = is->video_st->codec->height;
 +
 +    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
 +        if (   last_w != is->video_st->codec->width
 +            || last_h != is->video_st->codec->height) {
 +            av_log(NULL, AV_LOG_INFO, "Frame changed from size:%dx%d to size:%dx%d\n",
 +                   last_w, last_h, is->video_st->codec->width, is->video_st->codec->height);
 +            avfilter_graph_free(&graph);
 +            graph = avfilter_graph_alloc();
 +            if ((ret = configure_video_filters(graph, is, vfilters)) < 0)
 +                goto the_end;
 +            filt_out = is->out_video_filter;
 +            last_w = is->video_st->codec->width;
 +            last_h = is->video_st->codec->height;
 +        }
 +        ret = av_buffersink_get_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;
 +
 +        is->frame_last_filter_delay = av_gettime() / 1000000.0 - is->frame_last_returned_time;
 +        if (fabs(is->frame_last_filter_delay) > AV_NOSYNC_THRESHOLD / 10.0)
 +            is->frame_last_filter_delay = 0;
 +
 +#if CONFIG_AVFILTER
 +        if (!picref)
 +            continue;
 +#endif
 +
 +        pts = pts_int*av_q2d(is->video_st->time_base);
 +
 +        ret = queue_picture(is, frame, pts, pos);
 +
 +        if (ret < 0)
 +            goto the_end;
 +
 +        if (is->step)
 +            stream_toggle_pause(is);
 +    }
 + 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 = av_get_bytes_per_sample(is->audio_tgt_fmt) * is->audio_tgt_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_tgt_freq) * 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 > FFMIN3(max_size, sizeof(is->audio_buf1), sizeof(is->audio_buf2)))
 +                        wanted_size = FFMIN3(max_size, sizeof(is->audio_buf1), sizeof(is->audio_buf2));
 +
 +                    /* 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;
 +                    }
 +                }
 +                av_dlog(NULL, "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);
 +            }
 +        } 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 len1, len2, data_size, resampled_data_size;
 +    int64_t dec_channel_layout;
 +    double pts;
 +    int new_packet = 0;
 +    int flush_complete = 0;
 +
 +    for(;;) {
 +        /* NOTE: the audio packet can contain several frames */
 +        while (pkt_temp->size > 0 || (!pkt_temp->data && new_packet)) {
 +            if (flush_complete)
 +                break;
 +            new_packet = 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) {
 +                /* stop sending empty packets if the decoder is finished */
 +                if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY)
 +                    flush_complete = 1;
 +                continue;
 +            }
 +
 +            dec_channel_layout = (dec->channel_layout && dec->channels == av_get_channel_layout_nb_channels(dec->channel_layout)) ? dec->channel_layout : av_get_default_channel_layout(dec->channels);
 +
 +            if (dec->sample_fmt != is->audio_src_fmt || dec_channel_layout != is->audio_src_channel_layout || dec->sample_rate != is->audio_src_freq) {
 +                if (is->swr_ctx)
 +                    swr_free(&is->swr_ctx);
 +                is->swr_ctx = swr_alloc2(NULL, is->audio_tgt_channel_layout, is->audio_tgt_fmt, is->audio_tgt_freq,
 +                                               dec_channel_layout,          dec->sample_fmt,   dec->sample_rate,
 +                                               NULL, 0, NULL);
 +                if (!is->swr_ctx || swr_init(is->swr_ctx) < 0) {
 +                    fprintf(stderr, "Cannot create sample rate converter for conversion of %d Hz %s %d channels to %d Hz %s %d channels!\n",
 +                        dec->sample_rate,
 +                        av_get_sample_fmt_name(dec->sample_fmt),
 +                        dec->channels,
 +                        is->audio_tgt_freq,
 +                        av_get_sample_fmt_name(is->audio_tgt_fmt),
 +                        is->audio_tgt_channels);
 +                    break;
 +                }
 +                is->audio_src_channel_layout = dec_channel_layout;
 +                is->audio_src_channels = dec->channels;
 +                is->audio_src_freq = dec->sample_rate;
 +                is->audio_src_fmt = dec->sample_fmt;
 +            }
 +
 +            resampled_data_size = data_size;
 +            if (is->swr_ctx) {
 +                const uint8_t *in[] = {is->audio_buf1};
 +                uint8_t *out[] = {is->audio_buf2};
 +                len2 = swr_convert(is->swr_ctx, out, sizeof(is->audio_buf2) / is->audio_tgt_channels / av_get_bytes_per_sample(is->audio_tgt_fmt),
 +                                                in, data_size / dec->channels / av_get_bytes_per_sample(dec->sample_fmt));
 +                if (len2 < 0) {
 +                    fprintf(stderr, "audio_resample() failed\n");
 +                    break;
 +                }
 +                if (len2 == sizeof(is->audio_buf2) / is->audio_tgt_channels / av_get_bytes_per_sample(is->audio_tgt_fmt)) {
 +                    fprintf(stderr, "warning: audio buffer is probably too small\n");
 +                    swr_init(is->swr_ctx);
 +                }
 +                is->audio_buf = is->audio_buf2;
 +                resampled_data_size = len2 * is->audio_tgt_channels * av_get_bytes_per_sample(is->audio_tgt_fmt);
 +            } else {
 +                is->audio_buf= is->audio_buf1;
 +            }
 +
 +            /* if no pts, then compute it */
 +            pts = is->audio_clock;
 +            *pts_ptr = pts;
 +            is->audio_clock += (double)data_size / (dec->channels * dec->sample_rate * av_get_bytes_per_sample(dec->sample_fmt));
 +#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 resampled_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 ((new_packet = packet_queue_get(&is->audioq, pkt, 1)) < 0)
 +            return -1;
 +
 +        if (pkt->data == flush_pkt.data)
 +            avcodec_flush_buffers(dec);
 +
 +        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;
 +    int bytes_per_sec;
 +    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 = 256 * is->audio_tgt_channels * av_get_bytes_per_sample(is->audio_tgt_fmt);
 +               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;
 +    }
 +    bytes_per_sec = is->audio_tgt_freq * is->audio_tgt_channels * av_get_bytes_per_sample(is->audio_tgt_fmt);
 +    is->audio_write_buf_size = is->audio_buf_size - is->audio_buf_index;
 +    /* Let's assume the audio driver that is used by SDL has two periods. */
 +    is->audio_current_pts = is->audio_clock - (double)(2 * is->audio_hw_buf_size + is->audio_write_buf_size) / bytes_per_sec;
 +    is->audio_current_pts_drift = is->audio_current_pts - audio_callback_time / 1000000.0;
 +}
 +
 +/* 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;
 +    int64_t wanted_channel_layout = 0;
 +
 +    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]);
 +
 +    codec = avcodec_find_decoder(avctx->codec_id);
 +    switch(avctx->codec_type){
 +        case AVMEDIA_TYPE_AUDIO   : if(audio_codec_name   ) codec= avcodec_find_decoder_by_name(   audio_codec_name); break;
 +        case AVMEDIA_TYPE_SUBTITLE: if(subtitle_codec_name) codec= avcodec_find_decoder_by_name(subtitle_codec_name); break;
 +        case AVMEDIA_TYPE_VIDEO   : if(video_codec_name   ) codec= avcodec_find_decoder_by_name(   video_codec_name); break;
 +    }
 +    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;
 +
 +    if(codec->capabilities & CODEC_CAP_DR1)
 +        avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        wanted_channel_layout = (avctx->channel_layout && avctx->channels == av_get_channel_layout_nb_channels(avctx->channels)) ? avctx->channel_layout : av_get_default_channel_layout(avctx->channels);
 +        wanted_channel_layout &= ~AV_CH_LAYOUT_STEREO_DOWNMIX;
 +        wanted_spec.channels = av_get_channel_layout_nb_channels(wanted_channel_layout);
 +        wanted_spec.freq = avctx->sample_rate;
 +        if (wanted_spec.freq <= 0 || wanted_spec.channels <= 0) {
 +            fprintf(stderr, "Invalid sample rate or channel count!\n");
 +            return -1;
 +        }
 +    }
 +
 +    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) {
 +        wanted_spec.format = AUDIO_S16SYS;
 +        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;
 +        if (spec.format != AUDIO_S16SYS) {
 +            fprintf(stderr, "SDL advised audio format %d is not supported!\n", spec.format);
 +            return -1;
 +        }
 +        if (spec.channels != wanted_spec.channels) {
 +            wanted_channel_layout = av_get_default_channel_layout(spec.channels);
 +            if (!wanted_channel_layout) {
 +                fprintf(stderr, "SDL advised channel count %d is not supported!\n", spec.channels);
 +                return -1;
 +            }
 +        }
 +        is->audio_src_fmt = is->audio_tgt_fmt = AV_SAMPLE_FMT_S16;
 +        is->audio_src_freq = is->audio_tgt_freq = spec.freq;
 +        is->audio_src_channel_layout = is->audio_tgt_channel_layout = wanted_channel_layout;
 +        is->audio_src_channels = is->audio_tgt_channels = spec.channels;
 +    }
 +
 +    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 / wanted_spec.freq;
 +
 +        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->swr_ctx)
 +            swr_free(&is->swr_ctx);
 +        av_free_packet(&is->audio_pkt);
 +
 +        if (is->rdft) {
 +            av_rdft_end(is->rdft);
 +            av_freep(&is->rdft_data);
 +        }
 +        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;
 +
 +    av_dict_set(&codec_opts, "request_channels", "2", 0);
 +
 +    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 || CONFIG_MMSH_PROTOCOL
 +        if (is->paused &&
 +                (!strcmp(ic->iformat->name, "rtsp") ||
 +                 (ic->pb && !strncmp(input_filename, "mmsh:", 5)))) {
 +            /* 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);
 +            }
 +            if (is->audio_stream >= 0 &&
 +                is->audio_st->codec->codec->capabilities & CODEC_CAP_DELAY) {
 +                av_init_packet(pkt);
 +                pkt->data = NULL;
 +                pkt->size = 0;
 +                pkt->stream_index = is->audio_stream;
 +                packet_queue_put(&is->audioq, pkt);
 +            }
 +            SDL_Delay(10);
 +            if(is->audioq.size + is->videoq.size + is->subtitleq.size ==0){
 +                if(loop!=1 && (!loop || --loop)){
 +                    stream_seek(is, 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(VideoState *is)
 +{
 +    is_full_screen = !is_full_screen;
 +#if defined(__APPLE__) && SDL_VERSION_ATLEAST(1, 2, 14)
 +    /* OSX needs to reallocate the SDL overlays */
 +    for (int i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +        is->pictq[i].reallocate = 1;
 +    }
 +#endif
 +    video_open(is);
 +}
 +
 +static void toggle_pause(VideoState *is)
 +{
 +    stream_toggle_pause(is);
 +    is->step = 0;
 +}
 +
 +static void step_to_next_frame(VideoState *is)
 +{
 +    /* if the stream is paused unpause it, then step */
 +    if (is->paused)
 +        stream_toggle_pause(is);
 +    is->step = 1;
 +}
 +
 +static void toggle_audio_display(VideoState *is)
 +{
 +    int bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +    is->show_mode = (is->show_mode + 1) % SHOW_MODE_NB;
 +    fill_rectangle(screen,
 +                is->xleft, is->ytop, is->width, is->height,
 +                bgcolor);
 +    SDL_UpdateRect(screen, is->xleft, is->ytop, is->width, is->height);
 +}
 +
 +/* handle an event sent by the GUI */
 +static void event_loop(VideoState *cur_stream)
 +{
 +    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(cur_stream);
 +                break;
 +            }
 +            switch(event.key.keysym.sym) {
 +            case SDLK_ESCAPE:
 +            case SDLK_q:
 +                do_exit(cur_stream);
 +                break;
 +            case SDLK_f:
 +                toggle_full_screen(cur_stream);
 +                break;
 +            case SDLK_p:
 +            case SDLK_SPACE:
 +                toggle_pause(cur_stream);
 +                break;
 +            case SDLK_s: //S: Step to next frame
 +                step_to_next_frame(cur_stream);
 +                break;
 +            case SDLK_a:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_AUDIO);
 +                break;
 +            case SDLK_v:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_VIDEO);
 +                break;
 +            case SDLK_t:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_SUBTITLE);
 +                break;
 +            case SDLK_w:
 +                toggle_audio_display(cur_stream);
 +                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 (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(cur_stream);
 +                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(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:
 +            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(cur_stream);
 +            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_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 void opt_input_file(void *optctx, const char *filename)
 +{
 +    if (input_filename) {
 +        fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
 +                filename, input_filename);
 +        exit_program(1);
 +    }
 +    if (!strcmp(filename, "-"))
 +        filename = "pipe:";
 +    input_filename = filename;
 +}
 +
 +static int opt_codec(void *o, const char *opt, const char *arg)
 +{
 +    switch(opt[strlen(opt)-1]){
 +    case 'a' :    audio_codec_name = arg; break;
 +    case 's' : subtitle_codec_name = arg; break;
 +    case 'v' :    video_codec_name = arg; break;
 +    }
 +    return 0;
 +}
 +
 +static int dummy;
 +
 +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" },
 +    { "ss", HAS_ARG, {(void*)&opt_seek}, "seek to a given position in seconds", "pos" },
 +    { "t", HAS_ARG, {(void*)&opt_duration}, "play  \"duration\" seconds of audio/video", "duration" },
 +    { "bytes", OPT_INT | HAS_ARG, {(void*)&seek_by_bytes}, "seek by bytes 0=off 1=on -1=auto", "val" },
 +    { "nodisp", OPT_BOOL, {(void*)&display_disable}, "disable graphical display" },
 +    { "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },
 +    { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_frame_pix_fmt}, "set pixel format", "format" },
 +    { "stats", OPT_BOOL | OPT_EXPERT, {(void*)&show_status}, "show status", "" },
 +    { "bug", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&workaround_bugs}, "workaround bugs", "" },
 +    { "fast", OPT_BOOL | OPT_EXPERT, {(void*)&fast}, "non spec compliant optimizations", "" },
 +    { "genpts", OPT_BOOL | OPT_EXPERT, {(void*)&genpts}, "generate pts", "" },
 +    { "drp", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&decoder_reorder_pts}, "let decoder reorder pts 0=off 1=on -1=auto", ""},
 +    { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&lowres}, "", "" },
 +    { "skiploop", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_loop_filter}, "", "" },
 +    { "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_frame}, "", "" },
 +    { "skipidct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_idct}, "", "" },
 +    { "idct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&idct}, "set idct algo",  "algo" },
 +    { "er", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_recognition}, "set error detection threshold (0-4)",  "threshold" },
 +    { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options",  "bit_mask" },
 +    { "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
 +    { "autoexit", OPT_BOOL | OPT_EXPERT, {(void*)&autoexit}, "exit at the end", "" },
 +    { "exitonkeydown", OPT_BOOL | OPT_EXPERT, {(void*)&exit_on_keydown}, "exit on key down", "" },
 +    { "exitonmousedown", OPT_BOOL | OPT_EXPERT, {(void*)&exit_on_mousedown}, "exit on mouse down", "" },
 +    { "loop", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&loop}, "set number of times the playback shall be looped", "loop count" },
 +    { "framedrop", OPT_BOOL | OPT_EXPERT, {(void*)&framedrop}, "drop frames when cpu is too slow", "" },
 +    { "window_title", OPT_STRING | HAS_ARG, {(void*)&window_title}, "set window title", "window title" },
 +#if CONFIG_AVFILTER
 +    { "vf", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" },
 +#endif
 +    { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, {(void*)&rdftspeed}, "rdft speed", "msecs" },
 +    { "showmode", HAS_ARG, {(void*)opt_show_mode}, "select show mode (0 = video, 1 = waves, 2 = RDFT)", "mode" },
 +    { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
 +    { "i", OPT_BOOL, {(void *)&dummy}, "read specified file", "input_file"},
 +    { "codec", HAS_ARG | OPT_FUNC2, {(void*)opt_codec}, "force decoder", "decoder" },
 +    { NULL, },
 +};
 +
 +static void show_usage(void)
 +{
 +    printf("Simple media player\n");
 +    printf("usage: %s [options] input_file\n", program_name);
 +    printf("\n");
 +}
 +
 +static int opt_help(const char *opt, const char *arg)
 +{
 +    av_log_set_callback(log_callback_help);
 +    show_usage();
 +    show_help_options(options, "Main options:\n",
 +                      OPT_EXPERT, 0);
 +    show_help_options(options, "\nAdvanced options:\n",
 +                      OPT_EXPERT, OPT_EXPERT);
 +    printf("\n");
 +    show_help_children(avcodec_get_class(), AV_OPT_FLAG_DECODING_PARAM);
 +    show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);
 +#if !CONFIG_AVFILTER
 +    show_help_children(sws_get_class(), AV_OPT_FLAG_ENCODING_PARAM);
 +#endif
 +    printf("\nWhile playing:\n"
 +           "q, ESC              quit\n"
 +           "f                   toggle full screen\n"
 +           "p, SPC              pause\n"
 +           "a                   cycle audio channel\n"
 +           "v                   cycle video channel\n"
 +           "t                   cycle subtitle channel\n"
 +           "w                   show audio waves\n"
 +           "s                   activate frame-step mode\n"
 +           "left/right          seek backward/forward 10 seconds\n"
 +           "down/up             seek backward/forward 1 minute\n"
 +           "mouse click         seek to percentage in file corresponding to fraction of width\n"
 +           );
 +    return 0;
 +}
 +
 +static int lockmgr(void **mtx, enum AVLockOp op)
 +{
 +   switch(op) {
 +      case AV_LOCK_CREATE:
 +          *mtx = SDL_CreateMutex();
 +          if(!*mtx)
 +              return 1;
 +          return 0;
 +      case AV_LOCK_OBTAIN:
 +          return !!SDL_LockMutex(*mtx);
 +      case AV_LOCK_RELEASE:
 +          return !!SDL_UnlockMutex(*mtx);
 +      case AV_LOCK_DESTROY:
 +          SDL_DestroyMutex(*mtx);
 +          return 0;
 +   }
 +   return 1;
 +}
 +
 +/* Called from the main */
 +int main(int argc, char **argv)
 +{
 +    int flags;
 +    VideoState *is;
 +
 +    av_log_set_flags(AV_LOG_SKIP_REPEATED);
 +    parse_loglevel(argc, argv, options);
 +
 +    /* register all codecs, demux and protocols */
 +    avcodec_register_all();
 +#if CONFIG_AVDEVICE
 +    avdevice_register_all();
 +#endif
 +#if CONFIG_AVFILTER
 +    avfilter_register_all();
 +#endif
 +    av_register_all();
++    avformat_network_init();
 +
 +    init_opts();
 +
 +    show_banner();
 +
 +    parse_options(NULL, argc, argv, options, opt_input_file);
 +
 +    if (!input_filename) {
 +        show_usage();
 +        fprintf(stderr, "An input file must be specified\n");
 +        fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
 +        exit(1);
 +    }
 +
 +    if (display_disable) {
 +        video_disable = 1;
 +    }
 +    flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
 +    if (audio_disable)
 +        flags &= ~SDL_INIT_AUDIO;
 +#if !defined(__MINGW32__) && !defined(__APPLE__)
 +    flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */
 +#endif
 +    if (SDL_Init (flags)) {
 +        fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError());
 +        fprintf(stderr, "(Did you set the DISPLAY variable?)\n");
 +        exit(1);
 +    }
 +
 +    if (!display_disable) {
 +#if HAVE_SDL_VIDEO_SIZE
 +        const SDL_VideoInfo *vi = SDL_GetVideoInfo();
 +        fs_screen_width = vi->current_w;
 +        fs_screen_height = vi->current_h;
 +#endif
 +    }
 +
 +    SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
 +    SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
 +    SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
 +
 +    if (av_lockmgr_register(lockmgr)) {
 +        fprintf(stderr, "Could not initialize lock manager!\n");
 +        do_exit(NULL);
 +    }
 +
 +    av_init_packet(&flush_pkt);
 +    flush_pkt.data= "FLUSH";
 +
 +    is = stream_open(input_filename, file_iformat);
 +    if (!is) {
 +        fprintf(stderr, "Failed to initialize VideoState!\n");
 +        do_exit(NULL);
 +    }
 +
 +    event_loop(is);
 +
 +    /* never returns */
 +
 +    return 0;
 +}
diff --cc ffprobe.c
index baffe0b,0000000..e00805a
mode 100644,000000..100644
--- /dev/null
+++ b/ffprobe.c
@@@ -1,957 -1,0 +1,960 @@@
 +/*
 + * ffprobe : Simple Media Prober based on the FFmpeg libraries
 + * Copyright (c) 2007-2010 Stefano Sabatini
 + *
 + * 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 "libavformat/avformat.h"
 +#include "libavcodec/avcodec.h"
 +#include "libavutil/avstring.h"
 +#include "libavutil/opt.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/dict.h"
 +#include "libavdevice/avdevice.h"
 +#include "cmdutils.h"
 +
 +const char program_name[] = "ffprobe";
 +const int program_birth_year = 2007;
 +
 +static int do_show_format  = 0;
 +static int do_show_packets = 0;
 +static int do_show_streams = 0;
 +
 +static int show_value_unit              = 0;
 +static int use_value_prefix             = 0;
 +static int use_byte_value_binary_prefix = 0;
 +static int use_value_sexagesimal_format = 0;
 +
 +static char *print_format;
 +
 +static const OptionDef options[];
 +
 +/* FFprobe context */
 +static const char *input_filename;
 +static AVInputFormat *iformat = NULL;
 +
 +static const char *binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" };
 +static const char *decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P"  };
 +
 +static const char *unit_second_str          = "s"    ;
 +static const char *unit_hertz_str           = "Hz"   ;
 +static const char *unit_byte_str            = "byte" ;
 +static const char *unit_bit_per_second_str  = "bit/s";
 +
 +void exit_program(int ret)
 +{
 +    exit(ret);
 +}
 +
 +static char *value_string(char *buf, int buf_size, double val, const char *unit)
 +{
 +    if (unit == unit_second_str && use_value_sexagesimal_format) {
 +        double secs;
 +        int hours, mins;
 +        secs  = val;
 +        mins  = (int)secs / 60;
 +        secs  = secs - mins * 60;
 +        hours = mins / 60;
 +        mins %= 60;
 +        snprintf(buf, buf_size, "%d:%02d:%09.6f", hours, mins, secs);
 +    } else if (use_value_prefix) {
 +        const char *prefix_string;
 +        int index;
 +
 +        if (unit == unit_byte_str && use_byte_value_binary_prefix) {
 +            index = (int) (log(val)/log(2)) / 10;
 +            index = av_clip(index, 0, FF_ARRAY_ELEMS(binary_unit_prefixes) -1);
 +            val /= pow(2, index*10);
 +            prefix_string = binary_unit_prefixes[index];
 +        } else {
 +            index = (int) (log10(val)) / 3;
 +            index = av_clip(index, 0, FF_ARRAY_ELEMS(decimal_unit_prefixes) -1);
 +            val /= pow(10, index*3);
 +            prefix_string = decimal_unit_prefixes[index];
 +        }
 +
 +        snprintf(buf, buf_size, "%.3f%s%s%s", val, prefix_string || show_value_unit ? " " : "",
 +                 prefix_string, show_value_unit ? unit : "");
 +    } else {
 +        snprintf(buf, buf_size, "%f%s%s", val, show_value_unit ? " " : "",
 +                 show_value_unit ? unit : "");
 +    }
 +
 +    return buf;
 +}
 +
 +static char *time_value_string(char *buf, int buf_size, int64_t val, const AVRational *time_base)
 +{
 +    if (val == AV_NOPTS_VALUE) {
 +        snprintf(buf, buf_size, "N/A");
 +    } else {
 +        value_string(buf, buf_size, val * av_q2d(*time_base), unit_second_str);
 +    }
 +
 +    return buf;
 +}
 +
 +static char *ts_value_string (char *buf, int buf_size, int64_t ts)
 +{
 +    if (ts == AV_NOPTS_VALUE) {
 +        snprintf(buf, buf_size, "N/A");
 +    } else {
 +        snprintf(buf, buf_size, "%"PRId64, ts);
 +    }
 +
 +    return buf;
 +}
 +
 +/* WRITERS API */
 +
 +typedef struct WriterContext WriterContext;
 +
 +typedef struct Writer {
 +    int priv_size;                  ///< private size for the writer context
 +    const char *name;
 +
 +    int  (*init)  (WriterContext *wctx, const char *args, void *opaque);
 +    void (*uninit)(WriterContext *wctx);
 +
 +    void (*print_header)(WriterContext *ctx);
 +    void (*print_footer)(WriterContext *ctx);
 +
 +    void (*print_chapter_header)(WriterContext *wctx, const char *);
 +    void (*print_chapter_footer)(WriterContext *wctx, const char *);
 +    void (*print_section_header)(WriterContext *wctx, const char *);
 +    void (*print_section_footer)(WriterContext *wctx, const char *);
 +    void (*print_integer)       (WriterContext *wctx, const char *, int);
 +    void (*print_string)        (WriterContext *wctx, const char *, const char *);
 +    void (*show_tags)           (WriterContext *wctx, AVDictionary *dict);
 +} Writer;
 +
 +struct WriterContext {
 +    const AVClass *class;           ///< class of the writer
 +    const Writer *writer;           ///< the Writer of which this is an instance
 +    char *name;                     ///< name of this writer instance
 +    void *priv;                     ///< private data for use by the filter
 +    unsigned int nb_item;           ///< number of the item printed in the given section, starting at 0
 +    unsigned int nb_section;        ///< number of the section printed in the given section sequence, starting at 0
 +    unsigned int nb_chapter;        ///< number of the chapter, starting at 0
 +};
 +
 +static const char *writer_get_name(void *p)
 +{
 +    WriterContext *wctx = p;
 +    return wctx->writer->name;
 +}
 +
 +static const AVClass writer_class = {
 +    "Writer",
 +    writer_get_name,
 +    NULL,
 +    LIBAVUTIL_VERSION_INT,
 +};
 +
 +static void writer_close(WriterContext **wctx)
 +{
 +    if (*wctx && (*wctx)->writer->uninit)
 +        (*wctx)->writer->uninit(*wctx);
 +
 +    av_freep(&((*wctx)->priv));
 +    av_freep(wctx);
 +}
 +
 +static int writer_open(WriterContext **wctx, const Writer *writer,
 +                       const char *args, void *opaque)
 +{
 +    int ret = 0;
 +
 +    if (!(*wctx = av_malloc(sizeof(WriterContext)))) {
 +        ret = AVERROR(ENOMEM);
 +        goto fail;
 +    }
 +
 +    if (!((*wctx)->priv = av_mallocz(writer->priv_size))) {
 +        ret = AVERROR(ENOMEM);
 +        goto fail;
 +    }
 +
 +    (*wctx)->class = &writer_class;
 +    (*wctx)->writer = writer;
 +    if ((*wctx)->writer->init)
 +        ret = (*wctx)->writer->init(*wctx, args, opaque);
 +    if (ret < 0)
 +        goto fail;
 +
 +    return 0;
 +
 +fail:
 +    writer_close(wctx);
 +    return ret;
 +}
 +
 +static inline void writer_print_header(WriterContext *wctx)
 +{
 +    if (wctx->writer->print_header)
 +        wctx->writer->print_header(wctx);
 +    wctx->nb_chapter = 0;
 +}
 +
 +static inline void writer_print_footer(WriterContext *wctx)
 +{
 +    if (wctx->writer->print_footer)
 +        wctx->writer->print_footer(wctx);
 +}
 +
 +static inline void writer_print_chapter_header(WriterContext *wctx,
 +                                               const char *header)
 +{
 +    if (wctx->writer->print_chapter_header)
 +        wctx->writer->print_chapter_header(wctx, header);
 +    wctx->nb_section = 0;
 +}
 +
 +static inline void writer_print_chapter_footer(WriterContext *wctx,
 +                                               const char *footer)
 +{
 +    if (wctx->writer->print_chapter_footer)
 +        wctx->writer->print_chapter_footer(wctx, footer);
 +    wctx->nb_chapter++;
 +}
 +
 +static inline void writer_print_section_header(WriterContext *wctx,
 +                                               const char *header)
 +{
 +    if (wctx->writer->print_section_header)
 +        wctx->writer->print_section_header(wctx, header);
 +    wctx->nb_item = 0;
 +}
 +
 +static inline void writer_print_section_footer(WriterContext *wctx,
 +                                               const char *footer)
 +{
 +    if (wctx->writer->print_section_footer)
 +        wctx->writer->print_section_footer(wctx, footer);
 +    wctx->nb_section++;
 +}
 +
 +static inline void writer_print_integer(WriterContext *wctx,
 +                                        const char *key, int val)
 +{
 +    wctx->writer->print_integer(wctx, key, val);
 +    wctx->nb_item++;
 +}
 +
 +static inline void writer_print_string(WriterContext *wctx,
 +                                       const char *key, const char *val)
 +{
 +    wctx->writer->print_string(wctx, key, val);
 +    wctx->nb_item++;
 +}
 +
 +static inline void writer_show_tags(WriterContext *wctx, AVDictionary *dict)
 +{
 +    wctx->writer->show_tags(wctx, dict);
 +}
 +
 +#define MAX_REGISTERED_WRITERS_NB 64
 +
 +static Writer *registered_writers[MAX_REGISTERED_WRITERS_NB + 1];
 +
 +static int writer_register(Writer *writer)
 +{
 +    static int next_registered_writer_idx = 0;
 +
 +    if (next_registered_writer_idx == MAX_REGISTERED_WRITERS_NB)
 +        return AVERROR(ENOMEM);
 +
 +    registered_writers[next_registered_writer_idx++] = writer;
 +    return 0;
 +}
 +
 +static Writer *writer_get_by_name(const char *name)
 +{
 +    int i;
 +
 +    for (i = 0; registered_writers[i]; i++)
 +        if (!strcmp(registered_writers[i]->name, name))
 +            return registered_writers[i];
 +
 +    return NULL;
 +}
 +
 +/* Print helpers */
 +
 +struct print_buf {
 +    char *s;
 +    int len;
 +};
 +
 +static char *fast_asprintf(struct print_buf *pbuf, const char *fmt, ...)
 +{
 +    va_list va;
 +    int len;
 +
 +    va_start(va, fmt);
 +    len = vsnprintf(NULL, 0, fmt, va);
 +    va_end(va);
 +    if (len < 0)
 +        goto fail;
 +
 +    if (pbuf->len < len) {
 +        char *p = av_realloc(pbuf->s, len + 1);
 +        if (!p)
 +            goto fail;
 +        pbuf->s   = p;
 +        pbuf->len = len;
 +    }
 +
 +    va_start(va, fmt);
 +    len = vsnprintf(pbuf->s, len + 1, fmt, va);
 +    va_end(va);
 +    if (len < 0)
 +        goto fail;
 +    return pbuf->s;
 +
 +fail:
 +    av_freep(&pbuf->s);
 +    pbuf->len = 0;
 +    return NULL;
 +}
 +
 +#define ESCAPE_INIT_BUF_SIZE 256
 +
 +#define ESCAPE_CHECK_SIZE(src, size, max_size)                          \
 +    if (size > max_size) {                                              \
 +        char buf[64];                                                   \
 +        snprintf(buf, sizeof(buf), "%s", src);                          \
 +        av_log(log_ctx, AV_LOG_WARNING,                                 \
 +               "String '%s...' with is too big\n", buf);                \
 +        return "FFPROBE_TOO_BIG_STRING";                                \
 +    }
 +
 +#define ESCAPE_REALLOC_BUF(dst_size_p, dst_p, src, size)                \
 +    if (*dst_size_p < size) {                                           \
 +        char *q = av_realloc(*dst_p, size);                             \
 +        if (!q) {                                                       \
 +            char buf[64];                                               \
 +            snprintf(buf, sizeof(buf), "%s", src);                      \
 +            av_log(log_ctx, AV_LOG_WARNING,                             \
 +                   "String '%s...' could not be escaped\n", buf);       \
 +            return "FFPROBE_THIS_STRING_COULD_NOT_BE_ESCAPED";          \
 +        }                                                               \
 +        *dst_size_p = size;                                             \
 +        *dst = q;                                                       \
 +    }
 +
 +/* WRITERS */
 +
 +/* Default output */
 +
 +static void default_print_footer(WriterContext *wctx)
 +{
 +    printf("\n");
 +}
 +
 +static void default_print_chapter_header(WriterContext *wctx, const char *chapter)
 +{
 +    if (wctx->nb_chapter)
 +        printf("\n");
 +}
 +
 +/* lame uppercasing routine, assumes the string is lower case ASCII */
 +static inline char *upcase_string(char *dst, size_t dst_size, const char *src)
 +{
 +    int i;
 +    for (i = 0; src[i] && i < dst_size-1; i++)
 +        dst[i] = src[i]-32;
 +    dst[i] = 0;
 +    return dst;
 +}
 +
 +static void default_print_section_header(WriterContext *wctx, const char *section)
 +{
 +    char buf[32];
 +
 +    if (wctx->nb_section)
 +        printf("\n");
 +    printf("[%s]\n", upcase_string(buf, sizeof(buf), section));
 +}
 +
 +static void default_print_section_footer(WriterContext *wctx, const char *section)
 +{
 +    char buf[32];
 +
 +    printf("[/%s]", upcase_string(buf, sizeof(buf), section));
 +}
 +
 +static void default_print_str(WriterContext *wctx, const char *key, const char *value)
 +{
 +    printf("%s=%s\n", key, value);
 +}
 +
 +static void default_print_int(WriterContext *wctx, const char *key, int value)
 +{
 +    printf("%s=%d\n", key, value);
 +}
 +
 +static void default_show_tags(WriterContext *wctx, AVDictionary *dict)
 +{
 +    AVDictionaryEntry *tag = NULL;
 +    while ((tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX))) {
 +        printf("TAG:");
 +        writer_print_string(wctx, tag->key, tag->value);
 +    }
 +}
 +
 +static Writer default_writer = {
 +    .name                  = "default",
 +    .print_footer          = default_print_footer,
 +    .print_chapter_header  = default_print_chapter_header,
 +    .print_section_header  = default_print_section_header,
 +    .print_section_footer  = default_print_section_footer,
 +    .print_integer         = default_print_int,
 +    .print_string          = default_print_str,
 +    .show_tags             = default_show_tags
 +};
 +
 +/* JSON output */
 +
 +typedef struct {
 +    int multiple_entries; ///< tells if the given chapter requires multiple entries
 +    char *buf;
 +    size_t buf_size;
 +} JSONContext;
 +
 +static av_cold int json_init(WriterContext *wctx, const char *args, void *opaque)
 +{
 +    JSONContext *json = wctx->priv;
 +
 +    json->buf_size = ESCAPE_INIT_BUF_SIZE;
 +    if (!(json->buf = av_malloc(json->buf_size)))
 +        return AVERROR(ENOMEM);
 +
 +    return 0;
 +}
 +
 +static av_cold void json_uninit(WriterContext *wctx)
 +{
 +    JSONContext *json = wctx->priv;
 +    av_freep(&json->buf);
 +}
 +
 +static const char *json_escape_str(char **dst, size_t *dst_size, const char *src,
 +                                   void *log_ctx)
 +{
 +    static const char json_escape[] = {'"', '\\', '\b', '\f', '\n', '\r', '\t', 0};
 +    static const char json_subst[]  = {'"', '\\',  'b',  'f',  'n',  'r',  't', 0};
 +    const char *p;
 +    char *q;
 +    size_t size = 1;
 +
 +    // compute the length of the escaped string
 +    for (p = src; *p; p++) {
 +        ESCAPE_CHECK_SIZE(src, size, SIZE_MAX-6);
 +        if (strchr(json_escape, *p))     size += 2; // simple escape
 +        else if ((unsigned char)*p < 32) size += 6; // handle non-printable chars
 +        else                             size += 1; // char copy
 +    }
 +    ESCAPE_REALLOC_BUF(dst_size, dst, src, size);
 +
 +    q = *dst;
 +    for (p = src; *p; p++) {
 +        char *s = strchr(json_escape, *p);
 +        if (s) {
 +            *q++ = '\\';
 +            *q++ = json_subst[s - json_escape];
 +        } else if ((unsigned char)*p < 32) {
 +            snprintf(q, 7, "\\u00%02x", *p & 0xff);
 +            q += 6;
 +        } else {
 +            *q++ = *p;
 +        }
 +    }
 +    *q = 0;
 +    return *dst;
 +}
 +
 +static void json_print_header(WriterContext *wctx)
 +{
 +    printf("{");
 +}
 +
 +static void json_print_footer(WriterContext *wctx)
 +{
 +    printf("\n}\n");
 +}
 +
 +static void json_print_chapter_header(WriterContext *wctx, const char *chapter)
 +{
 +    JSONContext *json = wctx->priv;
 +
 +    if (wctx->nb_chapter)
 +        printf(",");
 +    json->multiple_entries = !strcmp(chapter, "packets") || !strcmp(chapter, "streams");
 +    printf("\n  \"%s\":%s", json_escape_str(&json->buf, &json->buf_size, chapter, wctx),
 +           json->multiple_entries ? " [" : " ");
 +}
 +
 +static void json_print_chapter_footer(WriterContext *wctx, const char *chapter)
 +{
 +    JSONContext *json = wctx->priv;
 +
 +    if (json->multiple_entries)
 +        printf("]");
 +}
 +
 +static void json_print_section_header(WriterContext *wctx, const char *section)
 +{
 +    if (wctx->nb_section) printf(",");
 +    printf("{\n");
 +}
 +
 +static void json_print_section_footer(WriterContext *wctx, const char *section)
 +{
 +    printf("\n  }");
 +}
 +
 +static inline void json_print_item_str(WriterContext *wctx,
 +                                       const char *key, const char *value,
 +                                       const char *indent)
 +{
 +    JSONContext *json = wctx->priv;
 +
 +    printf("%s\"%s\":", indent, json_escape_str(&json->buf, &json->buf_size, key,   wctx));
 +    printf(" \"%s\"",           json_escape_str(&json->buf, &json->buf_size, value, wctx));
 +}
 +
 +#define INDENT "    "
 +
 +static void json_print_str(WriterContext *wctx, const char *key, const char *value)
 +{
 +    if (wctx->nb_item) printf(",\n");
 +    json_print_item_str(wctx, key, value, INDENT);
 +}
 +
 +static void json_print_int(WriterContext *wctx, const char *key, int value)
 +{
 +    JSONContext *json = wctx->priv;
 +
 +    if (wctx->nb_item) printf(",\n");
 +    printf(INDENT "\"%s\": %d",
 +           json_escape_str(&json->buf, &json->buf_size, key, wctx), value);
 +}
 +
 +static void json_show_tags(WriterContext *wctx, AVDictionary *dict)
 +{
 +    AVDictionaryEntry *tag = NULL;
 +    int is_first = 1;
 +    if (!dict)
 +        return;
 +    printf(",\n" INDENT "\"tags\": {\n");
 +    while ((tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX))) {
 +        if (is_first) is_first = 0;
 +        else          printf(",\n");
 +        json_print_item_str(wctx, tag->key, tag->value, INDENT INDENT);
 +    }
 +    printf("\n    }");
 +}
 +
 +static Writer json_writer = {
 +    .name         = "json",
 +    .priv_size    = sizeof(JSONContext),
 +
 +    .init                 = json_init,
 +    .uninit               = json_uninit,
 +    .print_header         = json_print_header,
 +    .print_footer         = json_print_footer,
 +    .print_chapter_header = json_print_chapter_header,
 +    .print_chapter_footer = json_print_chapter_footer,
 +    .print_section_header = json_print_section_header,
 +    .print_section_footer = json_print_section_footer,
 +    .print_integer        = json_print_int,
 +    .print_string         = json_print_str,
 +    .show_tags            = json_show_tags,
 +};
 +
 +static void writer_register_all(void)
 +{
 +    static int initialized;
 +
 +    if (initialized)
 +        return;
 +    initialized = 1;
 +
 +    writer_register(&default_writer);
 +    writer_register(&json_writer);
 +}
 +
 +#define print_fmt(k, f, ...) do {              \
 +    if (fast_asprintf(&pbuf, f, __VA_ARGS__))  \
 +        writer_print_string(w, k, pbuf.s);     \
 +} while (0)
 +
 +#define print_int(k, v)         writer_print_integer(w, k, v)
 +#define print_str(k, v)         writer_print_string(w, k, v)
 +#define print_section_header(s) writer_print_section_header(w, s)
 +#define print_section_footer(s) writer_print_section_footer(w, s)
 +#define show_tags(metadata)     writer_show_tags(w, metadata)
 +
 +static void show_packet(WriterContext *w, AVFormatContext *fmt_ctx, AVPacket *pkt, int packet_idx)
 +{
 +    char val_str[128];
 +    AVStream *st = fmt_ctx->streams[pkt->stream_index];
 +    struct print_buf pbuf = {.s = NULL};
 +
 +    print_section_header("packet");
 +    print_str("codec_type",       av_x_if_null(av_get_media_type_string(st->codec->codec_type), "unknown"));
 +    print_int("stream_index",     pkt->stream_index);
 +    print_str("pts",              ts_value_string  (val_str, sizeof(val_str), pkt->pts));
 +    print_str("pts_time",         time_value_string(val_str, sizeof(val_str), pkt->pts, &st->time_base));
 +    print_str("dts",              ts_value_string  (val_str, sizeof(val_str), pkt->dts));
 +    print_str("dts_time",         time_value_string(val_str, sizeof(val_str), pkt->dts, &st->time_base));
 +    print_str("duration",         ts_value_string  (val_str, sizeof(val_str), pkt->duration));
 +    print_str("duration_time",    time_value_string(val_str, sizeof(val_str), pkt->duration, &st->time_base));
 +    print_str("size",             value_string     (val_str, sizeof(val_str), pkt->size, unit_byte_str));
 +    print_fmt("pos",   "%"PRId64, pkt->pos);
 +    print_fmt("flags", "%c",      pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_');
 +    print_section_footer("packet");
 +
 +    av_free(pbuf.s);
 +    fflush(stdout);
 +}
 +
 +static void show_packets(WriterContext *w, AVFormatContext *fmt_ctx)
 +{
 +    AVPacket pkt;
 +    int i = 0;
 +
 +    av_init_packet(&pkt);
 +
 +    while (!av_read_frame(fmt_ctx, &pkt))
 +        show_packet(w, fmt_ctx, &pkt, i++);
 +}
 +
 +static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_idx)
 +{
 +    AVStream *stream = fmt_ctx->streams[stream_idx];
 +    AVCodecContext *dec_ctx;
 +    AVCodec *dec;
 +    char val_str[128];
 +    AVRational display_aspect_ratio;
 +    struct print_buf pbuf = {.s = NULL};
 +
 +    print_section_header("stream");
 +
 +    print_int("index", stream->index);
 +
 +    if ((dec_ctx = stream->codec)) {
 +        if ((dec = dec_ctx->codec)) {
 +            print_str("codec_name",      dec->name);
 +            print_str("codec_long_name", dec->long_name);
 +        } else {
 +            print_str("codec_name",      "unknown");
 +        }
 +
 +        print_str("codec_type", av_x_if_null(av_get_media_type_string(dec_ctx->codec_type), "unknown"));
 +        print_fmt("codec_time_base", "%d/%d", dec_ctx->time_base.num, dec_ctx->time_base.den);
 +
 +        /* print AVI/FourCC tag */
 +        av_get_codec_tag_string(val_str, sizeof(val_str), dec_ctx->codec_tag);
 +        print_str("codec_tag_string",    val_str);
 +        print_fmt("codec_tag", "0x%04x", dec_ctx->codec_tag);
 +
 +        switch (dec_ctx->codec_type) {
 +        case AVMEDIA_TYPE_VIDEO:
 +            print_int("width",        dec_ctx->width);
 +            print_int("height",       dec_ctx->height);
 +            print_int("has_b_frames", dec_ctx->has_b_frames);
 +            if (dec_ctx->sample_aspect_ratio.num) {
 +                print_fmt("sample_aspect_ratio", "%d:%d",
 +                          dec_ctx->sample_aspect_ratio.num,
 +                          dec_ctx->sample_aspect_ratio.den);
 +                av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den,
 +                          dec_ctx->width  * dec_ctx->sample_aspect_ratio.num,
 +                          dec_ctx->height * dec_ctx->sample_aspect_ratio.den,
 +                          1024*1024);
 +                print_fmt("display_aspect_ratio", "%d:%d",
 +                          display_aspect_ratio.num,
 +                          display_aspect_ratio.den);
 +            }
 +            print_str("pix_fmt", av_x_if_null(av_get_pix_fmt_name(dec_ctx->pix_fmt), "unknown"));
 +            print_int("level",   dec_ctx->level);
 +            break;
 +
 +        case AVMEDIA_TYPE_AUDIO:
 +            print_str("sample_fmt",
 +                      av_x_if_null(av_get_sample_fmt_name(dec_ctx->sample_fmt), "unknown"));
 +            print_str("sample_rate",     value_string(val_str, sizeof(val_str), dec_ctx->sample_rate, unit_hertz_str));
 +            print_int("channels",        dec_ctx->channels);
 +            print_int("bits_per_sample", av_get_bits_per_sample(dec_ctx->codec_id));
 +            break;
 +        }
 +    } else {
 +        print_str("codec_type", "unknown");
 +    }
 +    if (dec_ctx->codec && dec_ctx->codec->priv_class) {
 +        const AVOption *opt = NULL;
 +        while (opt = av_opt_next(dec_ctx->priv_data,opt)) {
 +            uint8_t *str;
 +            if (opt->flags) continue;
 +            if (av_opt_get(dec_ctx->priv_data, opt->name, 0, &str) >= 0) {
 +                print_str(opt->name, str);
 +                av_free(str);
 +            }
 +        }
 +    }
 +
 +    if (fmt_ctx->iformat->flags & AVFMT_SHOW_IDS)
 +        print_fmt("id", "0x%x", stream->id);
 +    print_fmt("r_frame_rate",   "%d/%d", stream->r_frame_rate.num,   stream->r_frame_rate.den);
 +    print_fmt("avg_frame_rate", "%d/%d", stream->avg_frame_rate.num, stream->avg_frame_rate.den);
 +    print_fmt("time_base",      "%d/%d", stream->time_base.num,      stream->time_base.den);
 +    print_str("start_time", time_value_string(val_str, sizeof(val_str), stream->start_time, &stream->time_base));
 +    print_str("duration",   time_value_string(val_str, sizeof(val_str), stream->duration,   &stream->time_base));
 +    if (stream->nb_frames)
 +        print_fmt("nb_frames", "%"PRId64, stream->nb_frames);
 +
 +    show_tags(stream->metadata);
 +
 +    print_section_footer("stream");
 +    av_free(pbuf.s);
 +    fflush(stdout);
 +}
 +
 +static void show_streams(WriterContext *w, AVFormatContext *fmt_ctx)
 +{
 +    int i;
 +    for (i = 0; i < fmt_ctx->nb_streams; i++)
 +        show_stream(w, fmt_ctx, i);
 +}
 +
 +static void show_format(WriterContext *w, AVFormatContext *fmt_ctx)
 +{
 +    char val_str[128];
 +    int64_t size = avio_size(fmt_ctx->pb);
 +    struct print_buf pbuf = {.s = NULL};
 +
 +    print_section_header("format");
 +    print_str("filename",         fmt_ctx->filename);
 +    print_int("nb_streams",       fmt_ctx->nb_streams);
 +    print_str("format_name",      fmt_ctx->iformat->name);
 +    print_str("format_long_name", fmt_ctx->iformat->long_name);
 +    print_str("start_time",       time_value_string(val_str, sizeof(val_str), fmt_ctx->start_time, &AV_TIME_BASE_Q));
 +    print_str("duration",         time_value_string(val_str, sizeof(val_str), fmt_ctx->duration,   &AV_TIME_BASE_Q));
 +    if (size >= 0)
 +        print_str("size",         value_string(val_str, sizeof(val_str), size,               unit_byte_str));
 +    print_str("bit_rate",         value_string(val_str, sizeof(val_str), fmt_ctx->bit_rate,  unit_bit_per_second_str));
 +    show_tags(fmt_ctx->metadata);
 +    print_section_footer("format");
 +    av_free(pbuf.s);
 +    fflush(stdout);
 +}
 +
 +static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename)
 +{
 +    int err, i;
 +    AVFormatContext *fmt_ctx = NULL;
 +    AVDictionaryEntry *t;
 +
 +    if ((err = avformat_open_input(&fmt_ctx, filename, iformat, &format_opts)) < 0) {
 +        print_error(filename, err);
 +        return err;
 +    }
 +    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);
 +        return AVERROR_OPTION_NOT_FOUND;
 +    }
 +
 +
 +    /* fill the streams in the format context */
 +    if ((err = avformat_find_stream_info(fmt_ctx, NULL)) < 0) {
 +        print_error(filename, err);
 +        return err;
 +    }
 +
 +    av_dump_format(fmt_ctx, 0, filename, 0);
 +
 +    /* bind a decoder to each input stream */
 +    for (i = 0; i < fmt_ctx->nb_streams; i++) {
 +        AVStream *stream = fmt_ctx->streams[i];
 +        AVCodec *codec;
 +
 +        if (!(codec = avcodec_find_decoder(stream->codec->codec_id))) {
 +            fprintf(stderr, "Unsupported codec with id %d for input stream %d\n",
 +                    stream->codec->codec_id, stream->index);
 +        } else if (avcodec_open2(stream->codec, codec, NULL) < 0) {
 +            fprintf(stderr, "Error while opening codec for input stream %d\n",
 +                    stream->index);
 +        }
 +    }
 +
 +    *fmt_ctx_ptr = fmt_ctx;
 +    return 0;
 +}
 +
 +#define PRINT_CHAPTER(name) do {                                        \
 +    if (do_show_ ## name) {                                             \
 +        writer_print_chapter_header(wctx, #name);                       \
 +        show_ ## name (wctx, fmt_ctx);                                  \
 +        writer_print_chapter_footer(wctx, #name);                       \
 +    }                                                                   \
 +} while (0)
 +
 +static int probe_file(const char *filename)
 +{
 +    AVFormatContext *fmt_ctx;
 +    int ret;
 +    Writer *w;
 +    char *buf;
 +    char *w_name = NULL, *w_args = NULL;
 +    WriterContext *wctx;
 +
 +    writer_register_all();
 +
 +    if (!print_format)
 +        print_format = av_strdup("default");
 +    w_name = av_strtok(print_format, "=", &buf);
 +    w_args = buf;
 +
 +    w = writer_get_by_name(w_name);
 +    if (!w) {
 +        av_log(NULL, AV_LOG_ERROR, "Unknown output format with name '%s'\n", w_name);
 +        ret = AVERROR(EINVAL);
 +        goto end;
 +    }
 +
 +    if ((ret = writer_open(&wctx, w, w_args, NULL)) < 0)
 +        goto end;
 +    if ((ret = open_input_file(&fmt_ctx, filename)))
 +        goto end;
 +
 +    writer_print_header(wctx);
 +    PRINT_CHAPTER(packets);
 +    PRINT_CHAPTER(streams);
 +    PRINT_CHAPTER(format);
 +    writer_print_footer(wctx);
 +
 +    av_close_input_file(fmt_ctx);
 +    writer_close(&wctx);
 +
 +end:
 +    av_freep(&print_format);
 +
 +    return ret;
 +}
 +
 +static void show_usage(void)
 +{
 +    printf("Simple multimedia streams analyzer\n");
 +    printf("usage: %s [OPTIONS] [INPUT_FILE]\n", program_name);
 +    printf("\n");
 +}
 +
 +static int opt_format(const char *opt, const char *arg)
 +{
 +    iformat = av_find_input_format(arg);
 +    if (!iformat) {
 +        fprintf(stderr, "Unknown input format: %s\n", arg);
 +        return AVERROR(EINVAL);
 +    }
 +    return 0;
 +}
 +
 +static void opt_input_file(void *optctx, const char *arg)
 +{
 +    if (input_filename) {
 +        fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
 +                arg, input_filename);
 +        exit(1);
 +    }
 +    if (!strcmp(arg, "-"))
 +        arg = "pipe:";
 +    input_filename = arg;
 +}
 +
 +static int opt_help(const char *opt, const char *arg)
 +{
 +    av_log_set_callback(log_callback_help);
 +    show_usage();
 +    show_help_options(options, "Main options:\n", 0, 0);
 +    printf("\n");
 +
 +    show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);
 +
 +    return 0;
 +}
 +
 +static int opt_pretty(const char *opt, const char *arg)
 +{
 +    show_value_unit              = 1;
 +    use_value_prefix             = 1;
 +    use_byte_value_binary_prefix = 1;
 +    use_value_sexagesimal_format = 1;
 +    return 0;
 +}
 +
 +static const OptionDef options[] = {
 +#include "cmdutils_common_opts.h"
 +    { "f", HAS_ARG, {(void*)opt_format}, "force format", "format" },
 +    { "unit", OPT_BOOL, {(void*)&show_value_unit}, "show unit of the displayed values" },
 +    { "prefix", OPT_BOOL, {(void*)&use_value_prefix}, "use SI prefixes for the displayed values" },
 +    { "byte_binary_prefix", OPT_BOOL, {(void*)&use_byte_value_binary_prefix},
 +      "use binary prefixes for byte units" },
 +    { "sexagesimal", OPT_BOOL,  {(void*)&use_value_sexagesimal_format},
 +      "use sexagesimal format HOURS:MM:SS.MICROSECONDS for time units" },
 +    { "pretty", 0, {(void*)&opt_pretty},
 +      "prettify the format of displayed values, make it more human readable" },
 +    { "print_format", OPT_STRING | HAS_ARG, {(void*)&print_format}, "set the output printing format (available formats are: default, json)", "format" },
 +    { "show_format",  OPT_BOOL, {(void*)&do_show_format} , "show format/container info" },
 +    { "show_packets", OPT_BOOL, {(void*)&do_show_packets}, "show packets info" },
 +    { "show_streams", OPT_BOOL, {(void*)&do_show_streams}, "show streams info" },
 +    { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
 +    { "i", HAS_ARG, {(void *)opt_input_file}, "read specified file", "input_file"},
 +    { NULL, },
 +};
 +
 +int main(int argc, char **argv)
 +{
 +    int ret;
 +
 +    parse_loglevel(argc, argv, options);
 +    av_register_all();
++    avformat_network_init();
 +    init_opts();
 +#if CONFIG_AVDEVICE
 +    avdevice_register_all();
 +#endif
 +
 +    show_banner();
 +    parse_options(NULL, argc, argv, options, opt_input_file);
 +
 +    if (!input_filename) {
 +        show_usage();
 +        fprintf(stderr, "You have to specify one input file.\n");
 +        fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'.\n", program_name);
 +        exit(1);
 +    }
 +
 +    ret = probe_file(input_filename);
 +
++    avformat_network_deinit();
++
 +    return ret;
 +}
diff --cc ffserver.c
index 788755d,0000000..90c4ae6
mode 100644,000000..100644
--- /dev/null
@@@ -1,4751 -1,0 +1,4751 @@@
- #include <strings.h>
 +/*
 + * Multiple format streaming server
 + * Copyright (c) 2000, 2001, 2002 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"
 +#if !HAVE_CLOSESOCKET
 +#define closesocket close
 +#endif
 +#include <string.h>
-         if (strncasecmp(p, "Pragma:", 7) == 0) {
 +#include <stdlib.h>
 +#include "libavformat/avformat.h"
 +#include "libavformat/ffm.h"
 +#include "libavformat/network.h"
 +#include "libavformat/os_support.h"
 +#include "libavformat/rtpdec.h"
 +#include "libavformat/rtsp.h"
 +// XXX for ffio_open_dyn_packet_buffer, to be removed
 +#include "libavformat/avio_internal.h"
 +#include "libavutil/avstring.h"
 +#include "libavutil/lfg.h"
 +#include "libavutil/dict.h"
 +#include "libavutil/mathematics.h"
 +#include "libavutil/random_seed.h"
 +#include "libavutil/parseutils.h"
 +#include "libavutil/opt.h"
 +#include <stdarg.h>
 +#include <unistd.h>
 +#include <fcntl.h>
 +#include <sys/ioctl.h>
 +#if HAVE_POLL_H
 +#include <poll.h>
 +#endif
 +#include <errno.h>
 +#include <sys/time.h>
 +#include <time.h>
 +#include <sys/wait.h>
 +#include <signal.h>
 +#if HAVE_DLFCN_H
 +#include <dlfcn.h>
 +#endif
 +
 +#include "cmdutils.h"
 +
 +const char program_name[] = "ffserver";
 +const int program_birth_year = 2000;
 +
 +static const OptionDef options[];
 +
 +enum HTTPState {
 +    HTTPSTATE_WAIT_REQUEST,
 +    HTTPSTATE_SEND_HEADER,
 +    HTTPSTATE_SEND_DATA_HEADER,
 +    HTTPSTATE_SEND_DATA,          /* sending TCP or UDP data */
 +    HTTPSTATE_SEND_DATA_TRAILER,
 +    HTTPSTATE_RECEIVE_DATA,
 +    HTTPSTATE_WAIT_FEED,          /* wait for data from the feed */
 +    HTTPSTATE_READY,
 +
 +    RTSPSTATE_WAIT_REQUEST,
 +    RTSPSTATE_SEND_REPLY,
 +    RTSPSTATE_SEND_PACKET,
 +};
 +
 +static const char *http_state[] = {
 +    "HTTP_WAIT_REQUEST",
 +    "HTTP_SEND_HEADER",
 +
 +    "SEND_DATA_HEADER",
 +    "SEND_DATA",
 +    "SEND_DATA_TRAILER",
 +    "RECEIVE_DATA",
 +    "WAIT_FEED",
 +    "READY",
 +
 +    "RTSP_WAIT_REQUEST",
 +    "RTSP_SEND_REPLY",
 +    "RTSP_SEND_PACKET",
 +};
 +
 +#define MAX_STREAMS 20
 +
 +#define IOBUFFER_INIT_SIZE 8192
 +
 +/* timeouts are in ms */
 +#define HTTP_REQUEST_TIMEOUT (15 * 1000)
 +#define RTSP_REQUEST_TIMEOUT (3600 * 24 * 1000)
 +
 +#define SYNC_TIMEOUT (10 * 1000)
 +
 +typedef struct RTSPActionServerSetup {
 +    uint32_t ipaddr;
 +    char transport_option[512];
 +} RTSPActionServerSetup;
 +
 +typedef struct {
 +    int64_t count1, count2;
 +    int64_t time1, time2;
 +} DataRateData;
 +
 +/* context associated with one connection */
 +typedef struct HTTPContext {
 +    enum HTTPState state;
 +    int fd; /* socket file descriptor */
 +    struct sockaddr_in from_addr; /* origin */
 +    struct pollfd *poll_entry; /* used when polling */
 +    int64_t timeout;
 +    uint8_t *buffer_ptr, *buffer_end;
 +    int http_error;
 +    int post;
 +    int chunked_encoding;
 +    int chunk_size;               /* 0 if it needs to be read */
 +    struct HTTPContext *next;
 +    int got_key_frame; /* stream 0 => 1, stream 1 => 2, stream 2=> 4 */
 +    int64_t data_count;
 +    /* feed input */
 +    int feed_fd;
 +    /* input format handling */
 +    AVFormatContext *fmt_in;
 +    int64_t start_time;            /* In milliseconds - this wraps fairly often */
 +    int64_t first_pts;            /* initial pts value */
 +    int64_t cur_pts;             /* current pts value from the stream in us */
 +    int64_t cur_frame_duration;  /* duration of the current frame in us */
 +    int cur_frame_bytes;       /* output frame size, needed to compute
 +                                  the time at which we send each
 +                                  packet */
 +    int pts_stream_index;        /* stream we choose as clock reference */
 +    int64_t cur_clock;           /* current clock reference value in us */
 +    /* output format handling */
 +    struct FFStream *stream;
 +    /* -1 is invalid stream */
 +    int feed_streams[MAX_STREAMS]; /* index of streams in the feed */
 +    int switch_feed_streams[MAX_STREAMS]; /* index of streams in the feed */
 +    int switch_pending;
 +    AVFormatContext fmt_ctx; /* instance of FFStream for one user */
 +    int last_packet_sent; /* true if last data packet was sent */
 +    int suppress_log;
 +    DataRateData datarate;
 +    int wmp_client_id;
 +    char protocol[16];
 +    char method[16];
 +    char url[128];
 +    int buffer_size;
 +    uint8_t *buffer;
 +    int is_packetized; /* if true, the stream is packetized */
 +    int packet_stream_index; /* current stream for output in state machine */
 +
 +    /* RTSP state specific */
 +    uint8_t *pb_buffer; /* XXX: use that in all the code */
 +    AVIOContext *pb;
 +    int seq; /* RTSP sequence number */
 +
 +    /* RTP state specific */
 +    enum RTSPLowerTransport rtp_protocol;
 +    char session_id[32]; /* session id */
 +    AVFormatContext *rtp_ctx[MAX_STREAMS];
 +
 +    /* RTP/UDP specific */
 +    URLContext *rtp_handles[MAX_STREAMS];
 +
 +    /* RTP/TCP specific */
 +    struct HTTPContext *rtsp_c;
 +    uint8_t *packet_buffer, *packet_buffer_ptr, *packet_buffer_end;
 +} HTTPContext;
 +
 +/* each generated stream is described here */
 +enum StreamType {
 +    STREAM_TYPE_LIVE,
 +    STREAM_TYPE_STATUS,
 +    STREAM_TYPE_REDIRECT,
 +};
 +
 +enum IPAddressAction {
 +    IP_ALLOW = 1,
 +    IP_DENY,
 +};
 +
 +typedef struct IPAddressACL {
 +    struct IPAddressACL *next;
 +    enum IPAddressAction action;
 +    /* These are in host order */
 +    struct in_addr first;
 +    struct in_addr last;
 +} IPAddressACL;
 +
 +/* description of each stream of the ffserver.conf file */
 +typedef struct FFStream {
 +    enum StreamType stream_type;
 +    char filename[1024];     /* stream filename */
 +    struct FFStream *feed;   /* feed we are using (can be null if
 +                                coming from file) */
 +    AVDictionary *in_opts;   /* input parameters */
 +    AVInputFormat *ifmt;       /* if non NULL, force input format */
 +    AVOutputFormat *fmt;
 +    IPAddressACL *acl;
 +    char dynamic_acl[1024];
 +    int nb_streams;
 +    int prebuffer;      /* Number of millseconds early to start */
 +    int64_t max_time;      /* Number of milliseconds to run */
 +    int send_on_key;
 +    AVStream *streams[MAX_STREAMS];
 +    int feed_streams[MAX_STREAMS]; /* index of streams in the feed */
 +    char feed_filename[1024]; /* file name of the feed storage, or
 +                                 input file name for a stream */
 +    char author[512];
 +    char title[512];
 +    char copyright[512];
 +    char comment[512];
 +    pid_t pid;  /* Of ffmpeg process */
 +    time_t pid_start;  /* Of ffmpeg process */
 +    char **child_argv;
 +    struct FFStream *next;
 +    unsigned bandwidth; /* bandwidth, in kbits/s */
 +    /* RTSP options */
 +    char *rtsp_option;
 +    /* multicast specific */
 +    int is_multicast;
 +    struct in_addr multicast_ip;
 +    int multicast_port; /* first port used for multicast */
 +    int multicast_ttl;
 +    int loop; /* if true, send the stream in loops (only meaningful if file) */
 +
 +    /* feed specific */
 +    int feed_opened;     /* true if someone is writing to the feed */
 +    int is_feed;         /* true if it is a feed */
 +    int readonly;        /* True if writing is prohibited to the file */
 +    int truncate;        /* True if feeder connection truncate the feed file */
 +    int conns_served;
 +    int64_t bytes_served;
 +    int64_t feed_max_size;      /* maximum storage size, zero means unlimited */
 +    int64_t feed_write_index;   /* current write position in feed (it wraps around) */
 +    int64_t feed_size;          /* current size of feed */
 +    struct FFStream *next_feed;
 +} FFStream;
 +
 +typedef struct FeedData {
 +    long long data_count;
 +    float avg_frame_size;   /* frame size averaged over last frames with exponential mean */
 +} FeedData;
 +
 +static struct sockaddr_in my_http_addr;
 +static struct sockaddr_in my_rtsp_addr;
 +
 +static char logfilename[1024];
 +static HTTPContext *first_http_ctx;
 +static FFStream *first_feed;   /* contains only feeds */
 +static FFStream *first_stream; /* contains all streams, including feeds */
 +
 +static void new_connection(int server_fd, int is_rtsp);
 +static void close_connection(HTTPContext *c);
 +
 +/* HTTP handling */
 +static int handle_connection(HTTPContext *c);
 +static int http_parse_request(HTTPContext *c);
 +static int http_send_data(HTTPContext *c);
 +static void compute_status(HTTPContext *c);
 +static int open_input_stream(HTTPContext *c, const char *info);
 +static int http_start_receive_data(HTTPContext *c);
 +static int http_receive_data(HTTPContext *c);
 +
 +/* RTSP handling */
 +static int rtsp_parse_request(HTTPContext *c);
 +static void rtsp_cmd_describe(HTTPContext *c, const char *url);
 +static void rtsp_cmd_options(HTTPContext *c, const char *url);
 +static void rtsp_cmd_setup(HTTPContext *c, const char *url, RTSPMessageHeader *h);
 +static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPMessageHeader *h);
 +static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h);
 +static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader *h);
 +
 +/* SDP handling */
 +static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
 +                                   struct in_addr my_ip);
 +
 +/* RTP handling */
 +static HTTPContext *rtp_new_connection(struct sockaddr_in *from_addr,
 +                                       FFStream *stream, const char *session_id,
 +                                       enum RTSPLowerTransport rtp_protocol);
 +static int rtp_new_av_stream(HTTPContext *c,
 +                             int stream_index, struct sockaddr_in *dest_addr,
 +                             HTTPContext *rtsp_c);
 +
 +static const char *my_program_name;
 +static const char *my_program_dir;
 +
 +static const char *config_filename = "/etc/ffserver.conf";
 +
 +static int ffserver_debug;
 +static int ffserver_daemon;
 +static int no_launch;
 +static int need_to_start_children;
 +
 +/* maximum number of simultaneous HTTP connections */
 +static unsigned int nb_max_http_connections = 2000;
 +static unsigned int nb_max_connections = 5;
 +static unsigned int nb_connections;
 +
 +static uint64_t max_bandwidth = 1000;
 +static uint64_t current_bandwidth;
 +
 +static int64_t cur_time;           // Making this global saves on passing it around everywhere
 +
 +static AVLFG random_state;
 +
 +static FILE *logfile = NULL;
 +
 +/* FIXME: make ffserver work with IPv6 */
 +void exit_program(int ret)
 +{
 +    exit(ret);
 +}
 +
 +/* resolve host with also IP address parsing */
 +static int resolve_host(struct in_addr *sin_addr, const char *hostname)
 +{
 +
 +    if (!ff_inet_aton(hostname, sin_addr)) {
 +#if HAVE_GETADDRINFO
 +        struct addrinfo *ai, *cur;
 +        struct addrinfo hints;
 +        memset(&hints, 0, sizeof(hints));
 +        hints.ai_family = AF_INET;
 +        if (getaddrinfo(hostname, NULL, &hints, &ai))
 +            return -1;
 +        /* getaddrinfo returns a linked list of addrinfo structs.
 +         * Even if we set ai_family = AF_INET above, make sure
 +         * that the returned one actually is of the correct type. */
 +        for (cur = ai; cur; cur = cur->ai_next) {
 +            if (cur->ai_family == AF_INET) {
 +                *sin_addr = ((struct sockaddr_in *)cur->ai_addr)->sin_addr;
 +                freeaddrinfo(ai);
 +                return 0;
 +            }
 +        }
 +        freeaddrinfo(ai);
 +        return -1;
 +#else
 +        struct hostent *hp;
 +        hp = gethostbyname(hostname);
 +        if (!hp)
 +            return -1;
 +        memcpy(sin_addr, hp->h_addr_list[0], sizeof(struct in_addr));
 +#endif
 +    }
 +    return 0;
 +}
 +
 +static char *ctime1(char *buf2)
 +{
 +    time_t ti;
 +    char *p;
 +
 +    ti = time(NULL);
 +    p = ctime(&ti);
 +    strcpy(buf2, p);
 +    p = buf2 + strlen(p) - 1;
 +    if (*p == '\n')
 +        *p = '\0';
 +    return buf2;
 +}
 +
 +static void http_vlog(const char *fmt, va_list vargs)
 +{
 +    static int print_prefix = 1;
 +    if (logfile) {
 +        if (print_prefix) {
 +            char buf[32];
 +            ctime1(buf);
 +            fprintf(logfile, "%s ", buf);
 +        }
 +        print_prefix = strstr(fmt, "\n") != NULL;
 +        vfprintf(logfile, fmt, vargs);
 +        fflush(logfile);
 +    }
 +}
 +
 +#ifdef __GNUC__
 +__attribute__ ((format (printf, 1, 2)))
 +#endif
 +static void http_log(const char *fmt, ...)
 +{
 +    va_list vargs;
 +    va_start(vargs, fmt);
 +    http_vlog(fmt, vargs);
 +    va_end(vargs);
 +}
 +
 +static void http_av_log(void *ptr, int level, const char *fmt, va_list vargs)
 +{
 +    static int print_prefix = 1;
 +    AVClass *avc = ptr ? *(AVClass**)ptr : NULL;
 +    if (level > av_log_get_level())
 +        return;
 +    if (print_prefix && avc)
 +        http_log("[%s @ %p]", avc->item_name(ptr), ptr);
 +    print_prefix = strstr(fmt, "\n") != NULL;
 +    http_vlog(fmt, vargs);
 +}
 +
 +static void log_connection(HTTPContext *c)
 +{
 +    if (c->suppress_log)
 +        return;
 +
 +    http_log("%s - - [%s] \"%s %s\" %d %"PRId64"\n",
 +             inet_ntoa(c->from_addr.sin_addr), c->method, c->url,
 +             c->protocol, (c->http_error ? c->http_error : 200), c->data_count);
 +}
 +
 +static void update_datarate(DataRateData *drd, int64_t count)
 +{
 +    if (!drd->time1 && !drd->count1) {
 +        drd->time1 = drd->time2 = cur_time;
 +        drd->count1 = drd->count2 = count;
 +    } else if (cur_time - drd->time2 > 5000) {
 +        drd->time1 = drd->time2;
 +        drd->count1 = drd->count2;
 +        drd->time2 = cur_time;
 +        drd->count2 = count;
 +    }
 +}
 +
 +/* In bytes per second */
 +static int compute_datarate(DataRateData *drd, int64_t count)
 +{
 +    if (cur_time == drd->time1)
 +        return 0;
 +
 +    return ((count - drd->count1) * 1000) / (cur_time - drd->time1);
 +}
 +
 +
 +static void start_children(FFStream *feed)
 +{
 +    if (no_launch)
 +        return;
 +
 +    for (; feed; feed = feed->next) {
 +        if (feed->child_argv && !feed->pid) {
 +            feed->pid_start = time(0);
 +
 +            feed->pid = fork();
 +
 +            if (feed->pid < 0) {
 +                http_log("Unable to create children\n");
 +                exit(1);
 +            }
 +            if (!feed->pid) {
 +                /* In child */
 +                char pathname[1024];
 +                char *slash;
 +                int i;
 +
 +                av_strlcpy(pathname, my_program_name, sizeof(pathname));
 +
 +                slash = strrchr(pathname, '/');
 +                if (!slash)
 +                    slash = pathname;
 +                else
 +                    slash++;
 +                strcpy(slash, "ffmpeg");
 +
 +                http_log("Launch commandline: ");
 +                http_log("%s ", pathname);
 +                for (i = 1; feed->child_argv[i] && feed->child_argv[i][0]; i++)
 +                    http_log("%s ", feed->child_argv[i]);
 +                http_log("\n");
 +
 +                for (i = 3; i < 256; i++)
 +                    close(i);
 +
 +                if (!ffserver_debug) {
 +                    i = open("/dev/null", O_RDWR);
 +                    if (i != -1) {
 +                        dup2(i, 0);
 +                        dup2(i, 1);
 +                        dup2(i, 2);
 +                        close(i);
 +                    }
 +                }
 +
 +                /* This is needed to make relative pathnames work */
 +                chdir(my_program_dir);
 +
 +                signal(SIGPIPE, SIG_DFL);
 +
 +                execvp(pathname, feed->child_argv);
 +
 +                _exit(1);
 +            }
 +        }
 +    }
 +}
 +
 +/* open a listening socket */
 +static int socket_open_listen(struct sockaddr_in *my_addr)
 +{
 +    int server_fd, tmp;
 +
 +    server_fd = socket(AF_INET,SOCK_STREAM,0);
 +    if (server_fd < 0) {
 +        perror ("socket");
 +        return -1;
 +    }
 +
 +    tmp = 1;
 +    setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof(tmp));
 +
 +    my_addr->sin_family = AF_INET;
 +    if (bind (server_fd, (struct sockaddr *) my_addr, sizeof (*my_addr)) < 0) {
 +        char bindmsg[32];
 +        snprintf(bindmsg, sizeof(bindmsg), "bind(port %d)", ntohs(my_addr->sin_port));
 +        perror (bindmsg);
 +        closesocket(server_fd);
 +        return -1;
 +    }
 +
 +    if (listen (server_fd, 5) < 0) {
 +        perror ("listen");
 +        closesocket(server_fd);
 +        return -1;
 +    }
 +    ff_socket_nonblock(server_fd, 1);
 +
 +    return server_fd;
 +}
 +
 +/* start all multicast streams */
 +static void start_multicast(void)
 +{
 +    FFStream *stream;
 +    char session_id[32];
 +    HTTPContext *rtp_c;
 +    struct sockaddr_in dest_addr;
 +    int default_port, stream_index;
 +
 +    default_port = 6000;
 +    for(stream = first_stream; stream != NULL; stream = stream->next) {
 +        if (stream->is_multicast) {
 +            /* open the RTP connection */
 +            snprintf(session_id, sizeof(session_id), "%08x%08x",
 +                     av_lfg_get(&random_state), av_lfg_get(&random_state));
 +
 +            /* choose a port if none given */
 +            if (stream->multicast_port == 0) {
 +                stream->multicast_port = default_port;
 +                default_port += 100;
 +            }
 +
 +            dest_addr.sin_family = AF_INET;
 +            dest_addr.sin_addr = stream->multicast_ip;
 +            dest_addr.sin_port = htons(stream->multicast_port);
 +
 +            rtp_c = rtp_new_connection(&dest_addr, stream, session_id,
 +                                       RTSP_LOWER_TRANSPORT_UDP_MULTICAST);
 +            if (!rtp_c)
 +                continue;
 +
 +            if (open_input_stream(rtp_c, "") < 0) {
 +                http_log("Could not open input stream for stream '%s'\n",
 +                         stream->filename);
 +                continue;
 +            }
 +
 +            /* open each RTP stream */
 +            for(stream_index = 0; stream_index < stream->nb_streams;
 +                stream_index++) {
 +                dest_addr.sin_port = htons(stream->multicast_port +
 +                                           2 * stream_index);
 +                if (rtp_new_av_stream(rtp_c, stream_index, &dest_addr, NULL) < 0) {
 +                    http_log("Could not open output stream '%s/streamid=%d'\n",
 +                             stream->filename, stream_index);
 +                    exit(1);
 +                }
 +            }
 +
 +            /* change state to send data */
 +            rtp_c->state = HTTPSTATE_SEND_DATA;
 +        }
 +    }
 +}
 +
 +/* main loop of the http server */
 +static int http_server(void)
 +{
 +    int server_fd = 0, rtsp_server_fd = 0;
 +    int ret, delay, delay1;
 +    struct pollfd *poll_table, *poll_entry;
 +    HTTPContext *c, *c_next;
 +
 +    if(!(poll_table = av_mallocz((nb_max_http_connections + 2)*sizeof(*poll_table)))) {
 +        http_log("Impossible to allocate a poll table handling %d connections.\n", nb_max_http_connections);
 +        return -1;
 +    }
 +
 +    if (my_http_addr.sin_port) {
 +        server_fd = socket_open_listen(&my_http_addr);
 +        if (server_fd < 0)
 +            return -1;
 +    }
 +
 +    if (my_rtsp_addr.sin_port) {
 +        rtsp_server_fd = socket_open_listen(&my_rtsp_addr);
 +        if (rtsp_server_fd < 0)
 +            return -1;
 +    }
 +
 +    if (!rtsp_server_fd && !server_fd) {
 +        http_log("HTTP and RTSP disabled.\n");
 +        return -1;
 +    }
 +
 +    http_log("FFserver started.\n");
 +
 +    start_children(first_feed);
 +
 +    start_multicast();
 +
 +    for(;;) {
 +        poll_entry = poll_table;
 +        if (server_fd) {
 +            poll_entry->fd = server_fd;
 +            poll_entry->events = POLLIN;
 +            poll_entry++;
 +        }
 +        if (rtsp_server_fd) {
 +            poll_entry->fd = rtsp_server_fd;
 +            poll_entry->events = POLLIN;
 +            poll_entry++;
 +        }
 +
 +        /* wait for events on each HTTP handle */
 +        c = first_http_ctx;
 +        delay = 1000;
 +        while (c != NULL) {
 +            int fd;
 +            fd = c->fd;
 +            switch(c->state) {
 +            case HTTPSTATE_SEND_HEADER:
 +            case RTSPSTATE_SEND_REPLY:
 +            case RTSPSTATE_SEND_PACKET:
 +                c->poll_entry = poll_entry;
 +                poll_entry->fd = fd;
 +                poll_entry->events = POLLOUT;
 +                poll_entry++;
 +                break;
 +            case HTTPSTATE_SEND_DATA_HEADER:
 +            case HTTPSTATE_SEND_DATA:
 +            case HTTPSTATE_SEND_DATA_TRAILER:
 +                if (!c->is_packetized) {
 +                    /* for TCP, we output as much as we can (may need to put a limit) */
 +                    c->poll_entry = poll_entry;
 +                    poll_entry->fd = fd;
 +                    poll_entry->events = POLLOUT;
 +                    poll_entry++;
 +                } else {
 +                    /* when ffserver is doing the timing, we work by
 +                       looking at which packet need to be sent every
 +                       10 ms */
 +                    delay1 = 10; /* one tick wait XXX: 10 ms assumed */
 +                    if (delay1 < delay)
 +                        delay = delay1;
 +                }
 +                break;
 +            case HTTPSTATE_WAIT_REQUEST:
 +            case HTTPSTATE_RECEIVE_DATA:
 +            case HTTPSTATE_WAIT_FEED:
 +            case RTSPSTATE_WAIT_REQUEST:
 +                /* need to catch errors */
 +                c->poll_entry = poll_entry;
 +                poll_entry->fd = fd;
 +                poll_entry->events = POLLIN;/* Maybe this will work */
 +                poll_entry++;
 +                break;
 +            default:
 +                c->poll_entry = NULL;
 +                break;
 +            }
 +            c = c->next;
 +        }
 +
 +        /* wait for an event on one connection. We poll at least every
 +           second to handle timeouts */
 +        do {
 +            ret = poll(poll_table, poll_entry - poll_table, delay);
 +            if (ret < 0 && ff_neterrno() != AVERROR(EAGAIN) &&
 +                ff_neterrno() != AVERROR(EINTR))
 +                return -1;
 +        } while (ret < 0);
 +
 +        cur_time = av_gettime() / 1000;
 +
 +        if (need_to_start_children) {
 +            need_to_start_children = 0;
 +            start_children(first_feed);
 +        }
 +
 +        /* now handle the events */
 +        for(c = first_http_ctx; c != NULL; c = c_next) {
 +            c_next = c->next;
 +            if (handle_connection(c) < 0) {
 +                /* close and free the connection */
 +                log_connection(c);
 +                close_connection(c);
 +            }
 +        }
 +
 +        poll_entry = poll_table;
 +        if (server_fd) {
 +            /* new HTTP connection request ? */
 +            if (poll_entry->revents & POLLIN)
 +                new_connection(server_fd, 0);
 +            poll_entry++;
 +        }
 +        if (rtsp_server_fd) {
 +            /* new RTSP connection request ? */
 +            if (poll_entry->revents & POLLIN)
 +                new_connection(rtsp_server_fd, 1);
 +        }
 +    }
 +}
 +
 +/* start waiting for a new HTTP/RTSP request */
 +static void start_wait_request(HTTPContext *c, int is_rtsp)
 +{
 +    c->buffer_ptr = c->buffer;
 +    c->buffer_end = c->buffer + c->buffer_size - 1; /* leave room for '\0' */
 +
 +    if (is_rtsp) {
 +        c->timeout = cur_time + RTSP_REQUEST_TIMEOUT;
 +        c->state = RTSPSTATE_WAIT_REQUEST;
 +    } else {
 +        c->timeout = cur_time + HTTP_REQUEST_TIMEOUT;
 +        c->state = HTTPSTATE_WAIT_REQUEST;
 +    }
 +}
 +
 +static void http_send_too_busy_reply(int fd)
 +{
 +    char buffer[300];
 +    int len = snprintf(buffer, sizeof(buffer),
 +                       "HTTP/1.0 503 Server too busy\r\n"
 +                       "Content-type: text/html\r\n"
 +                       "\r\n"
 +                       "<html><head><title>Too busy</title></head><body>\r\n"
 +                       "<p>The server is too busy to serve your request at this time.</p>\r\n"
 +                       "<p>The number of current connections is %d, and this exceeds the limit of %d.</p>\r\n"
 +                       "</body></html>\r\n",
 +                       nb_connections, nb_max_connections);
 +    send(fd, buffer, len, 0);
 +}
 +
 +
 +static void new_connection(int server_fd, int is_rtsp)
 +{
 +    struct sockaddr_in from_addr;
 +    int fd, len;
 +    HTTPContext *c = NULL;
 +
 +    len = sizeof(from_addr);
 +    fd = accept(server_fd, (struct sockaddr *)&from_addr,
 +                &len);
 +    if (fd < 0) {
 +        http_log("error during accept %s\n", strerror(errno));
 +        return;
 +    }
 +    ff_socket_nonblock(fd, 1);
 +
 +    if (nb_connections >= nb_max_connections) {
 +        http_send_too_busy_reply(fd);
 +        goto fail;
 +    }
 +
 +    /* add a new connection */
 +    c = av_mallocz(sizeof(HTTPContext));
 +    if (!c)
 +        goto fail;
 +
 +    c->fd = fd;
 +    c->poll_entry = NULL;
 +    c->from_addr = from_addr;
 +    c->buffer_size = IOBUFFER_INIT_SIZE;
 +    c->buffer = av_malloc(c->buffer_size);
 +    if (!c->buffer)
 +        goto fail;
 +
 +    c->next = first_http_ctx;
 +    first_http_ctx = c;
 +    nb_connections++;
 +
 +    start_wait_request(c, is_rtsp);
 +
 +    return;
 +
 + fail:
 +    if (c) {
 +        av_free(c->buffer);
 +        av_free(c);
 +    }
 +    closesocket(fd);
 +}
 +
 +static void close_connection(HTTPContext *c)
 +{
 +    HTTPContext **cp, *c1;
 +    int i, nb_streams;
 +    AVFormatContext *ctx;
 +    URLContext *h;
 +    AVStream *st;
 +
 +    /* remove connection from list */
 +    cp = &first_http_ctx;
 +    while ((*cp) != NULL) {
 +        c1 = *cp;
 +        if (c1 == c)
 +            *cp = c->next;
 +        else
 +            cp = &c1->next;
 +    }
 +
 +    /* remove references, if any (XXX: do it faster) */
 +    for(c1 = first_http_ctx; c1 != NULL; c1 = c1->next) {
 +        if (c1->rtsp_c == c)
 +            c1->rtsp_c = NULL;
 +    }
 +
 +    /* remove connection associated resources */
 +    if (c->fd >= 0)
 +        closesocket(c->fd);
 +    if (c->fmt_in) {
 +        /* close each frame parser */
 +        for(i=0;i<c->fmt_in->nb_streams;i++) {
 +            st = c->fmt_in->streams[i];
 +            if (st->codec->codec)
 +                avcodec_close(st->codec);
 +        }
 +        av_close_input_file(c->fmt_in);
 +    }
 +
 +    /* free RTP output streams if any */
 +    nb_streams = 0;
 +    if (c->stream)
 +        nb_streams = c->stream->nb_streams;
 +
 +    for(i=0;i<nb_streams;i++) {
 +        ctx = c->rtp_ctx[i];
 +        if (ctx) {
 +            av_write_trailer(ctx);
 +            av_dict_free(&ctx->metadata);
 +            av_free(ctx->streams[0]);
 +            av_free(ctx);
 +        }
 +        h = c->rtp_handles[i];
 +        if (h)
 +            url_close(h);
 +    }
 +
 +    ctx = &c->fmt_ctx;
 +
 +    if (!c->last_packet_sent && c->state == HTTPSTATE_SEND_DATA_TRAILER) {
 +        if (ctx->oformat) {
 +            /* prepare header */
 +            if (avio_open_dyn_buf(&ctx->pb) >= 0) {
 +                av_write_trailer(ctx);
 +                av_freep(&c->pb_buffer);
 +                avio_close_dyn_buf(ctx->pb, &c->pb_buffer);
 +            }
 +        }
 +    }
 +
 +    for(i=0; i<ctx->nb_streams; i++)
 +        av_free(ctx->streams[i]);
 +
 +    if (c->stream && !c->post && c->stream->stream_type == STREAM_TYPE_LIVE)
 +        current_bandwidth -= c->stream->bandwidth;
 +
 +    /* signal that there is no feed if we are the feeder socket */
 +    if (c->state == HTTPSTATE_RECEIVE_DATA && c->stream) {
 +        c->stream->feed_opened = 0;
 +        close(c->feed_fd);
 +    }
 +
 +    av_freep(&c->pb_buffer);
 +    av_freep(&c->packet_buffer);
 +    av_free(c->buffer);
 +    av_free(c);
 +    nb_connections--;
 +}
 +
 +static int handle_connection(HTTPContext *c)
 +{
 +    int len, ret;
 +
 +    switch(c->state) {
 +    case HTTPSTATE_WAIT_REQUEST:
 +    case RTSPSTATE_WAIT_REQUEST:
 +        /* timeout ? */
 +        if ((c->timeout - cur_time) < 0)
 +            return -1;
 +        if (c->poll_entry->revents & (POLLERR | POLLHUP))
 +            return -1;
 +
 +        /* no need to read if no events */
 +        if (!(c->poll_entry->revents & POLLIN))
 +            return 0;
 +        /* read the data */
 +    read_loop:
 +        len = recv(c->fd, c->buffer_ptr, 1, 0);
 +        if (len < 0) {
 +            if (ff_neterrno() != AVERROR(EAGAIN) &&
 +                ff_neterrno() != AVERROR(EINTR))
 +                return -1;
 +        } else if (len == 0) {
 +            return -1;
 +        } else {
 +            /* search for end of request. */
 +            uint8_t *ptr;
 +            c->buffer_ptr += len;
 +            ptr = c->buffer_ptr;
 +            if ((ptr >= c->buffer + 2 && !memcmp(ptr-2, "\n\n", 2)) ||
 +                (ptr >= c->buffer + 4 && !memcmp(ptr-4, "\r\n\r\n", 4))) {
 +                /* request found : parse it and reply */
 +                if (c->state == HTTPSTATE_WAIT_REQUEST) {
 +                    ret = http_parse_request(c);
 +                } else {
 +                    ret = rtsp_parse_request(c);
 +                }
 +                if (ret < 0)
 +                    return -1;
 +            } else if (ptr >= c->buffer_end) {
 +                /* request too long: cannot do anything */
 +                return -1;
 +            } else goto read_loop;
 +        }
 +        break;
 +
 +    case HTTPSTATE_SEND_HEADER:
 +        if (c->poll_entry->revents & (POLLERR | POLLHUP))
 +            return -1;
 +
 +        /* no need to write if no events */
 +        if (!(c->poll_entry->revents & POLLOUT))
 +            return 0;
 +        len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0);
 +        if (len < 0) {
 +            if (ff_neterrno() != AVERROR(EAGAIN) &&
 +                ff_neterrno() != AVERROR(EINTR)) {
 +                /* error : close connection */
 +                av_freep(&c->pb_buffer);
 +                return -1;
 +            }
 +        } else {
 +            c->buffer_ptr += len;
 +            if (c->stream)
 +                c->stream->bytes_served += len;
 +            c->data_count += len;
 +            if (c->buffer_ptr >= c->buffer_end) {
 +                av_freep(&c->pb_buffer);
 +                /* if error, exit */
 +                if (c->http_error)
 +                    return -1;
 +                /* all the buffer was sent : synchronize to the incoming stream */
 +                c->state = HTTPSTATE_SEND_DATA_HEADER;
 +                c->buffer_ptr = c->buffer_end = c->buffer;
 +            }
 +        }
 +        break;
 +
 +    case HTTPSTATE_SEND_DATA:
 +    case HTTPSTATE_SEND_DATA_HEADER:
 +    case HTTPSTATE_SEND_DATA_TRAILER:
 +        /* for packetized output, we consider we can always write (the
 +           input streams sets the speed). It may be better to verify
 +           that we do not rely too much on the kernel queues */
 +        if (!c->is_packetized) {
 +            if (c->poll_entry->revents & (POLLERR | POLLHUP))
 +                return -1;
 +
 +            /* no need to read if no events */
 +            if (!(c->poll_entry->revents & POLLOUT))
 +                return 0;
 +        }
 +        if (http_send_data(c) < 0)
 +            return -1;
 +        /* close connection if trailer sent */
 +        if (c->state == HTTPSTATE_SEND_DATA_TRAILER)
 +            return -1;
 +        break;
 +    case HTTPSTATE_RECEIVE_DATA:
 +        /* no need to read if no events */
 +        if (c->poll_entry->revents & (POLLERR | POLLHUP))
 +            return -1;
 +        if (!(c->poll_entry->revents & POLLIN))
 +            return 0;
 +        if (http_receive_data(c) < 0)
 +            return -1;
 +        break;
 +    case HTTPSTATE_WAIT_FEED:
 +        /* no need to read if no events */
 +        if (c->poll_entry->revents & (POLLIN | POLLERR | POLLHUP))
 +            return -1;
 +
 +        /* nothing to do, we'll be waken up by incoming feed packets */
 +        break;
 +
 +    case RTSPSTATE_SEND_REPLY:
 +        if (c->poll_entry->revents & (POLLERR | POLLHUP)) {
 +            av_freep(&c->pb_buffer);
 +            return -1;
 +        }
 +        /* no need to write if no events */
 +        if (!(c->poll_entry->revents & POLLOUT))
 +            return 0;
 +        len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0);
 +        if (len < 0) {
 +            if (ff_neterrno() != AVERROR(EAGAIN) &&
 +                ff_neterrno() != AVERROR(EINTR)) {
 +                /* error : close connection */
 +                av_freep(&c->pb_buffer);
 +                return -1;
 +            }
 +        } else {
 +            c->buffer_ptr += len;
 +            c->data_count += len;
 +            if (c->buffer_ptr >= c->buffer_end) {
 +                /* all the buffer was sent : wait for a new request */
 +                av_freep(&c->pb_buffer);
 +                start_wait_request(c, 1);
 +            }
 +        }
 +        break;
 +    case RTSPSTATE_SEND_PACKET:
 +        if (c->poll_entry->revents & (POLLERR | POLLHUP)) {
 +            av_freep(&c->packet_buffer);
 +            return -1;
 +        }
 +        /* no need to write if no events */
 +        if (!(c->poll_entry->revents & POLLOUT))
 +            return 0;
 +        len = send(c->fd, c->packet_buffer_ptr,
 +                    c->packet_buffer_end - c->packet_buffer_ptr, 0);
 +        if (len < 0) {
 +            if (ff_neterrno() != AVERROR(EAGAIN) &&
 +                ff_neterrno() != AVERROR(EINTR)) {
 +                /* error : close connection */
 +                av_freep(&c->packet_buffer);
 +                return -1;
 +            }
 +        } else {
 +            c->packet_buffer_ptr += len;
 +            if (c->packet_buffer_ptr >= c->packet_buffer_end) {
 +                /* all the buffer was sent : wait for a new request */
 +                av_freep(&c->packet_buffer);
 +                c->state = RTSPSTATE_WAIT_REQUEST;
 +            }
 +        }
 +        break;
 +    case HTTPSTATE_READY:
 +        /* nothing to do */
 +        break;
 +    default:
 +        return -1;
 +    }
 +    return 0;
 +}
 +
 +static int extract_rates(char *rates, int ratelen, const char *request)
 +{
 +    const char *p;
 +
 +    for (p = request; *p && *p != '\r' && *p != '\n'; ) {
-             if (strncasecmp(q, "stream-switch-entry=", 20) == 0) {
++        if (av_strncasecmp(p, "Pragma:", 7) == 0) {
 +            const char *q = p + 7;
 +
 +            while (*q && *q != '\n' && isspace(*q))
 +                q++;
 +
-     if (strcasecmp(arg, "allow") == 0)
++            if (av_strncasecmp(q, "stream-switch-entry=", 20) == 0) {
 +                int stream_no;
 +                int rate_no;
 +
 +                q += 20;
 +
 +                memset(rates, 0xff, ratelen);
 +
 +                while (1) {
 +                    while (*q && *q != '\n' && *q != ':')
 +                        q++;
 +
 +                    if (sscanf(q, ":%d:%d", &stream_no, &rate_no) != 2)
 +                        break;
 +
 +                    stream_no--;
 +                    if (stream_no < ratelen && stream_no >= 0)
 +                        rates[stream_no] = rate_no;
 +
 +                    while (*q && *q != '\n' && !isspace(*q))
 +                        q++;
 +                }
 +
 +                return 1;
 +            }
 +        }
 +        p = strchr(p, '\n');
 +        if (!p)
 +            break;
 +
 +        p++;
 +    }
 +
 +    return 0;
 +}
 +
 +static int find_stream_in_feed(FFStream *feed, AVCodecContext *codec, int bit_rate)
 +{
 +    int i;
 +    int best_bitrate = 100000000;
 +    int best = -1;
 +
 +    for (i = 0; i < feed->nb_streams; i++) {
 +        AVCodecContext *feed_codec = feed->streams[i]->codec;
 +
 +        if (feed_codec->codec_id != codec->codec_id ||
 +            feed_codec->sample_rate != codec->sample_rate ||
 +            feed_codec->width != codec->width ||
 +            feed_codec->height != codec->height)
 +            continue;
 +
 +        /* Potential stream */
 +
 +        /* We want the fastest stream less than bit_rate, or the slowest
 +         * faster than bit_rate
 +         */
 +
 +        if (feed_codec->bit_rate <= bit_rate) {
 +            if (best_bitrate > bit_rate || feed_codec->bit_rate > best_bitrate) {
 +                best_bitrate = feed_codec->bit_rate;
 +                best = i;
 +            }
 +        } else {
 +            if (feed_codec->bit_rate < best_bitrate) {
 +                best_bitrate = feed_codec->bit_rate;
 +                best = i;
 +            }
 +        }
 +    }
 +
 +    return best;
 +}
 +
 +static int modify_current_stream(HTTPContext *c, char *rates)
 +{
 +    int i;
 +    FFStream *req = c->stream;
 +    int action_required = 0;
 +
 +    /* Not much we can do for a feed */
 +    if (!req->feed)
 +        return 0;
 +
 +    for (i = 0; i < req->nb_streams; i++) {
 +        AVCodecContext *codec = req->streams[i]->codec;
 +
 +        switch(rates[i]) {
 +            case 0:
 +                c->switch_feed_streams[i] = req->feed_streams[i];
 +                break;
 +            case 1:
 +                c->switch_feed_streams[i] = find_stream_in_feed(req->feed, codec, codec->bit_rate / 2);
 +                break;
 +            case 2:
 +                /* Wants off or slow */
 +                c->switch_feed_streams[i] = find_stream_in_feed(req->feed, codec, codec->bit_rate / 4);
 +#ifdef WANTS_OFF
 +                /* This doesn't work well when it turns off the only stream! */
 +                c->switch_feed_streams[i] = -2;
 +                c->feed_streams[i] = -2;
 +#endif
 +                break;
 +        }
 +
 +        if (c->switch_feed_streams[i] >= 0 && c->switch_feed_streams[i] != c->feed_streams[i])
 +            action_required = 1;
 +    }
 +
 +    return action_required;
 +}
 +
 +/* XXX: factorize in utils.c ? */
 +/* XXX: take care with different space meaning */
 +static void skip_spaces(const char **pp)
 +{
 +    const char *p;
 +    p = *pp;
 +    while (*p == ' ' || *p == '\t')
 +        p++;
 +    *pp = p;
 +}
 +
 +static void get_word(char *buf, int buf_size, const char **pp)
 +{
 +    const char *p;
 +    char *q;
 +
 +    p = *pp;
 +    skip_spaces(&p);
 +    q = buf;
 +    while (!isspace(*p) && *p != '\0') {
 +        if ((q - buf) < buf_size - 1)
 +            *q++ = *p;
 +        p++;
 +    }
 +    if (buf_size > 0)
 +        *q = '\0';
 +    *pp = p;
 +}
 +
 +static void get_arg(char *buf, int buf_size, const char **pp)
 +{
 +    const char *p;
 +    char *q;
 +    int quote;
 +
 +    p = *pp;
 +    while (isspace(*p)) p++;
 +    q = buf;
 +    quote = 0;
 +    if (*p == '\"' || *p == '\'')
 +        quote = *p++;
 +    for(;;) {
 +        if (quote) {
 +            if (*p == quote)
 +                break;
 +        } else {
 +            if (isspace(*p))
 +                break;
 +        }
 +        if (*p == '\0')
 +            break;
 +        if ((q - buf) < buf_size - 1)
 +            *q++ = *p;
 +        p++;
 +    }
 +    *q = '\0';
 +    if (quote && *p == quote)
 +        p++;
 +    *pp = p;
 +}
 +
 +static void parse_acl_row(FFStream *stream, FFStream* feed, IPAddressACL *ext_acl,
 +                         const char *p, const char *filename, int line_num)
 +{
 +    char arg[1024];
 +    IPAddressACL acl;
 +    int errors = 0;
 +
 +    get_arg(arg, sizeof(arg), &p);
-     else if (strcasecmp(arg, "deny") == 0)
++    if (av_strcasecmp(arg, "allow") == 0)
 +        acl.action = IP_ALLOW;
-         if (!strcasecmp(cmd, "ACL"))
++    else if (av_strcasecmp(arg, "deny") == 0)
 +        acl.action = IP_DENY;
 +    else {
 +        fprintf(stderr, "%s:%d: ACL action '%s' is not ALLOW or DENY\n",
 +                filename, line_num, arg);
 +        errors++;
 +    }
 +
 +    get_arg(arg, sizeof(arg), &p);
 +
 +    if (resolve_host(&acl.first, arg) != 0) {
 +        fprintf(stderr, "%s:%d: ACL refers to invalid host or ip address '%s'\n",
 +                filename, line_num, arg);
 +        errors++;
 +    } else
 +        acl.last = acl.first;
 +
 +    get_arg(arg, sizeof(arg), &p);
 +
 +    if (arg[0]) {
 +        if (resolve_host(&acl.last, arg) != 0) {
 +            fprintf(stderr, "%s:%d: ACL refers to invalid host or ip address '%s'\n",
 +                    filename, line_num, arg);
 +            errors++;
 +        }
 +    }
 +
 +    if (!errors) {
 +        IPAddressACL *nacl = av_mallocz(sizeof(*nacl));
 +        IPAddressACL **naclp = 0;
 +
 +        acl.next = 0;
 +        *nacl = acl;
 +
 +        if (stream)
 +            naclp = &stream->acl;
 +        else if (feed)
 +            naclp = &feed->acl;
 +        else if (ext_acl)
 +            naclp = &ext_acl;
 +        else {
 +            fprintf(stderr, "%s:%d: ACL found not in <stream> or <feed>\n",
 +                    filename, line_num);
 +            errors++;
 +        }
 +
 +        if (naclp) {
 +            while (*naclp)
 +                naclp = &(*naclp)->next;
 +
 +            *naclp = nacl;
 +        }
 +    }
 +}
 +
 +
 +static IPAddressACL* parse_dynamic_acl(FFStream *stream, HTTPContext *c)
 +{
 +    FILE* f;
 +    char line[1024];
 +    char  cmd[1024];
 +    IPAddressACL *acl = NULL;
 +    int line_num = 0;
 +    const char *p;
 +
 +    f = fopen(stream->dynamic_acl, "r");
 +    if (!f) {
 +        perror(stream->dynamic_acl);
 +        return NULL;
 +    }
 +
 +    acl = av_mallocz(sizeof(IPAddressACL));
 +
 +    /* Build ACL */
 +    for(;;) {
 +        if (fgets(line, sizeof(line), f) == NULL)
 +            break;
 +        line_num++;
 +        p = line;
 +        while (isspace(*p))
 +            p++;
 +        if (*p == '\0' || *p == '#')
 +            continue;
 +        get_arg(cmd, sizeof(cmd), &p);
 +
-         if (strncasecmp(p, "User-Agent:", 11) == 0) {
++        if (!av_strcasecmp(cmd, "ACL"))
 +            parse_acl_row(NULL, NULL, acl, p, stream->dynamic_acl, line_num);
 +    }
 +    fclose(f);
 +    return acl;
 +}
 +
 +
 +static void free_acl_list(IPAddressACL *in_acl)
 +{
 +    IPAddressACL *pacl,*pacl2;
 +
 +    pacl = in_acl;
 +    while(pacl) {
 +        pacl2 = pacl;
 +        pacl = pacl->next;
 +        av_freep(pacl2);
 +    }
 +}
 +
 +static int validate_acl_list(IPAddressACL *in_acl, HTTPContext *c)
 +{
 +    enum IPAddressAction last_action = IP_DENY;
 +    IPAddressACL *acl;
 +    struct in_addr *src = &c->from_addr.sin_addr;
 +    unsigned long src_addr = src->s_addr;
 +
 +    for (acl = in_acl; acl; acl = acl->next) {
 +        if (src_addr >= acl->first.s_addr && src_addr <= acl->last.s_addr)
 +            return (acl->action == IP_ALLOW) ? 1 : 0;
 +        last_action = acl->action;
 +    }
 +
 +    /* Nothing matched, so return not the last action */
 +    return (last_action == IP_DENY) ? 1 : 0;
 +}
 +
 +static int validate_acl(FFStream *stream, HTTPContext *c)
 +{
 +    int ret = 0;
 +    IPAddressACL *acl;
 +
 +
 +    /* if stream->acl is null validate_acl_list will return 1 */
 +    ret = validate_acl_list(stream->acl, c);
 +
 +    if (stream->dynamic_acl[0]) {
 +        acl = parse_dynamic_acl(stream, c);
 +
 +        ret = validate_acl_list(acl, c);
 +
 +        free_acl_list(acl);
 +    }
 +
 +    return ret;
 +}
 +
 +/* compute the real filename of a file by matching it without its
 +   extensions to all the stream filenames */
 +static void compute_real_filename(char *filename, int max_size)
 +{
 +    char file1[1024];
 +    char file2[1024];
 +    char *p;
 +    FFStream *stream;
 +
 +    /* compute filename by matching without the file extensions */
 +    av_strlcpy(file1, filename, sizeof(file1));
 +    p = strrchr(file1, '.');
 +    if (p)
 +        *p = '\0';
 +    for(stream = first_stream; stream != NULL; stream = stream->next) {
 +        av_strlcpy(file2, stream->filename, sizeof(file2));
 +        p = strrchr(file2, '.');
 +        if (p)
 +            *p = '\0';
 +        if (!strcmp(file1, file2)) {
 +            av_strlcpy(filename, stream->filename, max_size);
 +            break;
 +        }
 +    }
 +}
 +
 +enum RedirType {
 +    REDIR_NONE,
 +    REDIR_ASX,
 +    REDIR_RAM,
 +    REDIR_ASF,
 +    REDIR_RTSP,
 +    REDIR_SDP,
 +};
 +
 +/* parse http request and prepare header */
 +static int http_parse_request(HTTPContext *c)
 +{
 +    char *p;
 +    enum RedirType redir_type;
 +    char cmd[32];
 +    char info[1024], filename[1024];
 +    char url[1024], *q;
 +    char protocol[32];
 +    char msg[1024];
 +    const char *mime_type;
 +    FFStream *stream;
 +    int i;
 +    char ratebuf[32];
 +    char *useragent = 0;
 +
 +    p = c->buffer;
 +    get_word(cmd, sizeof(cmd), (const char **)&p);
 +    av_strlcpy(c->method, cmd, sizeof(c->method));
 +
 +    if (!strcmp(cmd, "GET"))
 +        c->post = 0;
 +    else if (!strcmp(cmd, "POST"))
 +        c->post = 1;
 +    else
 +        return -1;
 +
 +    get_word(url, sizeof(url), (const char **)&p);
 +    av_strlcpy(c->url, url, sizeof(c->url));
 +
 +    get_word(protocol, sizeof(protocol), (const char **)&p);
 +    if (strcmp(protocol, "HTTP/1.0") && strcmp(protocol, "HTTP/1.1"))
 +        return -1;
 +
 +    av_strlcpy(c->protocol, protocol, sizeof(c->protocol));
 +
 +    if (ffserver_debug)
 +        http_log("%s - - New connection: %s %s\n", inet_ntoa(c->from_addr.sin_addr), cmd, url);
 +
 +    /* find the filename and the optional info string in the request */
 +    p = strchr(url, '?');
 +    if (p) {
 +        av_strlcpy(info, p, sizeof(info));
 +        *p = '\0';
 +    } else
 +        info[0] = '\0';
 +
 +    av_strlcpy(filename, url + ((*url == '/') ? 1 : 0), sizeof(filename)-1);
 +
 +    for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) {
-         (!useragent || strncasecmp(useragent, "NSPlayer", 8) != 0)) {
++        if (av_strncasecmp(p, "User-Agent:", 11) == 0) {
 +            useragent = p + 11;
 +            if (*useragent && *useragent != '\n' && isspace(*useragent))
 +                useragent++;
 +            break;
 +        }
 +        p = strchr(p, '\n');
 +        if (!p)
 +            break;
 +
 +        p++;
 +    }
 +
 +    redir_type = REDIR_NONE;
 +    if (av_match_ext(filename, "asx")) {
 +        redir_type = REDIR_ASX;
 +        filename[strlen(filename)-1] = 'f';
 +    } else if (av_match_ext(filename, "asf") &&
-             if (strncasecmp(p, "Host:", 5) == 0) {
++        (!useragent || av_strncasecmp(useragent, "NSPlayer", 8) != 0)) {
 +        /* if this isn't WMP or lookalike, return the redirector file */
 +        redir_type = REDIR_ASF;
 +    } else if (av_match_ext(filename, "rpm,ram")) {
 +        redir_type = REDIR_RAM;
 +        strcpy(filename + strlen(filename)-2, "m");
 +    } else if (av_match_ext(filename, "rtsp")) {
 +        redir_type = REDIR_RTSP;
 +        compute_real_filename(filename, sizeof(filename) - 1);
 +    } else if (av_match_ext(filename, "sdp")) {
 +        redir_type = REDIR_SDP;
 +        compute_real_filename(filename, sizeof(filename) - 1);
 +    }
 +
 +    // "redirect" / request to index.html
 +    if (!strlen(filename))
 +        av_strlcpy(filename, "index.html", sizeof(filename) - 1);
 +
 +    stream = first_stream;
 +    while (stream != NULL) {
 +        if (!strcmp(stream->filename, filename) && validate_acl(stream, c))
 +            break;
 +        stream = stream->next;
 +    }
 +    if (stream == NULL) {
 +        snprintf(msg, sizeof(msg), "File '%s' not found", url);
 +        http_log("File '%s' not found\n", url);
 +        goto send_error;
 +    }
 +
 +    c->stream = stream;
 +    memcpy(c->feed_streams, stream->feed_streams, sizeof(c->feed_streams));
 +    memset(c->switch_feed_streams, -1, sizeof(c->switch_feed_streams));
 +
 +    if (stream->stream_type == STREAM_TYPE_REDIRECT) {
 +        c->http_error = 301;
 +        q = c->buffer;
 +        q += snprintf(q, c->buffer_size,
 +                      "HTTP/1.0 301 Moved\r\n"
 +                      "Location: %s\r\n"
 +                      "Content-type: text/html\r\n"
 +                      "\r\n"
 +                      "<html><head><title>Moved</title></head><body>\r\n"
 +                      "You should be <a href=\"%s\">redirected</a>.\r\n"
 +                      "</body></html>\r\n", stream->feed_filename, stream->feed_filename);
 +        /* prepare output buffer */
 +        c->buffer_ptr = c->buffer;
 +        c->buffer_end = q;
 +        c->state = HTTPSTATE_SEND_HEADER;
 +        return 0;
 +    }
 +
 +    /* If this is WMP, get the rate information */
 +    if (extract_rates(ratebuf, sizeof(ratebuf), c->buffer)) {
 +        if (modify_current_stream(c, ratebuf)) {
 +            for (i = 0; i < FF_ARRAY_ELEMS(c->feed_streams); i++) {
 +                if (c->switch_feed_streams[i] >= 0)
 +                    c->switch_feed_streams[i] = -1;
 +            }
 +        }
 +    }
 +
 +    if (c->post == 0 && stream->stream_type == STREAM_TYPE_LIVE)
 +        current_bandwidth += stream->bandwidth;
 +
 +    /* If already streaming this feed, do not let start another feeder. */
 +    if (stream->feed_opened) {
 +        snprintf(msg, sizeof(msg), "This feed is already being received.");
 +        http_log("Feed '%s' already being received\n", stream->feed_filename);
 +        goto send_error;
 +    }
 +
 +    if (c->post == 0 && max_bandwidth < current_bandwidth) {
 +        c->http_error = 503;
 +        q = c->buffer;
 +        q += snprintf(q, c->buffer_size,
 +                      "HTTP/1.0 503 Server too busy\r\n"
 +                      "Content-type: text/html\r\n"
 +                      "\r\n"
 +                      "<html><head><title>Too busy</title></head><body>\r\n"
 +                      "<p>The server is too busy to serve your request at this time.</p>\r\n"
 +                      "<p>The bandwidth being served (including your stream) is %"PRIu64"kbit/sec, "
 +                      "and this exceeds the limit of %"PRIu64"kbit/sec.</p>\r\n"
 +                      "</body></html>\r\n", current_bandwidth, max_bandwidth);
 +        /* prepare output buffer */
 +        c->buffer_ptr = c->buffer;
 +        c->buffer_end = q;
 +        c->state = HTTPSTATE_SEND_HEADER;
 +        return 0;
 +    }
 +
 +    if (redir_type != REDIR_NONE) {
 +        char *hostinfo = 0;
 +
 +        for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) {
-                 if (strncasecmp(p, "Pragma: log-line=", 17) == 0) {
++            if (av_strncasecmp(p, "Host:", 5) == 0) {
 +                hostinfo = p + 5;
 +                break;
 +            }
 +            p = strchr(p, '\n');
 +            if (!p)
 +                break;
 +
 +            p++;
 +        }
 +
 +        if (hostinfo) {
 +            char *eoh;
 +            char hostbuf[260];
 +
 +            while (isspace(*hostinfo))
 +                hostinfo++;
 +
 +            eoh = strchr(hostinfo, '\n');
 +            if (eoh) {
 +                if (eoh[-1] == '\r')
 +                    eoh--;
 +
 +                if (eoh - hostinfo < sizeof(hostbuf) - 1) {
 +                    memcpy(hostbuf, hostinfo, eoh - hostinfo);
 +                    hostbuf[eoh - hostinfo] = 0;
 +
 +                    c->http_error = 200;
 +                    q = c->buffer;
 +                    switch(redir_type) {
 +                    case REDIR_ASX:
 +                        q += snprintf(q, c->buffer_size,
 +                                      "HTTP/1.0 200 ASX Follows\r\n"
 +                                      "Content-type: video/x-ms-asf\r\n"
 +                                      "\r\n"
 +                                      "<ASX Version=\"3\">\r\n"
 +                                      //"<!-- Autogenerated by ffserver -->\r\n"
 +                                      "<ENTRY><REF HREF=\"http://%s/%s%s\"/></ENTRY>\r\n"
 +                                      "</ASX>\r\n", hostbuf, filename, info);
 +                        break;
 +                    case REDIR_RAM:
 +                        q += snprintf(q, c->buffer_size,
 +                                      "HTTP/1.0 200 RAM Follows\r\n"
 +                                      "Content-type: audio/x-pn-realaudio\r\n"
 +                                      "\r\n"
 +                                      "# Autogenerated by ffserver\r\n"
 +                                      "http://%s/%s%s\r\n", hostbuf, filename, info);
 +                        break;
 +                    case REDIR_ASF:
 +                        q += snprintf(q, c->buffer_size,
 +                                      "HTTP/1.0 200 ASF Redirect follows\r\n"
 +                                      "Content-type: video/x-ms-asf\r\n"
 +                                      "\r\n"
 +                                      "[Reference]\r\n"
 +                                      "Ref1=http://%s/%s%s\r\n", hostbuf, filename, info);
 +                        break;
 +                    case REDIR_RTSP:
 +                        {
 +                            char hostname[256], *p;
 +                            /* extract only hostname */
 +                            av_strlcpy(hostname, hostbuf, sizeof(hostname));
 +                            p = strrchr(hostname, ':');
 +                            if (p)
 +                                *p = '\0';
 +                            q += snprintf(q, c->buffer_size,
 +                                          "HTTP/1.0 200 RTSP Redirect follows\r\n"
 +                                          /* XXX: incorrect mime type ? */
 +                                          "Content-type: application/x-rtsp\r\n"
 +                                          "\r\n"
 +                                          "rtsp://%s:%d/%s\r\n", hostname, ntohs(my_rtsp_addr.sin_port), filename);
 +                        }
 +                        break;
 +                    case REDIR_SDP:
 +                        {
 +                            uint8_t *sdp_data;
 +                            int sdp_data_size, len;
 +                            struct sockaddr_in my_addr;
 +
 +                            q += snprintf(q, c->buffer_size,
 +                                          "HTTP/1.0 200 OK\r\n"
 +                                          "Content-type: application/sdp\r\n"
 +                                          "\r\n");
 +
 +                            len = sizeof(my_addr);
 +                            getsockname(c->fd, (struct sockaddr *)&my_addr, &len);
 +
 +                            /* XXX: should use a dynamic buffer */
 +                            sdp_data_size = prepare_sdp_description(stream,
 +                                                                    &sdp_data,
 +                                                                    my_addr.sin_addr);
 +                            if (sdp_data_size > 0) {
 +                                memcpy(q, sdp_data, sdp_data_size);
 +                                q += sdp_data_size;
 +                                *q = '\0';
 +                                av_free(sdp_data);
 +                            }
 +                        }
 +                        break;
 +                    default:
 +                        abort();
 +                        break;
 +                    }
 +
 +                    /* prepare output buffer */
 +                    c->buffer_ptr = c->buffer;
 +                    c->buffer_end = q;
 +                    c->state = HTTPSTATE_SEND_HEADER;
 +                    return 0;
 +                }
 +            }
 +        }
 +
 +        snprintf(msg, sizeof(msg), "ASX/RAM file not handled");
 +        goto send_error;
 +    }
 +
 +    stream->conns_served++;
 +
 +    /* XXX: add there authenticate and IP match */
 +
 +    if (c->post) {
 +        /* if post, it means a feed is being sent */
 +        if (!stream->is_feed) {
 +            /* However it might be a status report from WMP! Let us log the
 +             * data as it might come in handy one day. */
 +            char *logline = 0;
 +            int client_id = 0;
 +
 +            for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) {
-                 if (strncasecmp(p, "Pragma: client-id=", 18) == 0)
++                if (av_strncasecmp(p, "Pragma: log-line=", 17) == 0) {
 +                    logline = p;
 +                    break;
 +                }
-         if (!strcasecmp(cmd, "Port")) {
++                if (av_strncasecmp(p, "Pragma: client-id=", 18) == 0)
 +                    client_id = strtol(p + 18, 0, 10);
 +                p = strchr(p, '\n');
 +                if (!p)
 +                    break;
 +
 +                p++;
 +            }
 +
 +            if (logline) {
 +                char *eol = strchr(logline, '\n');
 +
 +                logline += 17;
 +
 +                if (eol) {
 +                    if (eol[-1] == '\r')
 +                        eol--;
 +                    http_log("%.*s\n", (int) (eol - logline), logline);
 +                    c->suppress_log = 1;
 +                }
 +            }
 +
 +#ifdef DEBUG
 +            http_log("\nGot request:\n%s\n", c->buffer);
 +#endif
 +
 +            if (client_id && extract_rates(ratebuf, sizeof(ratebuf), c->buffer)) {
 +                HTTPContext *wmpc;
 +
 +                /* Now we have to find the client_id */
 +                for (wmpc = first_http_ctx; wmpc; wmpc = wmpc->next) {
 +                    if (wmpc->wmp_client_id == client_id)
 +                        break;
 +                }
 +
 +                if (wmpc && modify_current_stream(wmpc, ratebuf))
 +                    wmpc->switch_pending = 1;
 +            }
 +
 +            snprintf(msg, sizeof(msg), "POST command not handled");
 +            c->stream = 0;
 +            goto send_error;
 +        }
 +        if (http_start_receive_data(c) < 0) {
 +            snprintf(msg, sizeof(msg), "could not open feed");
 +            goto send_error;
 +        }
 +        c->http_error = 0;
 +        c->state = HTTPSTATE_RECEIVE_DATA;
 +        return 0;
 +    }
 +
 +#ifdef DEBUG
 +    if (strcmp(stream->filename + strlen(stream->filename) - 4, ".asf") == 0)
 +        http_log("\nGot request:\n%s\n", c->buffer);
 +#endif
 +
 +    if (c->stream->stream_type == STREAM_TYPE_STATUS)
 +        goto send_status;
 +
 +    /* open input stream */
 +    if (open_input_stream(c, info) < 0) {
 +        snprintf(msg, sizeof(msg), "Input stream corresponding to '%s' not found", url);
 +        goto send_error;
 +    }
 +
 +    /* prepare http header */
 +    q = c->buffer;
 +    q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "HTTP/1.0 200 OK\r\n");
 +    mime_type = c->stream->fmt->mime_type;
 +    if (!mime_type)
 +        mime_type = "application/x-octet-stream";
 +    q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Pragma: no-cache\r\n");
 +
 +    /* for asf, we need extra headers */
 +    if (!strcmp(c->stream->fmt->name,"asf_stream")) {
 +        /* Need to allocate a client id */
 +
 +        c->wmp_client_id = av_lfg_get(&random_state);
 +
 +        q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Server: Cougar 4.1.0.3923\r\nCache-Control: no-cache\r\nPragma: client-id=%d\r\nPragma: features=\"broadcast\"\r\n", c->wmp_client_id);
 +    }
 +    q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-Type: %s\r\n", mime_type);
 +    q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n");
 +
 +    /* prepare output buffer */
 +    c->http_error = 0;
 +    c->buffer_ptr = c->buffer;
 +    c->buffer_end = q;
 +    c->state = HTTPSTATE_SEND_HEADER;
 +    return 0;
 + send_error:
 +    c->http_error = 404;
 +    q = c->buffer;
 +    q += snprintf(q, c->buffer_size,
 +                  "HTTP/1.0 404 Not Found\r\n"
 +                  "Content-type: text/html\r\n"
 +                  "\r\n"
 +                  "<html>\n"
 +                  "<head><title>404 Not Found</title></head>\n"
 +                  "<body>%s</body>\n"
 +                  "</html>\n", msg);
 +    /* prepare output buffer */
 +    c->buffer_ptr = c->buffer;
 +    c->buffer_end = q;
 +    c->state = HTTPSTATE_SEND_HEADER;
 +    return 0;
 + send_status:
 +    compute_status(c);
 +    c->http_error = 200; /* horrible : we use this value to avoid
 +                            going to the send data state */
 +    c->state = HTTPSTATE_SEND_HEADER;
 +    return 0;
 +}
 +
 +static void fmt_bytecount(AVIOContext *pb, int64_t count)
 +{
 +    static const char *suffix = " kMGTP";
 +    const char *s;
 +
 +    for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++);
 +
 +    avio_printf(pb, "%"PRId64"%c", count, *s);
 +}
 +
 +static void compute_status(HTTPContext *c)
 +{
 +    HTTPContext *c1;
 +    FFStream *stream;
 +    char *p;
 +    time_t ti;
 +    int i, len;
 +    AVIOContext *pb;
 +
 +    if (avio_open_dyn_buf(&pb) < 0) {
 +        /* XXX: return an error ? */
 +        c->buffer_ptr = c->buffer;
 +        c->buffer_end = c->buffer;
 +        return;
 +    }
 +
 +    avio_printf(pb, "HTTP/1.0 200 OK\r\n");
 +    avio_printf(pb, "Content-type: %s\r\n", "text/html");
 +    avio_printf(pb, "Pragma: no-cache\r\n");
 +    avio_printf(pb, "\r\n");
 +
 +    avio_printf(pb, "<html><head><title>%s Status</title>\n", program_name);
 +    if (c->stream->feed_filename[0])
 +        avio_printf(pb, "<link rel=\"shortcut icon\" href=\"%s\">\n", c->stream->feed_filename);
 +    avio_printf(pb, "</head>\n<body>");
 +    avio_printf(pb, "<h1>%s Status</h1>\n", program_name);
 +    /* format status */
 +    avio_printf(pb, "<h2>Available Streams</h2>\n");
 +    avio_printf(pb, "<table cellspacing=0 cellpadding=4>\n");
 +    avio_printf(pb, "<tr><th valign=top>Path<th align=left>Served<br>Conns<th><br>bytes<th valign=top>Format<th>Bit rate<br>kbits/s<th align=left>Video<br>kbits/s<th><br>Codec<th align=left>Audio<br>kbits/s<th><br>Codec<th align=left valign=top>Feed\n");
 +    stream = first_stream;
 +    while (stream != NULL) {
 +        char sfilename[1024];
 +        char *eosf;
 +
 +        if (stream->feed != stream) {
 +            av_strlcpy(sfilename, stream->filename, sizeof(sfilename) - 10);
 +            eosf = sfilename + strlen(sfilename);
 +            if (eosf - sfilename >= 4) {
 +                if (strcmp(eosf - 4, ".asf") == 0)
 +                    strcpy(eosf - 4, ".asx");
 +                else if (strcmp(eosf - 3, ".rm") == 0)
 +                    strcpy(eosf - 3, ".ram");
 +                else if (stream->fmt && !strcmp(stream->fmt->name, "rtp")) {
 +                    /* generate a sample RTSP director if
 +                       unicast. Generate an SDP redirector if
 +                       multicast */
 +                    eosf = strrchr(sfilename, '.');
 +                    if (!eosf)
 +                        eosf = sfilename + strlen(sfilename);
 +                    if (stream->is_multicast)
 +                        strcpy(eosf, ".sdp");
 +                    else
 +                        strcpy(eosf, ".rtsp");
 +                }
 +            }
 +
 +            avio_printf(pb, "<tr><td><a href=\"/%s\">%s</a> ",
 +                         sfilename, stream->filename);
 +            avio_printf(pb, "<td align=right> %d <td align=right> ",
 +                        stream->conns_served);
 +            fmt_bytecount(pb, stream->bytes_served);
 +            switch(stream->stream_type) {
 +            case STREAM_TYPE_LIVE: {
 +                    int audio_bit_rate = 0;
 +                    int video_bit_rate = 0;
 +                    const char *audio_codec_name = "";
 +                    const char *video_codec_name = "";
 +                    const char *audio_codec_name_extra = "";
 +                    const char *video_codec_name_extra = "";
 +
 +                    for(i=0;i<stream->nb_streams;i++) {
 +                        AVStream *st = stream->streams[i];
 +                        AVCodec *codec = avcodec_find_encoder(st->codec->codec_id);
 +                        switch(st->codec->codec_type) {
 +                        case AVMEDIA_TYPE_AUDIO:
 +                            audio_bit_rate += st->codec->bit_rate;
 +                            if (codec) {
 +                                if (*audio_codec_name)
 +                                    audio_codec_name_extra = "...";
 +                                audio_codec_name = codec->name;
 +                            }
 +                            break;
 +                        case AVMEDIA_TYPE_VIDEO:
 +                            video_bit_rate += st->codec->bit_rate;
 +                            if (codec) {
 +                                if (*video_codec_name)
 +                                    video_codec_name_extra = "...";
 +                                video_codec_name = codec->name;
 +                            }
 +                            break;
 +                        case AVMEDIA_TYPE_DATA:
 +                            video_bit_rate += st->codec->bit_rate;
 +                            break;
 +                        default:
 +                            abort();
 +                        }
 +                    }
 +                    avio_printf(pb, "<td align=center> %s <td align=right> %d <td align=right> %d <td> %s %s <td align=right> %d <td> %s %s",
 +                                 stream->fmt->name,
 +                                 stream->bandwidth,
 +                                 video_bit_rate / 1000, video_codec_name, video_codec_name_extra,
 +                                 audio_bit_rate / 1000, audio_codec_name, audio_codec_name_extra);
 +                    if (stream->feed)
 +                        avio_printf(pb, "<td>%s", stream->feed->filename);
 +                    else
 +                        avio_printf(pb, "<td>%s", stream->feed_filename);
 +                    avio_printf(pb, "\n");
 +                }
 +                break;
 +            default:
 +                avio_printf(pb, "<td align=center> - <td align=right> - <td align=right> - <td><td align=right> - <td>\n");
 +                break;
 +            }
 +        }
 +        stream = stream->next;
 +    }
 +    avio_printf(pb, "</table>\n");
 +
 +    stream = first_stream;
 +    while (stream != NULL) {
 +        if (stream->feed == stream) {
 +            avio_printf(pb, "<h2>Feed %s</h2>", stream->filename);
 +            if (stream->pid) {
 +                avio_printf(pb, "Running as pid %d.\n", stream->pid);
 +
 +#if defined(linux) && !defined(CONFIG_NOCUTILS)
 +                {
 +                    FILE *pid_stat;
 +                    char ps_cmd[64];
 +
 +                    /* This is somewhat linux specific I guess */
 +                    snprintf(ps_cmd, sizeof(ps_cmd),
 +                             "ps -o \"%%cpu,cputime\" --no-headers %d",
 +                             stream->pid);
 +
 +                    pid_stat = popen(ps_cmd, "r");
 +                    if (pid_stat) {
 +                        char cpuperc[10];
 +                        char cpuused[64];
 +
 +                        if (fscanf(pid_stat, "%10s %64s", cpuperc,
 +                                   cpuused) == 2) {
 +  &nbs