Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Sep 2011 00:14:37 +0000 (02:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Sep 2011 00:14:37 +0000 (02:14 +0200)
* qatar/master: (21 commits)
  fate: allow testing with libavfilter disabled
  x86: XOP/FMA4 CPU detection support
  ws_snd: misc cosmetic clean-ups
  ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
  ws_snd: use memcpy() and memset() instead of loops
  ws_snd: use samples pointer for loop termination instead of a separate iterator variable.
  ws_snd: make sure number of channels is 1
  ws_snd: add some checks to prevent buffer overread or overwrite.
  ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
  flacdec: fix buffer size checking in get_metadata_size()
  rtp: Simplify ff_rtp_get_payload_type
  rtpenc: Add a payload type private option
  rtp: Correct ff_rtp_get_payload_type documentation
  avconv: replace all fprintf() by av_log().
  avconv: change av_log verbosity from ERROR to FATAL for fatal errors.
  cmdutils: replace fprintf() by av_log()
  avtools: parse loglevel before all the other options.
  oggdec: add support for Xiph's CELT codec
  sol: return error if av_get_packet() fails.
  cosmetics: reindent and pretty-print
  ...

Conflicts:
avconv.c
cmdutils.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/oggparsecelt.c
libavformat/utils.c
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
26 files changed:
1  2 
Changelog
avconv.c
cmdutils.c
cmdutils.h
configure
doc/avconv.texi
ffmpeg.c
ffplay.c
ffprobe.c
ffserver.c
libavcodec/flacdec.c
libavcodec/libgsm.c
libavcodec/version.h
libavcodec/ws-snd1.c
libavformat/oggparsecelt.c
libavformat/rtp.c
libavformat/rtp.h
libavformat/rtpenc.c
libavformat/sdp.c
libavformat/sol.c
libavformat/utils.c
libavutil/avutil.h
libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c
tests/Makefile

diff --cc Changelog
+++ b/Changelog
@@@ -43,28 -41,42 +43,29 @@@ easier to use. The changes are
        '-preset <presetname>'.
      * -intra option was removed, it's equivalent to -g 0.
  - 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
  
  
 -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
@@@ -138,9 -123,6 +138,8 @@@ static int audio_volume = 256
  
  static int exit_on_error = 0;
  static int using_stdin = 0;
- static int verbose = 1;
 +static int run_as_daemon  = 0;
 +static int q_pressed = 0;
  static int64_t video_size = 0;
  static int64_t audio_size = 0;
  static int64_t extra_size = 0;
@@@ -832,9 -781,9 +830,9 @@@ need_realloc
              ost->resample_sample_rate == enc->sample_rate) {
              ost->resample = NULL;
              ost->audio_resample = 0;
 -        } else if (ost->audio_resample) {
 +        } else {
              if (dec->sample_fmt != AV_SAMPLE_FMT_S16)
-                 fprintf(stderr, "Warning, using s16 intermediate sample format for resampling\n");
+                 av_log(NULL, AV_LOG_WARNING, "Using s16 intermediate sample format for resampling\n");
              ost->resample = av_audio_resample_init(enc->channels,    dec->channels,
                                                     enc->sample_rate, dec->sample_rate,
                                                     enc->sample_fmt,  dec->sample_fmt,
@@@ -1136,34 -1081,26 +1132,34 @@@ static void do_video_resample(OutputStr
                 ist->file_index, ist->st->index,
                 ost->resample_width, ost->resample_height, av_get_pix_fmt_name(ost->resample_pix_fmt),
                 dec->width         , dec->height         , av_get_pix_fmt_name(dec->pix_fmt));
 -        if(!ost->video_resample)
 -            ost->video_resample = 1;
 +        ost->resample_width   = dec->width;
 +        ost->resample_height  = dec->height;
 +        ost->resample_pix_fmt = dec->pix_fmt;
      }
  
 -#if !CONFIG_AVFILTER
 +    ost->video_resample = dec->width   != enc->width  ||
 +                          dec->height  != enc->height ||
 +                          dec->pix_fmt != enc->pix_fmt;
 +
      if (ost->video_resample) {
 -        *out_picture = &ost->pict_tmp;
 -        if (resample_changed) {
 +        *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)) {
 +                    fprintf(stderr, "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(
 -                ist->st->codec->width,
 -                ist->st->codec->height,
 -                ist->st->codec->pix_fmt,
 -                ost->st->codec->width,
 -                ost->st->codec->height,
 -                ost->st->codec->pix_fmt,
 -                ost->sws_flags, NULL, NULL, NULL);
 +            ost->img_resample_ctx = sws_getContext(dec->width, dec->height, dec->pix_fmt,
 +                                                   enc->width, enc->height, enc->pix_fmt,
 +                                                   ost->sws_flags, NULL, NULL, NULL);
              if (ost->img_resample_ctx == NULL) {
-                 fprintf(stderr, "Cannot get resampling context\n");
+                 av_log(NULL, AV_LOG_FATAL, "Cannot get resampling context\n");
                  exit_program(1);
              }
          }
@@@ -1374,10 -1309,9 +1368,11 @@@ static void print_report(OutputFile *ou
      int64_t total_size;
      AVCodecContext *enc;
      int frame_number, vid, i;
 -    double bitrate, ti1, pts;
 +    double bitrate;
 +    int64_t pts = INT64_MAX;
      static int64_t last_time = -1;
      static int qp_histogram[52];
++    int hours, mins, secs, us;
  
      if (!is_last_report) {
          int64_t cur_time;
              vid = 1;
          }
          /* compute min output value */
 -        pts = (double)ost->st->pts.val * av_q2d(ost->st->time_base);
 -        if ((pts < ti1) && (pts > 0))
 -            ti1 = pts;
 +        pts = FFMIN(pts, av_rescale_q(ost->st->pts.val,
 +                                      ost->st->time_base, AV_TIME_BASE_Q));
      }
 -    if (ti1 < 0.01)
 -        ti1 = 0.01;
  
-     if (verbose > 0 || is_last_report) {
-         int hours, mins, secs, us;
-         secs = pts / AV_TIME_BASE;
-         us = pts % AV_TIME_BASE;
-         mins = secs / 60;
-         secs %= 60;
-         hours = mins / 60;
-         mins %= 60;
-         bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0;
-         snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                  "size=%8.0fkB time=", total_size / 1024.0);
-         snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                  "%02d:%02d:%02d.%02d ", hours, mins, secs,
-                  (100 * us) / AV_TIME_BASE);
-         snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                  "bitrate=%6.1fkbits/s", bitrate);
-         if (nb_frames_dup || nb_frames_drop)
-           snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
-                   nb_frames_dup, nb_frames_drop);
-         if (verbose >= 0)
-             fprintf(stderr, "%s    \r", buf);
-         fflush(stderr);
-     }
 -    bitrate = (double)(total_size * 8) / ti1 / 1000.0;
++    secs = pts / AV_TIME_BASE;
++    us = pts % AV_TIME_BASE;
++    mins = secs / 60;
++    secs %= 60;
++    hours = mins / 60;
++    mins %= 60;
++    bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0;
++
++    snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
++             "size=%8.0fkB time=", total_size / 1024.0);
++    snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
++             "%02d:%02d:%02d.%02d ", hours, mins, secs,
++             (100 * us) / AV_TIME_BASE);
+     snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
 -            "size=%8.0fkB time=%0.2f bitrate=%6.1fkbits/s",
 -            (double)total_size / 1024, ti1, bitrate);
++             "bitrate=%6.1fkbits/s", bitrate);
+     if (nb_frames_dup || nb_frames_drop)
+         snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
+                 nb_frames_dup, nb_frames_drop);
  
-     if (is_last_report && verbose >= 0){
+     av_log(NULL, is_last_report ? AV_LOG_WARNING : AV_LOG_INFO, "%s    \r", buf);
+     fflush(stderr);
+     if (is_last_report) {
          int64_t raw= audio_size + video_size + extra_size;
-         fprintf(stderr, "\n");
-         fprintf(stderr, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n",
-                 video_size/1024.0,
-                 audio_size/1024.0,
-                 extra_size/1024.0,
-                 100.0*(total_size - raw)/raw
+         av_log(NULL, AV_LOG_INFO, "\n");
+         av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n",
+                video_size/1024.0,
+                audio_size/1024.0,
+                extra_size/1024.0,
+                100.0*(total_size - raw)/raw
          );
      }
  }
@@@ -2353,11 -2280,7 +2343,10 @@@ static int transcode(OutputFile *output
      if (ret < 0)
          goto fail;
  
 -    av_log(NULL, AV_LOG_INFO, "Press ctrl-c to stop encoding\n");
 +    if (!using_stdin) {
-         if(verbose >= 0)
-             fprintf(stderr, "Press [q] to stop, [?] for help\n");
++        av_log(NULL, AV_LOG_INFO, "Press [q] to stop, [?] for help\n");
 +        avio_set_interrupt_cb(decode_interrupt_cb);
 +    }
      term_init();
  
      timer_start = av_gettime();
  
          ipts_min = INT64_MAX;
          opts_min= 1e100;
-             if (key == '+') verbose++;
-             if (key == '-') verbose--;
 +        /* if 'q' pressed, exits */
 +        if (!using_stdin) {
 +            if (q_pressed)
 +                break;
 +            /* read_key() returns 0 on EOF */
 +            key = read_key();
 +            if (key == 'q')
 +                break;
++            if (key == '+') av_log_set_level(av_log_get_level()+10);
++            if (key == '-') av_log_set_level(av_log_get_level()-10);
 +            if (key == 's') qp_hist     ^= 1;
 +            if (key == 'h'){
 +                if (do_hex_dump){
 +                    do_hex_dump = do_pkt_dump = 0;
 +                } else if(do_pkt_dump){
 +                    do_hex_dump = 1;
 +                } else
 +                    do_pkt_dump = 1;
 +                av_log_set_level(AV_LOG_DEBUG);
 +            }
 +            if (key == 'd' || key == 'D'){
 +                int debug=0;
 +                if(key == 'D') {
 +                    debug = input_streams[0].st->codec->debug<<1;
 +                    if(!debug) debug = 1;
 +                    while(debug & (FF_DEBUG_DCT_COEFF|FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) //unsupported, would just crash
 +                        debug += debug;
 +                }else
 +                    scanf("%d", &debug);
 +                for(i=0;i<nb_input_streams;i++) {
 +                    input_streams[i].st->codec->debug = debug;
 +                }
 +                for(i=0;i<nb_output_streams;i++) {
 +                    ost = &output_streams[i];
 +                    ost->st->codec->debug = debug;
 +                }
 +                if(debug) av_log_set_level(AV_LOG_DEBUG);
 +                fprintf(stderr,"debug=%d\n", debug);
 +            }
 +            if (key == '?'){
 +                fprintf(stderr, "key    function\n"
 +                                "?      show this help\n"
 +                                "+      increase verbosity\n"
 +                                "-      decrease verbosity\n"
 +                                "D      cycle through available debug modes\n"
 +                                "h      dump packets/hex press to cycle through the 3 states\n"
 +                                "q      quit\n"
 +                                "s      Show QP histogram\n"
 +                );
 +            }
 +        }
  
          /* select the stream that we must read now by looking at the
             smallest output pts */
@@@ -4140,15 -4003,8 +4124,15 @@@ int main(int argc, char **argv
      reset_options(&o);
  
      av_log_set_flags(AV_LOG_SKIP_REPEATED);
+     parse_loglevel(argc, argv, options);
  
-         verbose=-1;
 +    if(argc>1 && !strcmp(argv[1], "-d")){
 +        run_as_daemon=1;
 +        av_log_set_callback(log_callback_null);
 +        argc--;
 +        argv++;
 +    }
 +
      avcodec_register_all();
  #if CONFIG_AVDEVICE
      avdevice_register_all();
  #endif
      av_register_all();
  
 -    avio_set_interrupt_cb(decode_interrupt_cb);
 +#if HAVE_ISATTY
 +    if(isatty(STDIN_FILENO))
 +        avio_set_interrupt_cb(decode_interrupt_cb);
 +#endif
  
-     if(verbose>=0)
-         show_banner();
+     show_banner();
  
      /* parse options */
      parse_options(&o, argc, argv, options, opt_output_file);
diff --cc cmdutils.c
@@@ -305,13 -304,48 +305,48 @@@ void parse_options(void *optctx, int ar
      }
  }
  
 -#define FLAGS (o->type == FF_OPT_TYPE_FLAGS) ? AV_DICT_APPEND : 0
+ /*
+  * Return index of option opt in argv or 0 if not found.
+  */
+ static int locate_option(int argc, char **argv, const OptionDef *options, const char *optname)
+ {
+     const OptionDef *po;
+     int i;
+     for (i = 1; i < argc; i++) {
+         const char *cur_opt = argv[i];
+         if (*cur_opt++ != '-')
+             continue;
+         po = find_option(options, cur_opt);
+         if (!po->name && cur_opt[0] == 'n' && cur_opt[1] == 'o')
+             po = find_option(options, cur_opt + 2);
+         if ((!po->name && !strcmp(cur_opt, optname)) ||
+              (po->name && !strcmp(optname, po->name)))
+             return i;
+         if (!po || po->flags & HAS_ARG)
+             i++;
+     }
+     return 0;
+ }
+ void parse_loglevel(int argc, char **argv, const OptionDef *options)
+ {
+     int idx = locate_option(argc, argv, options, "loglevel");
+     if (idx && argv[idx + 1])
+         opt_loglevel("loglevel", argv[idx + 1]);
+ }
 +#define FLAGS(o) ((o)->type == FF_OPT_TYPE_FLAGS) ? AV_DICT_APPEND : 0
  int opt_default(const char *opt, const char *arg)
  {
 -    const AVOption *o;
 +    const AVOption *oc, *of, *os;
      char opt_stripped[128];
      const char *p;
 -    const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class(), *sc = sws_get_class();
 +    const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class(), *sc;
  
      if (!(p = strchr(opt, ':')))
          p = opt + strlen(opt);
              return ret;
          }
      }
 +#endif
  
 -    if (o)
 +    if (oc || of || os)
          return 0;
-     fprintf(stderr, "Unrecognized option '%s'\n", opt);
+     av_log(NULL, AV_LOG_ERROR, "Unrecognized option '%s'\n", opt);
      return AVERROR_OPTION_NOT_FOUND;
  }
  
@@@ -419,9 -450,9 +454,9 @@@ static int warned_cfg = 0
          }                                                               \
          if (flags & SHOW_CONFIG) {                                      \
              const char *cfg = libname##_configuration();                \
 -            if (strcmp(LIBAV_CONFIGURATION, cfg)) {                     \
 +            if (strcmp(FFMPEG_CONFIGURATION, cfg)) {                    \
                  if (!warned_cfg) {                                      \
-                     fprintf(outstream,                                  \
+                     av_log(NULL, level,                                 \
                              "%sWARNING: library configuration mismatch\n", \
                              indent);                                    \
                      warned_cfg = 1;                                     \
@@@ -445,22 -476,22 +480,23 @@@ static void print_all_libs_info(int fla
  
  void show_banner(void)
  {
-     fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n",
-             program_name, program_birth_year, this_year);
-     fprintf(stderr, "  built on %s %s with %s %s\n",
-             __DATE__, __TIME__, CC_TYPE, CC_VERSION);
-     fprintf(stderr, "  configuration: " FFMPEG_CONFIGURATION "\n");
-     print_all_libs_info(stderr, INDENT|SHOW_CONFIG);
-     print_all_libs_info(stderr, INDENT|SHOW_VERSION);
 -    av_log(NULL, AV_LOG_INFO, "%s version " LIBAV_VERSION ", Copyright (c) %d-%d the Libav developers\n",
++    av_log(NULL, AV_LOG_INFO, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n",
+            program_name, program_birth_year, this_year);
+     av_log(NULL, AV_LOG_INFO, "  built on %s %s with %s %s\n",
+            __DATE__, __TIME__, CC_TYPE, CC_VERSION);
 -    av_log(NULL, AV_LOG_VERBOSE, "  configuration: " LIBAV_CONFIGURATION "\n");
++    av_log(NULL, AV_LOG_VERBOSE, "  configuration: " FFMPEG_CONFIGURATION "\n");
+     print_all_libs_info(INDENT|SHOW_CONFIG,  AV_LOG_VERBOSE);
+     print_all_libs_info(INDENT|SHOW_VERSION, AV_LOG_VERBOSE);
  }
  
 -void show_version(void) {
 +int opt_version(const char *opt, const char *arg) {
+     av_log_set_callback(log_callback_help);
 -    printf("%s " LIBAV_VERSION "\n", program_name);
 +    printf("%s " FFMPEG_VERSION "\n", program_name);
-     print_all_libs_info(stdout, SHOW_VERSION);
+     print_all_libs_info(SHOW_VERSION, AV_LOG_INFO);
 +    return 0;
  }
  
 -void show_license(void)
 +int opt_license(const char *opt, const char *arg)
  {
      printf(
  #if CONFIG_NONFREE
diff --cc cmdutils.h
Simple merge
diff --cc configure
Simple merge
diff --cc doc/avconv.texi
Simple merge
diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -145,9 -210,8 +145,8 @@@ static int audio_volume = 256
  
  static int exit_on_error = 0;
  static int using_stdin = 0;
--static int verbose = 1;
 -static int thread_count= 1;
 +static int run_as_daemon  = 0;
 +static int q_pressed = 0;
  static int64_t video_size = 0;
  static int64_t audio_size = 0;
  static int64_t extra_size = 0;
@@@ -656,12 -494,10 +655,11 @@@ void exit_program(int ret
      avfilter_uninit();
  #endif
  
 +    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);
      }
  
@@@ -672,7 -508,7 +670,7 @@@ static void assert_avoptions(AVDictiona
  {
      AVDictionaryEntry *t;
      if ((t = av_dict_get(m, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
--        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
++        av_log(NULL, AV_LOG_FATAL, "Option %s not found.\n", t->key);
          exit_program(1);
      }
  }
@@@ -683,12 -519,12 +681,12 @@@ static void assert_codec_experimental(A
      AVCodec *codec;
      if (c->codec->capabilities & CODEC_CAP_EXPERIMENTAL &&
          c->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
--        av_log(NULL, AV_LOG_ERROR, "%s '%s' is experimental and might produce bad "
++        av_log(NULL, AV_LOG_FATAL, "%s '%s' is experimental and might produce bad "
                  "results.\nAdd '-strict experimental' if you want to use it.\n",
                  codec_string, c->codec->name);
          codec = encoder ? avcodec_find_encoder(c->codec->id) : avcodec_find_decoder(c->codec->id);
          if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL))
--            av_log(NULL, AV_LOG_ERROR, "Or use the non experimental %s '%s'.\n",
++            av_log(NULL, AV_LOG_FATAL, "Or use the non experimental %s '%s'.\n",
                     codec_string, codec->name);
          exit_program(1);
      }
@@@ -784,9 -731,9 +782,9 @@@ static void write_frame(AVFormatContex
              av_free_packet(pkt);
              new_pkt.destruct= av_destruct_packet;
          } else if(a<0){
--            fprintf(stderr, "%s failed for stream %d, codec %s",
--                    bsfc->filter->name, pkt->stream_index,
--                    avctx->codec ? avctx->codec->name : "copy");
++            av_log(NULL, AV_LOG_ERROR, "%s failed for stream %d, codec %s",
++                   bsfc->filter->name, pkt->stream_index,
++                   avctx->codec ? avctx->codec->name : "copy");
              print_error("", a);
              if (exit_on_error)
                  exit_program(1);
@@@ -832,14 -781,14 +830,14 @@@ need_realloc
      audio_out_size += FF_MIN_BUFFER_SIZE;
  
      if(audio_out_size > INT_MAX || audio_buf_size > INT_MAX){
--        fprintf(stderr, "Buffer sizes too large\n");
++        av_log(NULL, AV_LOG_FATAL, "Buffer sizes too large\n");
          exit_program(1);
      }
  
      av_fast_malloc(&audio_buf, &allocated_audio_buf_size, audio_buf_size);
      av_fast_malloc(&audio_out, &allocated_audio_out_size, audio_out_size);
      if (!audio_buf || !audio_out){
--        fprintf(stderr, "Out of memory in do_audio_out\n");
++        av_log(NULL, AV_LOG_FATAL, "Out of memory in do_audio_out\n");
          exit_program(1);
      }
  
              ost->resample_sample_fmt  == enc->sample_fmt &&
              ost->resample_channels    == enc->channels   &&
              ost->resample_sample_rate == enc->sample_rate) {
 -            ost->resample = NULL;
 +            //ost->swr = NULL;
              ost->audio_resample = 0;
 -        } else if (ost->audio_resample) {
 -            if (dec->sample_fmt != AV_SAMPLE_FMT_S16)
 -                fprintf(stderr, "Warning, using s16 intermediate sample format for resampling\n");
 -            ost->resample = av_audio_resample_init(enc->channels,    dec->channels,
 -                                                   enc->sample_rate, dec->sample_rate,
 -                                                   enc->sample_fmt,  dec->sample_fmt,
 -                                                   16, 10, 0, 0.8);
 -            if (!ost->resample) {
 -                fprintf(stderr, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n",
 +        } else {
 +            ost->swr = swr_alloc2(ost->swr,
 +                                  enc->channel_layout, enc->sample_fmt, enc->sample_rate,
 +                                  dec->channel_layout, dec->sample_fmt, dec->sample_rate,
 +                                  0, NULL);
 +            av_set_int(ost->swr, "ich", dec->channels);
 +            av_set_int(ost->swr, "och", enc->channels);
 +            if(audio_sync_method>1) av_set_int(ost->swr, "flags", SWR_FLAG_RESAMPLE);
 +            if(ost->swr && swr_init(ost->swr) < 0){
-                 fprintf(stderr, "swr_init() failed\n");
++                av_log(NULL, AV_LOG_FATAL, "swr_init() failed\n");
 +                swr_free(&ost->swr);
 +            }
 +
 +            if (!ost->swr) {
-                 fprintf(stderr, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n",
++                av_log(NULL, AV_LOG_FATAL, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n",
                          dec->channels, dec->sample_rate,
                          enc->channels, enc->sample_rate);
                  exit_program(1);
                      byte_delta= FFMAX(byte_delta, -size);
                      size += byte_delta;
                      buf  -= byte_delta;
--                    if(verbose > 2)
--                        fprintf(stderr, "discarding %d audio samples\n", (int)-delta);
++                    av_log(NULL, AV_LOG_VERBOSE, "discarding %d audio samples\n", (int)-delta);
                      if(!size)
                          return;
                      ist->is_start=0;
                      memcpy(input_tmp + byte_delta, buf, size);
                      buf= input_tmp;
                      size += byte_delta;
--                    if(verbose > 2)
--                        fprintf(stderr, "adding %d audio samples of silence\n", (int)delta);
++                    av_log(NULL, AV_LOG_VERBOSE, "adding %d audio samples of silence\n", (int)delta);
                  }
              }else if(audio_sync_method>1){
                  int comp= av_clip(delta, -audio_sync_method, audio_sync_method);
                  av_assert0(ost->audio_resample);
--                if(verbose > 2)
--                    fprintf(stderr, "compensating audio timestamp drift:%f compensation:%d in:%d\n", delta, comp, enc->sample_rate);
++                av_log(NULL, AV_LOG_VERBOSE, "compensating audio timestamp drift:%f compensation:%d in:%d\n",
++                       delta, comp, enc->sample_rate);
  //                fprintf(stderr, "drift:%f len:%d opts:%"PRId64" ipts:%"PRId64" fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(get_sync_ipts(ost) * enc->sample_rate), av_fifo_size(ost->fifo)/(ost->st->codec->channels * 2));
 -                av_resample_compensate(*(struct AVResampleContext**)ost->resample, comp, enc->sample_rate);
 +                swr_compensate(ost->swr, comp, enc->sample_rate);
              }
          }
      }else
      if (enc->frame_size > 1) {
          /* output resampled raw samples */
          if (av_fifo_realloc2(ost->fifo, av_fifo_size(ost->fifo) + size_out) < 0) {
--            fprintf(stderr, "av_fifo_realloc2() failed\n");
++            av_log(NULL, AV_LOG_FATAL, "av_fifo_realloc2() failed\n");
              exit_program(1);
          }
          av_fifo_generic_write(ost->fifo, buftmp, size_out, NULL);
              ret = avcodec_encode_audio(enc, audio_out, audio_out_size,
                                         (short *)audio_buf);
              if (ret < 0) {
--                fprintf(stderr, "Audio encoding failed\n");
++                av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
                  exit_program(1);
              }
              audio_size += ret;
              size_out = size_out*coded_bps/8;
  
          if(size_out > audio_out_size){
--            fprintf(stderr, "Internal error, buffer size too small\n");
++            av_log(NULL, AV_LOG_FATAL, "Internal error, buffer size too small\n");
              exit_program(1);
          }
  
          ret = avcodec_encode_audio(enc, audio_out, size_out,
                                     (short *)buftmp);
          if (ret < 0) {
--            fprintf(stderr, "Audio encoding failed\n");
++            av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
              exit_program(1);
          }
          audio_size += ret;
@@@ -1048,7 -1021,7 +1044,7 @@@ static void pre_process_video_frame(Inp
          if(avpicture_deinterlace(picture2, picture,
                                   dec->pix_fmt, dec->width, dec->height) < 0) {
              /* if error, do not deinterlace */
--            fprintf(stderr, "Deinterlacing failed\n");
++            av_log(NULL, AV_LOG_WARNING, "Deinterlacing failed\n");
              av_free(buf);
              buf = NULL;
              picture2 = picture;
@@@ -1075,7 -1051,7 +1071,7 @@@ static void do_subtitle_out(AVFormatCon
      AVPacket pkt;
  
      if (pts == AV_NOPTS_VALUE) {
--        fprintf(stderr, "Subtitle packets must have a pts\n");
++        av_log(NULL, AV_LOG_ERROR, "Subtitle packets must have a pts\n");
          if (exit_on_error)
              exit_program(1);
          return;
          subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out,
                                                      subtitle_out_max_size, sub);
          if (subtitle_out_size < 0) {
--            fprintf(stderr, "Subtitle encoding failed\n");
++            av_log(NULL, AV_LOG_FATAL, "Subtitle encoding failed\n");
              exit_program(1);
          }
  
  static int bit_buffer_size= 1024*256;
  static uint8_t *bit_buffer= NULL;
  
-                     fprintf(stderr, "Cannot allocate temp picture, check pix fmt\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)) {
-                 fprintf(stderr, "Cannot get resampling context\n");
++                    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,
  //fprintf(stderr, "vdelta:%f, ost->sync_opts:%"PRId64", ost->sync_ipts:%f nb_frames:%d\n", vdelta, ost->sync_opts, get_sync_ipts(ost), nb_frames);
          if (nb_frames == 0){
              ++nb_frames_drop;
--            if (verbose>2)
--                fprintf(stderr, "*** drop!\n");
++            av_log(NULL, AV_LOG_VERBOSE, "*** drop!\n");
          }else if (nb_frames > 1) {
              nb_frames_dup += nb_frames - 1;
--            if (verbose>2)
--                fprintf(stderr, "*** %d dup!\n", nb_frames-1);
++            av_log(NULL, AV_LOG_VERBOSE, "*** %d dup!\n", nb_frames-1);
          }
      }else
          ost->sync_opts= lrintf(sync_ipts);
                                         bit_buffer, bit_buffer_size,
                                         &big_picture);
              if (ret < 0) {
--                fprintf(stderr, "Video encoding failed\n");
++                av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n");
                  exit_program(1);
              }
  
@@@ -1384,10 -1328,9 +1378,11 @@@ static void print_report(OutputFile *ou
      int64_t total_size;
      AVCodecContext *enc;
      int frame_number, vid, i;
 -    double bitrate, ti1, pts;
 +    double bitrate;
 +    int64_t pts = INT64_MAX;
      static int64_t last_time = -1;
      static int qp_histogram[52];
++    int hours, mins, secs, us;
  
      if (!is_last_report) {
          int64_t cur_time;
              vid = 1;
          }
          /* compute min output value */
 -        pts = (double)ost->st->pts.val * av_q2d(ost->st->time_base);
 -        if ((pts < ti1) && (pts > 0))
 -            ti1 = pts;
 +        pts = FFMIN(pts, av_rescale_q(ost->st->pts.val,
 +                                      ost->st->time_base, AV_TIME_BASE_Q));
      }
 -    if (ti1 < 0.01)
 -        ti1 = 0.01;
  
--    if (verbose > 0 || is_last_report) {
-         int hours, mins, secs, us;
-         secs = pts / AV_TIME_BASE;
-         us = pts % AV_TIME_BASE;
-         mins = secs / 60;
-         secs %= 60;
-         hours = mins / 60;
-         mins %= 60;
-         bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0;
-         snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                  "size=%8.0fkB time=", total_size / 1024.0);
-         snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                  "%02d:%02d:%02d.%02d ", hours, mins, secs,
-                  (100 * us) / AV_TIME_BASE);
-         snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                  "bitrate=%6.1fkbits/s", bitrate);
-         if (nb_frames_dup || nb_frames_drop)
-           snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
-                   nb_frames_dup, nb_frames_drop);
-         if (verbose >= 0)
-             fprintf(stderr, "%s    \r", buf);
-         fflush(stderr);
-     }
 -        bitrate = (double)(total_size * 8) / ti1 / 1000.0;
++    secs = pts / AV_TIME_BASE;
++    us = pts % AV_TIME_BASE;
++    mins = secs / 60;
++    secs %= 60;
++    hours = mins / 60;
++    mins %= 60;
 -        snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
 -            "size=%8.0fkB time=%0.2f bitrate=%6.1fkbits/s",
 -            (double)total_size / 1024, ti1, bitrate);
++    bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0;
 -        if (nb_frames_dup || nb_frames_drop)
 -          snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
 -                  nb_frames_dup, nb_frames_drop);
++    snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
++             "size=%8.0fkB time=", total_size / 1024.0);
++    snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
++             "%02d:%02d:%02d.%02d ", hours, mins, secs,
++             (100 * us) / AV_TIME_BASE);
++    snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
++             "bitrate=%6.1fkbits/s", bitrate);
 -        if (verbose >= 0)
 -            fprintf(stderr, "%s    \r", buf);
++    if (nb_frames_dup || nb_frames_drop)
++        snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
++                nb_frames_dup, nb_frames_drop);
  
-     if (is_last_report && verbose >= 0){
 -        fflush(stderr);
 -    }
++    av_log(NULL, is_last_report ? AV_LOG_WARNING : AV_LOG_INFO, "%s    \r", buf);
++
++    fflush(stderr);
 -    if (is_last_report && verbose >= 0){
++    if (is_last_report) {
          int64_t raw= audio_size + video_size + extra_size;
--        fprintf(stderr, "\n");
--        fprintf(stderr, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n",
--                video_size/1024.0,
--                audio_size/1024.0,
--                extra_size/1024.0,
--                100.0*(total_size - raw)/raw
++        av_log(NULL, AV_LOG_INFO, "\n");
++        av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n",
++               video_size/1024.0,
++               audio_size/1024.0,
++               extra_size/1024.0,
++               100.0*(total_size - raw)/raw
          );
      }
  }
@@@ -1513,123 -1448,38 +1504,123 @@@ static void generate_silence(uint8_t *b
      memset(buf, fill_char, size);
  }
  
 -/* pkt = NULL means EOF (needed to flush decoder buffers) */
 -static int output_packet(InputStream *ist, int ist_index,
 -                         OutputStream **ost_table, int nb_ostreams,
 -                         const AVPacket *pkt)
 +static void flush_encoders(OutputStream *ost_table, int nb_ostreams)
  {
 -    AVFormatContext *os;
 -    OutputStream *ost;
 -    int ret, i;
 -    int got_output;
 -    AVFrame picture;
 -    void *buffer_to_free = NULL;
 -    static unsigned int samples_size= 0;
 -    AVSubtitle subtitle, *subtitle_to_free;
 -    int64_t pkt_pts = AV_NOPTS_VALUE;
 -#if CONFIG_AVFILTER
 -    int frame_available;
 -#endif
 -    float quality;
 +    int i, ret;
  
 -    AVPacket avpkt;
 -    int bps = av_get_bytes_per_sample(ist->st->codec->sample_fmt);
 +    for (i = 0; i < nb_ostreams; i++) {
 +        OutputStream   *ost = &ost_table[i];
 +        AVCodecContext *enc = ost->st->codec;
 +        AVFormatContext *os = output_files[ost->file_index].ctx;
  
 -    if(ist->next_pts == AV_NOPTS_VALUE)
 -        ist->next_pts= ist->pts;
 +        if (!ost->encoding_needed)
 +            continue;
  
 -    if (pkt == NULL) {
 -        /* EOF handling */
 -        av_init_packet(&avpkt);
 -        avpkt.data = NULL;
 -        avpkt.size = 0;
 -        goto handle_eof;
 -    } else {
 +        if (ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO && enc->frame_size <=1)
 +            continue;
 +        if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE))
 +            continue;
 +
 +        for(;;) {
 +            AVPacket pkt;
 +            int fifo_bytes;
 +            av_init_packet(&pkt);
 +            pkt.stream_index= ost->index;
 +
 +            switch (ost->st->codec->codec_type) {
 +            case AVMEDIA_TYPE_AUDIO:
 +                fifo_bytes = av_fifo_size(ost->fifo);
 +                ret = 0;
 +                /* encode any samples remaining in fifo */
 +                if (fifo_bytes > 0) {
 +                    int osize = av_get_bytes_per_sample(enc->sample_fmt);
 +                    int fs_tmp = enc->frame_size;
 +
 +                    av_fifo_generic_read(ost->fifo, audio_buf, fifo_bytes, NULL);
 +                    if (enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
 +                        enc->frame_size = fifo_bytes / (osize * enc->channels);
 +                    } else { /* pad */
 +                        int frame_bytes = enc->frame_size*osize*enc->channels;
 +                        if (allocated_audio_buf_size < frame_bytes)
 +                            exit_program(1);
 +                        generate_silence(audio_buf+fifo_bytes, enc->sample_fmt, frame_bytes - fifo_bytes);
 +                    }
 +
 +                    ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, (short *)audio_buf);
 +                    pkt.duration = av_rescale((int64_t)enc->frame_size*ost->st->time_base.den,
 +                                              ost->st->time_base.num, enc->sample_rate);
 +                    enc->frame_size = fs_tmp;
 +                }
 +                if (ret <= 0) {
 +                    ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL);
 +                }
 +                if (ret < 0) {
-                     fprintf(stderr, "Audio encoding failed\n");
++                    av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
 +                    exit_program(1);
 +                }
 +                audio_size += ret;
 +                pkt.flags |= AV_PKT_FLAG_KEY;
 +                break;
 +            case AVMEDIA_TYPE_VIDEO:
 +                ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL);
 +                if (ret < 0) {
-                     fprintf(stderr, "Video encoding failed\n");
++                    av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n");
 +                    exit_program(1);
 +                }
 +                video_size += ret;
 +                if(enc->coded_frame && enc->coded_frame->key_frame)
 +                    pkt.flags |= AV_PKT_FLAG_KEY;
 +                if (ost->logfile && enc->stats_out) {
 +                    fprintf(ost->logfile, "%s", enc->stats_out);
 +                }
 +                break;
 +            default:
 +                ret=-1;
 +            }
 +
 +            if (ret <= 0)
 +                break;
 +            pkt.data = bit_buffer;
 +            pkt.size = ret;
 +            if (enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
 +                pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
 +            write_frame(os, &pkt, ost->st->codec, ost->bitstream_filters);
 +        }
 +    }
 +}
 +
 +/* pkt = NULL means EOF (needed to flush decoder buffers) */
 +static int output_packet(InputStream *ist, int ist_index,
 +                         OutputStream *ost_table, int nb_ostreams,
 +                         const AVPacket *pkt)
 +{
 +    AVFormatContext *os;
 +    OutputStream *ost;
 +    int ret, i;
 +    int got_output;
 +    AVFrame picture;
 +    void *buffer_to_free = NULL;
 +    static unsigned int samples_size= 0;
 +    AVSubtitle subtitle, *subtitle_to_free;
 +    int64_t pkt_pts = AV_NOPTS_VALUE;
 +#if CONFIG_AVFILTER
 +    int frame_available;
 +#endif
 +    float quality;
 +
 +    AVPacket avpkt;
 +    int bps = av_get_bytes_per_sample(ist->st->codec->sample_fmt);
 +
 +    if(ist->next_pts == AV_NOPTS_VALUE)
 +        ist->next_pts= ist->pts;
 +
 +    if (pkt == NULL) {
 +        /* EOF handling */
 +        av_init_packet(&avpkt);
 +        avpkt.data = NULL;
 +        avpkt.size = 0;
 +        goto handle_eof;
 +    } else {
          avpkt = *pkt;
      }
  
      handle_eof:
          ist->pts= ist->next_pts;
  
--        if(avpkt.size && avpkt.size != pkt->size &&
--           ((!ist->showed_multi_packet_warning && verbose>0) || verbose>1)){
--            fprintf(stderr, "Multiple frames in a packet from stream %d\n", pkt->stream_index);
++        if(avpkt.size && avpkt.size != pkt->size)
++            av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING,
++                   "Multiple frames in a packet from stream %d\n", pkt->stream_index);
              ist->showed_multi_packet_warning=1;
--        }
  
          /* decode the packet if needed */
          decoded_data_buf = NULL; /* fail safe */
@@@ -1981,22 -1938,131 +1971,22 @@@ static int transcode_init(OutputFile *o
      InputStream *ist;
      char error[1024];
      int want_sdp = 1;
 -    uint8_t no_packet[MAX_FILES]={0};
 -    int no_packet_count=0;
  
 -    if (rate_emu)
 -        for (i = 0; i < nb_input_streams; i++)
 -            input_streams[i].start = av_gettime();
 +    /* init framerate emulation */
 +    for (i = 0; i < nb_input_files; i++) {
 +        InputFile *ifile = &input_files[i];
 +        if (ifile->rate_emu)
 +            for (j = 0; j < ifile->nb_streams; j++)
 +                input_streams[j + ifile->ist_index].start = av_gettime();
 +    }
  
      /* output stream init */
 -    nb_ostreams = 0;
      for(i=0;i<nb_output_files;i++) {
 -        os = output_files[i];
 +        os = output_files[i].ctx;
          if (!os->nb_streams && !(os->oformat->flags & AVFMT_NOSTREAMS)) {
 -            av_dump_format(output_files[i], i, output_files[i]->filename, 1);
 -            fprintf(stderr, "Output file #%d does not contain any stream\n", i);
 -            ret = AVERROR(EINVAL);
 -            goto fail;
 -        }
 -        nb_ostreams += os->nb_streams;
 -    }
 -    if (nb_stream_maps > 0 && nb_stream_maps != nb_ostreams) {
 -        fprintf(stderr, "Number of stream maps must match number of output streams\n");
 -        ret = AVERROR(EINVAL);
 -        goto fail;
 -    }
 -
 -    /* Sanity check the mapping args -- do the input files & streams exist? */
 -    for(i=0;i<nb_stream_maps;i++) {
 -        int fi = stream_maps[i].file_index;
 -        int si = stream_maps[i].stream_index;
 -
 -        if (fi < 0 || fi > nb_input_files - 1 ||
 -            si < 0 || si > input_files[fi].nb_streams - 1) {
 -            fprintf(stderr,"Could not find input stream #%d.%d\n", fi, si);
 -            ret = AVERROR(EINVAL);
 -            goto fail;
 -        }
 -        fi = stream_maps[i].sync_file_index;
 -        si = stream_maps[i].sync_stream_index;
 -        if (fi < 0 || fi > nb_input_files - 1 ||
 -            si < 0 || si > input_files[fi].nb_streams - 1) {
 -            fprintf(stderr,"Could not find sync stream #%d.%d\n", fi, si);
 -            ret = AVERROR(EINVAL);
 -            goto fail;
 -        }
 -    }
 -
 -    ost_table = av_mallocz(sizeof(OutputStream *) * nb_ostreams);
 -    if (!ost_table)
 -        goto fail;
 -    n = 0;
 -    for(k=0;k<nb_output_files;k++) {
 -        os = output_files[k];
 -        for(i=0;i<os->nb_streams;i++,n++) {
 -            int found;
 -            ost = ost_table[n] = output_streams_for_file[k][i];
 -            if (nb_stream_maps > 0) {
 -                ost->source_index = input_files[stream_maps[n].file_index].ist_index +
 -                    stream_maps[n].stream_index;
 -
 -                /* Sanity check that the stream types match */
 -                if (input_streams[ost->source_index].st->codec->codec_type != ost->st->codec->codec_type) {
 -                    int i= ost->file_index;
 -                    av_dump_format(output_files[i], i, output_files[i]->filename, 1);
 -                    fprintf(stderr, "Codec type mismatch for mapping #%d.%d -> #%d.%d\n",
 -                        stream_maps[n].file_index, stream_maps[n].stream_index,
 -                        ost->file_index, ost->index);
 -                    exit_program(1);
 -                }
 -
 -            } else {
 -                int best_nb_frames=-1;
 -                /* get corresponding input stream index : we select the first one with the right type */
 -                found = 0;
 -                for (j = 0; j < nb_input_streams; j++) {
 -                    int skip=0;
 -                    ist = &input_streams[j];
 -                    if(opt_programid){
 -                        int pi,si;
 -                        AVFormatContext *f = input_files[ist->file_index].ctx;
 -                        skip=1;
 -                        for(pi=0; pi<f->nb_programs; pi++){
 -                            AVProgram *p= f->programs[pi];
 -                            if(p->id == opt_programid)
 -                                for(si=0; si<p->nb_stream_indexes; si++){
 -                                    if(f->streams[ p->stream_index[si] ] == ist->st)
 -                                        skip=0;
 -                                }
 -                        }
 -                    }
 -                    if (ist->discard && ist->st->discard != AVDISCARD_ALL && !skip &&
 -                        ist->st->codec->codec_type == ost->st->codec->codec_type) {
 -                        if(best_nb_frames < ist->st->codec_info_nb_frames){
 -                            best_nb_frames= ist->st->codec_info_nb_frames;
 -                            ost->source_index = j;
 -                            found = 1;
 -                        }
 -                    }
 -                }
 -
 -                if (!found) {
 -                    if(! opt_programid) {
 -                        /* try again and reuse existing stream */
 -                        for (j = 0; j < nb_input_streams; j++) {
 -                            ist = &input_streams[j];
 -                            if (   ist->st->codec->codec_type == ost->st->codec->codec_type
 -                                && ist->st->discard != AVDISCARD_ALL) {
 -                                ost->source_index = j;
 -                                found = 1;
 -                            }
 -                        }
 -                    }
 -                    if (!found) {
 -                        int i= ost->file_index;
 -                        av_dump_format(output_files[i], i, output_files[i]->filename, 1);
 -                        fprintf(stderr, "Could not find input stream matching output stream #%d.%d\n",
 -                                ost->file_index, ost->index);
 -                        exit_program(1);
 -                    }
 -                }
 -            }
 -            ist = &input_streams[ost->source_index];
 -            ist->discard = 0;
 -            ost->sync_ist = (nb_stream_maps > 0) ?
 -                &input_streams[input_files[stream_maps[n].sync_file_index].ist_index +
 -                         stream_maps[n].sync_stream_index] : ist;
 +            av_dump_format(os, i, os->filename, 1);
-             fprintf(stderr, "Output file #%d does not contain any stream\n", i);
++            av_log(NULL, AV_LOG_ERROR, "Output file #%d does not contain any stream\n", i);
 +            return AVERROR(EINVAL);
          }
      }
  
              switch(codec->codec_type) {
              case AVMEDIA_TYPE_AUDIO:
                  if(audio_volume != 256) {
--                    fprintf(stderr,"-acodec copy and -vol are incompatible (frames are not decoded)\n");
++                    av_log(NULL, AV_LOG_FATAL, "-acodec copy and -vol are incompatible (frames are not decoded)\n");
                      exit_program(1);
                  }
                  codec->channel_layout = icodec->channel_layout;
                  choose_pixel_fmt(ost->st, ost->enc);
  
                  if (ost->st->codec->pix_fmt == PIX_FMT_NONE) {
--                    fprintf(stderr, "Video pixel format is unknown, stream cannot be encoded\n");
++                    av_log(NULL, AV_LOG_FATAL, "Video pixel format is unknown, stream cannot be encoded\n");
                      exit_program(1);
                  }
  
  
  #if CONFIG_AVFILTER
                  if (configure_video_filters(ist, ost)) {
--                    fprintf(stderr, "Error opening filters!\n");
++                    av_log(NULL, AV_LOG_FATAL, "Error opening filters!\n");
                      exit(1);
                  }
  #endif
                  if (codec->flags & CODEC_FLAG_PASS1) {
                      f = fopen(logfilename, "wb");
                      if (!f) {
--                        fprintf(stderr, "Cannot write log file '%s' for pass-1 encoding: %s\n", logfilename, strerror(errno));
++                        av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n",
++                               logfilename, strerror(errno));
                          exit_program(1);
                      }
                      ost->logfile = f;
                      char  *logbuffer;
                      size_t logbuffer_size;
                      if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
--                        fprintf(stderr, "Error reading log file '%s' for pass-2 encoding\n", logfilename);
++                        av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n",
++                               logfilename);
                          exit_program(1);
                      }
                      codec->stats_in = logbuffer;
      if (!bit_buffer)
          bit_buffer = av_malloc(bit_buffer_size);
      if (!bit_buffer) {
--        fprintf(stderr, "Cannot allocate %d bytes output buffer\n",
--                bit_buffer_size);
 -        ret = AVERROR(ENOMEM);
 -        goto fail;
++        av_log(NULL, AV_LOG_ERROR, "Cannot allocate %d bytes output buffer\n",
++               bit_buffer_size);
 +        return AVERROR(ENOMEM);
      }
  
      /* open each encoder */
      }
  
      /* dump the stream mapping */
--    if (verbose >= 0) {
--        fprintf(stderr, "Stream mapping:\n");
-         for (i = 0; i < nb_output_streams;i ++) {
-             ost = &output_streams[i];
 -        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);
-             if (ost->st->stream_copy)
-                 fprintf(stderr, " (copy)");
-             else
-                 fprintf(stderr, " (%s -> %s)", input_streams[ost->source_index].dec ?
-                         input_streams[ost->source_index].dec->name : "?",
-                         ost->enc ? ost->enc->name : "?");
--            fprintf(stderr, "\n");
--        }
++    av_log(NULL, AV_LOG_INFO, "Stream mapping:\n");
++    for (i = 0; i < nb_output_streams; i++) {
++        ost = &output_streams[i];
++        av_log(NULL, AV_LOG_INFO, "  Stream #%d.%d -> #%d.%d",
++               input_streams[ost->source_index].file_index,
++               input_streams[ost->source_index].st->index,
++               ost->file_index,
++               ost->index);
++        if (ost->sync_ist != &input_streams[ost->source_index])
++            av_log(NULL, AV_LOG_INFO, " [sync #%d.%d]",
++                   ost->sync_ist->file_index,
++                   ost->sync_ist->st->index);
++        if (ost->st->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) {
--        fprintf(stderr, "%s\n", error);
 -        goto fail;
++        av_log(NULL, AV_LOG_ERROR, "%s\n", error);
 +        return ret;
      }
  
      if (want_sdp) {
          print_sdp(output_files, nb_output_files);
      }
  
 -    if (verbose >= 0)
 -        fprintf(stderr, "Press ctrl-c to stop encoding\n");
 +    return 0;
 +}
 +
 +/*
 + * The following code is the main loop of the file converter
 + */
 +static int transcode(OutputFile *output_files, int nb_output_files,
 +                     InputFile  *input_files,  int nb_input_files)
 +{
 +    int ret, i;
 +    AVFormatContext *is, *os;
 +    OutputStream *ost;
 +    InputStream *ist;
 +    uint8_t *no_packet;
 +    int no_packet_count=0;
 +    int64_t timer_start;
 +    int key;
 +
 +    if (!(no_packet = av_mallocz(nb_input_files)))
 +        exit_program(1);
 +
 +    ret = transcode_init(output_files, nb_output_files, input_files, nb_input_files);
 +    if (ret < 0)
 +        goto fail;
 +
 +    if (!using_stdin) {
-         if(verbose >= 0)
-             fprintf(stderr, "Press [q] to stop, [?] for help\n");
++        av_log(NULL, AV_LOG_INFO, "Press [q] to stop, [?] for help\n");
 +        avio_set_interrupt_cb(decode_interrupt_cb);
 +    }
      term_init();
  
      timer_start = av_gettime();
      for(; received_sigterm == 0;) {
          int file_index, ist_index;
          AVPacket pkt;
 -        double ipts_min;
 +        int64_t ipts_min;
          double opts_min;
  
 -    redo:
 -        ipts_min= 1e100;
 +        ipts_min= INT64_MAX;
          opts_min= 1e100;
-             if (key == '+') verbose++;
-             if (key == '-') verbose--;
 +        /* if 'q' pressed, exits */
 +        if (!using_stdin) {
 +            if (q_pressed)
 +                break;
 +            /* read_key() returns 0 on EOF */
 +            key = read_key();
 +            if (key == 'q')
 +                break;
++            if (key == '+') av_log_set_level(av_log_get_level()+10);
++            if (key == '-') av_log_set_level(av_log_get_level()-10);
 +            if (key == 's') qp_hist     ^= 1;
 +            if (key == 'h'){
 +                if (do_hex_dump){
 +                    do_hex_dump = do_pkt_dump = 0;
 +                } else if(do_pkt_dump){
 +                    do_hex_dump = 1;
 +                } else
 +                    do_pkt_dump = 1;
 +                av_log_set_level(AV_LOG_DEBUG);
 +            }
 +#if CONFIG_AVFILTER
 +            if (key == 'c' || key == 'C'){
 +                char buf[4096], target[64], command[256], arg[256] = {0};
 +                double time;
 +                int k, n = 0;
 +                fprintf(stderr, "\nEnter command: <target> <time> <command>[ <argument>]\n");
 +                i = 0;
 +                while ((k = read_key()) != '\n' && k != '\r' && i < sizeof(buf)-1)
 +                    if (k > 0)
 +                        buf[i++] = k;
 +                buf[i] = 0;
 +                if (k > 0 &&
 +                    (n = sscanf(buf, "%63[^ ] %lf %255[^ ] %255[^\n]", target, &time, command, arg)) >= 3) {
 +                    av_log(NULL, AV_LOG_DEBUG, "Processing command target:%s time:%f command:%s arg:%s",
 +                           target, time, command, arg);
 +                    for (i = 0; i < nb_output_streams; i++) {
 +                        ost = &output_streams[i];
 +                        if (ost->graph) {
 +                            if (time < 0) {
 +                                ret = avfilter_graph_send_command(ost->graph, target, command, arg, buf, sizeof(buf),
 +                                                                  key == 'c' ? AVFILTER_CMD_FLAG_ONE : 0);
 +                                fprintf(stderr, "Command reply for stream %d: ret:%d res:%s\n", i, ret, buf);
 +                            } else {
 +                                ret = avfilter_graph_queue_command(ost->graph, target, command, arg, 0, time);
 +                            }
 +                        }
 +                    }
 +                } else {
 +                    av_log(NULL, AV_LOG_ERROR,
 +                           "Parse error, at least 3 arguments were expected, "
 +                           "only %d given in string '%s'\n", n, buf);
 +                }
 +            }
 +#endif
 +            if (key == 'd' || key == 'D'){
 +                int debug=0;
 +                if(key == 'D') {
 +                    debug = input_streams[0].st->codec->debug<<1;
 +                    if(!debug) debug = 1;
 +                    while(debug & (FF_DEBUG_DCT_COEFF|FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) //unsupported, would just crash
 +                        debug += debug;
 +                }else
 +                    scanf("%d", &debug);
 +                for(i=0;i<nb_input_streams;i++) {
 +                    input_streams[i].st->codec->debug = debug;
 +                }
 +                for(i=0;i<nb_output_streams;i++) {
 +                    ost = &output_streams[i];
 +                    ost->st->codec->debug = debug;
 +                }
 +                if(debug) av_log_set_level(AV_LOG_DEBUG);
 +                fprintf(stderr,"debug=%d\n", debug);
 +            }
 +            if (key == '?'){
 +                fprintf(stderr, "key    function\n"
 +                                "?      show this help\n"
 +                                "+      increase verbosity\n"
 +                                "-      decrease verbosity\n"
 +                                "c      Send command to filtergraph\n"
 +                                "D      cycle through available debug modes\n"
 +                                "h      dump packets/hex press to cycle through the 3 states\n"
 +                                "q      quit\n"
 +                                "s      Show QP histogram\n"
 +                );
 +            }
 +        }
  
          /* select the stream that we must read now by looking at the
             smallest output pts */
              && (is->iformat->flags & AVFMT_TS_DISCONT)) {
              int64_t pkt_dts= av_rescale_q(pkt.dts, ist->st->time_base, AV_TIME_BASE_Q);
              int64_t delta= pkt_dts - ist->next_pts;
 -            if((FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE || pkt_dts+1<ist->pts)&& !copy_ts){
 +            if((delta < -1LL*dts_delta_threshold*AV_TIME_BASE ||
 +                (delta > 1LL*dts_delta_threshold*AV_TIME_BASE &&
 +                 ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) ||
 +                pkt_dts+1<ist->pts)&& !copy_ts){
                  input_files[ist->file_index].ts_offset -= delta;
--                if (verbose > 2)
--                    fprintf(stderr, "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n",
--                            delta, input_files[ist->file_index].ts_offset);
++                av_log(NULL, AV_LOG_DEBUG, "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n",
++                       delta, input_files[ist->file_index].ts_offset);
                  pkt.dts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
                  if(pkt.pts != AV_NOPTS_VALUE)
                      pkt.pts-= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
              }
          }
  
 -        /* 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) {
  
--            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);
      return ret;
  }
  
 -static int opt_format(const char *opt, const char *arg)
 -{
 -    last_asked_format = arg;
 -    return 0;
 -}
 -
 -static int opt_video_rc_override_string(const char *opt, const char *arg)
 -{
 -    video_rc_override_string = arg;
 -    return 0;
 -}
 -
 -static int opt_me_threshold(const char *opt, const char *arg)
 -{
 -    me_threshold = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX);
 -    return 0;
 -}
 -
  static int opt_verbose(const char *opt, const char *arg)
  {
--    verbose = parse_number_or_die(opt, arg, OPT_INT64, -10, 10);
 -    return 0;
 -}
 -
 -static int opt_frame_rate(const char *opt, const char *arg)
 -{
 -    if (av_parse_video_rate(&frame_rate, arg) < 0) {
 -        fprintf(stderr, "Incorrect value for %s: %s\n", opt, arg);
 -        exit_program(1);
 -    }
++    av_log(NULL, AV_LOG_WARNING, "-%s is deprecated, use -loglevel\n", opt);
      return 0;
  }
  
  static int opt_frame_crop(const char *opt, const char *arg)
  {
--    fprintf(stderr, "Option '%s' has been removed, use the crop filter instead\n", opt);
++    av_log(NULL, AV_LOG_FATAL, "Option '%s' has been removed, use the crop filter instead\n", opt);
      return AVERROR(EINVAL);
  }
  
 -static int opt_frame_size(const char *opt, const char *arg)
 +static int opt_pad(const char *opt, const char *arg)
  {
 -    if (av_parse_video_size(&frame_width, &frame_height, arg) < 0) {
 -        fprintf(stderr, "Incorrect frame size\n");
 -        return AVERROR(EINVAL);
 -    }
 -    return 0;
 -}
 -
 -static int opt_pad(const char *opt, const char *arg) {
--    fprintf(stderr, "Option '%s' has been removed, use the pad filter instead\n", opt);
++    av_log(NULL, AV_LOG_FATAL, "Option '%s' has been removed, use the pad filter instead\n", opt);
      return -1;
  }
  
@@@ -2702,10 -2823,82 +2689,10 @@@ static double parse_frame_aspect_ratio(
          ar = strtod(arg, NULL);
  
      if (!ar) {
--        fprintf(stderr, "Incorrect aspect ratio specification.\n");
 -        return AVERROR(EINVAL);
 -    }
 -    frame_aspect_ratio = ar;
 -    return 0;
 -}
 -
 -static int opt_metadata(const char *opt, const char *arg)
 -{
 -    char *mid= strchr(arg, '=');
 -
 -    if(!mid){
 -        fprintf(stderr, "Missing =\n");
++        av_log(NULL, AV_LOG_FATAL, "Incorrect aspect ratio specification.\n");
          exit_program(1);
      }
 -    *mid++= 0;
 -
 -    av_dict_set(&metadata, arg, mid, 0);
 -
 -    return 0;
 -}
 -
 -static int opt_qscale(const char *opt, const char *arg)
 -{
 -    video_qscale = parse_number_or_die(opt, arg, OPT_FLOAT, 0, 255);
 -    if (video_qscale == 0) {
 -        fprintf(stderr, "qscale must be > 0.0 and <= 255\n");
 -        return AVERROR(EINVAL);
 -    }
 -    return 0;
 -}
 -
 -static int opt_top_field_first(const char *opt, const char *arg)
 -{
 -    top_field_first = parse_number_or_die(opt, arg, OPT_INT, 0, 1);
 -    return 0;
 -}
 -
 -static int opt_thread_count(const char *opt, const char *arg)
 -{
 -    thread_count= parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX);
 -#if !HAVE_THREADS
 -    if (verbose >= 0)
 -        fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n");
 -#endif
 -    return 0;
 -}
 -
 -static int opt_audio_sample_fmt(const char *opt, const char *arg)
 -{
 -    if (strcmp(arg, "list")) {
 -        audio_sample_fmt = av_get_sample_fmt(arg);
 -        if (audio_sample_fmt == AV_SAMPLE_FMT_NONE) {
 -            av_log(NULL, AV_LOG_ERROR, "Invalid sample format '%s'\n", arg);
 -            return AVERROR(EINVAL);
 -        }
 -    } else {
 -        int i;
 -        char fmt_str[128];
 -        for (i = -1; i < AV_SAMPLE_FMT_NB; i++)
 -            printf("%s\n", av_get_sample_fmt_string(fmt_str, sizeof(fmt_str), i));
 -        exit_program(0);
 -    }
 -    return 0;
 -}
 -
 -static int opt_audio_rate(const char *opt, const char *arg)
 -{
 -    audio_sample_rate = parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX);
 -    return 0;
 -}
 -
 -static int opt_audio_channels(const char *opt, const char *arg)
 -{
 -    audio_channels = parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX);
 -    return 0;
 +    return ar;
  }
  
  static int opt_video_channel(const char *opt, const char *arg)
  static int opt_video_standard(const char *opt, const char *arg)
  {
      av_log(NULL, AV_LOG_WARNING, "This option is deprecated, use -standard.\n");
 -    opt_default("standard", arg);
 -    return 0;
 -}
 -
 -static int opt_codec(int *pstream_copy, char **pcodec_name,
 -                      int codec_type, const char *arg)
 -{
 -    av_freep(pcodec_name);
 -    if (!strcmp(arg, "copy")) {
 -        *pstream_copy = 1;
 -    } else {
 -        *pcodec_name = av_strdup(arg);
 -    }
 -    return 0;
 +    return opt_default("standard", arg);
  }
  
 -static int opt_audio_codec(const char *opt, const char *arg)
 +static int opt_audio_codec(OptionsContext *o, const char *opt, const char *arg)
  {
 -    return opt_codec(&audio_stream_copy, &audio_codec_name, AVMEDIA_TYPE_AUDIO, arg);
 +    audio_codec_name = arg;
 +    return parse_option(o, "codec:a", arg, options);
  }
  
 -static int opt_video_codec(const char *opt, const char *arg)
 +static int opt_video_codec(OptionsContext *o, const char *opt, const char *arg)
  {
 -    return opt_codec(&video_stream_copy, &video_codec_name, AVMEDIA_TYPE_VIDEO, arg);
 +    video_codec_name = arg;
 +    return parse_option(o, "codec:v", arg, options);
  }
  
 -static int opt_subtitle_codec(const char *opt, const char *arg)
 +static int opt_subtitle_codec(OptionsContext *o, const char *opt, const char *arg)
  {
 -    return opt_codec(&subtitle_stream_copy, &subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, arg);
 +    subtitle_codec_name = arg;
 +    return parse_option(o, "codec:s", arg, options);
  }
  
 -static int opt_data_codec(const char *opt, const char *arg)
 +static int opt_data_codec(OptionsContext *o, const char *opt, const char *arg)
  {
 -    return opt_codec(&data_stream_copy, &data_codec_name, AVMEDIA_TYPE_DATA, arg);
 +    return parse_option(o, "codec:d", arg, options);
  }
  
 -static int opt_codec_tag(const char *opt, const char *arg)
 +static int opt_map(OptionsContext *o, const char *opt, const char *arg)
  {
 -    char *tail;
 -    uint32_t *codec_tag;
 -
 -    codec_tag = !strcmp(opt, "atag") ? &audio_codec_tag :
 -                !strcmp(opt, "vtag") ? &video_codec_tag :
 -                !strcmp(opt, "stag") ? &subtitle_codec_tag : NULL;
 -    if (!codec_tag)
 -        return -1;
 -
 -    *codec_tag = strtol(arg, &tail, 0);
 -    if (!tail || *tail)
 -        *codec_tag = AV_RL32(arg);
 +    StreamMap *m = NULL;
 +    int i, negative = 0, file_idx;
 +    int sync_file_idx = -1, sync_stream_idx;
 +    char *p, *sync;
 +    char *map;
 +
 +    if (*arg == '-') {
 +        negative = 1;
 +        arg++;
 +    }
 +    map = av_strdup(arg);
 +
 +    /* parse sync stream first, just pick first matching stream */
 +    if (sync = strchr(map, ',')) {
 +        *sync = 0;
 +        sync_file_idx = strtol(sync + 1, &sync, 0);
 +        if (sync_file_idx >= nb_input_files || sync_file_idx < 0) {
-             av_log(NULL, AV_LOG_ERROR, "Invalid sync file index: %d.\n", sync_file_idx);
++            av_log(NULL, AV_LOG_FATAL, "Invalid sync file index: %d.\n", sync_file_idx);
 +            exit_program(1);
 +        }
 +        if (*sync)
 +            sync++;
 +        for (i = 0; i < input_files[sync_file_idx].nb_streams; i++)
 +            if (check_stream_specifier(input_files[sync_file_idx].ctx,
 +                                       input_files[sync_file_idx].ctx->streams[i], sync) == 1) {
 +                sync_stream_idx = i;
 +                break;
 +            }
 +        if (i == input_files[sync_file_idx].nb_streams) {
-             av_log(NULL, AV_LOG_ERROR, "Sync stream specification in map %s does not "
++            av_log(NULL, AV_LOG_FATAL, "Sync stream specification in map %s does not "
 +                                       "match any streams.\n", arg);
 +            exit_program(1);
 +        }
 +    }
  
 -    return 0;
 -}
  
 -static int opt_map(const char *opt, const char *arg)
 -{
 -    StreamMap *m;
 -    char *p;
 +    file_idx = strtol(map, &p, 0);
 +    if (file_idx >= nb_input_files || file_idx < 0) {
-         av_log(NULL, AV_LOG_ERROR, "Invalid input file index: %d.\n", file_idx);
++        av_log(NULL, AV_LOG_FATAL, "Invalid input file index: %d.\n", file_idx);
 +        exit_program(1);
 +    }
 +    if (negative)
 +        /* disable some already defined maps */
 +        for (i = 0; i < o->nb_stream_maps; i++) {
 +            m = &o->stream_maps[i];
 +            if (check_stream_specifier(input_files[m->file_index].ctx,
 +                                       input_files[m->file_index].ctx->streams[m->stream_index],
 +                                       *p == ':' ? p + 1 : p) > 0)
 +                m->disabled = 1;
 +        }
 +    else
 +        for (i = 0; i < input_files[file_idx].nb_streams; i++) {
 +            if (check_stream_specifier(input_files[file_idx].ctx, input_files[file_idx].ctx->streams[i],
 +                        *p == ':' ? p + 1 : p) <= 0)
 +                continue;
 +            o->stream_maps = grow_array(o->stream_maps, sizeof(*o->stream_maps),
 +                                        &o->nb_stream_maps, o->nb_stream_maps + 1);
 +            m = &o->stream_maps[o->nb_stream_maps - 1];
  
 -    stream_maps = grow_array(stream_maps, sizeof(*stream_maps), &nb_stream_maps, nb_stream_maps + 1);
 -    m = &stream_maps[nb_stream_maps-1];
 +            m->file_index   = file_idx;
 +            m->stream_index = i;
  
 -    m->file_index = strtol(arg, &p, 0);
 -    if (*p)
 -        p++;
 +            if (sync_file_idx >= 0) {
 +                m->sync_file_index   = sync_file_idx;
 +                m->sync_stream_index = sync_stream_idx;
 +            } else {
 +                m->sync_file_index   = file_idx;
 +                m->sync_stream_index = i;
 +            }
 +        }
  
 -    m->stream_index = strtol(p, &p, 0);
 -    if (*p) {
 -        p++;
 -        m->sync_file_index = strtol(p, &p, 0);
 -        if (*p)
 -            p++;
 -        m->sync_stream_index = strtol(p, &p, 0);
 -    } else {
 -        m->sync_file_index = m->file_index;
 -        m->sync_stream_index = m->stream_index;
 +    if (!m) {
-         av_log(NULL, AV_LOG_ERROR, "Stream map '%s' matches no streams.\n", arg);
++        av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n", arg);
 +        exit_program(1);
      }
 +
 +    av_freep(&map);
      return 0;
  }
  
@@@ -2835,11 -3002,10 +2822,11 @@@ static void parse_meta_type(char *arg, 
          case 's':
          case 'c':
          case 'p':
 -            *index = strtol(++arg, endptr, 0);
 +            if (*(++arg) == ':')
 +                *index = strtol(++arg, NULL, 0);
              break;
          default:
--            fprintf(stderr, "Invalid metadata type %c.\n", *arg);
++            av_log(NULL, AV_LOG_FATAL, "Invalid metadata type %c.\n", *arg);
              exit_program(1);
          }
      } else
@@@ -2874,14 -3040,58 +2861,14 @@@ static int opt_map_metadata(OptionsCont
      return 0;
  }
  
 -static int opt_map_meta_data(const char *opt, const char *arg)
 +static int opt_map_meta_data(OptionsContext *o, const char *opt, const char *arg)
  {
--    fprintf(stderr, "-map_meta_data is deprecated and will be removed soon. "
++    av_log(NULL, AV_LOG_WARNING, "-map_meta_data is deprecated and will be removed soon. "
                      "Use -map_metadata instead.\n");
 -    return opt_map_metadata(opt, arg);
 -}
 -
 -static int opt_map_chapters(const char *opt, const char *arg)
 -{
 -    ChapterMap *c;
 -    char *p;
 -
 -    chapter_maps = grow_array(chapter_maps, sizeof(*chapter_maps), &nb_chapter_maps,
 -                              nb_chapter_maps + 1);
 -    c = &chapter_maps[nb_chapter_maps - 1];
 -    c->out_file = strtol(arg, &p, 0);
 -    if (*p)
 -        p++;
 -
 -    c->in_file = strtol(p, &p, 0);
 -    return 0;
 -}
 -
 -static int opt_input_ts_scale(const char *opt, const char *arg)
 -{
 -    unsigned int stream;
 -    double scale;
 -    char *p;
 -
 -    stream = strtol(arg, &p, 0);
 -    if (*p)
 -        p++;
 -    scale= strtod(p, &p);
 -
 -    ts_scale = grow_array(ts_scale, sizeof(*ts_scale), &nb_ts_scale, stream + 1);
 -    ts_scale[stream] = scale;
 -    return 0;
 +    return opt_map_metadata(o, opt, arg);
  }
  
 -static int opt_recording_time(const char *opt, const char *arg)
 -{
 -    recording_time = parse_time_or_die(opt, arg, 1);
 -    return 0;
 -}
 -
 -static int opt_start_time(const char *opt, const char *arg)
 -{
 -    start_time = parse_time_or_die(opt, arg, 1);
 -    return 0;
 -}
 -
 -static int opt_recording_timestamp(const char *opt, const char *arg)
 +static int opt_recording_timestamp(OptionsContext *o, const char *opt, const char *arg)
  {
      char buf[128];
      int64_t recording_timestamp = parse_time_or_die(opt, arg, 0) / 1E6;
@@@ -2905,114 -3121,17 +2892,112 @@@ static enum CodecID find_codec_or_die(c
          avcodec_find_encoder_by_name(name) :
          avcodec_find_decoder_by_name(name);
      if(!codec) {
-         av_log(NULL, AV_LOG_ERROR, "Unknown %s '%s'\n", codec_string, name);
 -        fprintf(stderr, "Unknown %s '%s'\n", codec_string, name);
++        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_ERROR, "Invalid %s type '%s'\n", codec_string, name);
 -        fprintf(stderr, "Invalid %s type '%s'\n", codec_string, name);
++        av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, name);
          exit_program(1);
      }
      return codec->id;
  }
  
 -static int opt_input_file(const char *opt, const char *filename)
 +static AVCodec *choose_codec(OptionsContext *o, AVFormatContext *s, AVStream *st, enum AVMediaType type)
 +{
 +    char *codec_name = NULL;
 +
 +    MATCH_PER_STREAM_OPT(codec_names, str, codec_name, s, st);
 +
 +    if (!codec_name) {
 +        if (s->oformat) {
 +            st->codec->codec_id = av_guess_codec(s->oformat, NULL, s->filename, NULL, type);
 +            return avcodec_find_encoder(st->codec->codec_id);
 +        }
 +    } else if (!strcmp(codec_name, "copy"))
 +        st->stream_copy = 1;
 +    else {
 +        st->codec->codec_id = find_codec_or_die(codec_name, type, s->iformat == NULL);
 +        return s->oformat ? avcodec_find_encoder_by_name(codec_name) :
 +                            avcodec_find_decoder_by_name(codec_name);
 +    }
 +
 +    return NULL;
 +}
 +
 +/**
 + * Add all the streams from the given input file to the global
 + * list of input streams.
 + */
 +static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
 +{
 +    int i, rfps, rfps_base;
 +
 +    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->dec = choose_codec(o, ic, st, dec->codec_type);
 +        if (!ist->dec)
 +            ist->dec = avcodec_find_decoder(dec->codec_id);
 +
 +        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) {
 +
-                 if (verbose >= 0)
-                     fprintf(stderr,"\nSeems stream %d codec frame rate differs from container frame rate: %2.2f (%d/%d) -> %2.2f (%d/%d)\n",
-                             i, (float)dec->time_base.den / dec->time_base.num, dec->time_base.den, dec->time_base.num,
-                     (float)rfps / rfps_base, rfps, rfps_base);
++                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_file(OptionsContext *o, const char *opt, const char *filename)
  {
      AVFormatContext *ic;
      AVInputFormat *file_iformat = NULL;
      AVDictionary **opts;
      int orig_nb_streams;                     // number of streams before avformat_find_stream_info
  
 -    if (last_asked_format) {
 -        if (!(file_iformat = av_find_input_format(last_asked_format))) {
 -            fprintf(stderr, "Unknown input format: '%s'\n", last_asked_format);
 +    if (o->format) {
 +        if (!(file_iformat = av_find_input_format(o->format))) {
-             fprintf(stderr, "Unknown input format: '%s'\n", o->format);
++            av_log(NULL, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format);
              exit_program(1);
          }
 -        last_asked_format = NULL;
      }
  
      if (!strcmp(filename, "-"))
      /* If not enough info to get the stream parameters, we decode the
         first frames to get it. (used in mpeg case for example) */
      ret = avformat_find_stream_info(ic, opts);
--    if (ret < 0 && verbose >= 0) {
--        fprintf(stderr, "%s: could not find codec parameters\n", filename);
++    if (ret < 0) {
++        av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename);
          av_close_input_file(ic);
          exit_program(1);
      }
          timestamp += ic->start_time;
  
      /* if seeking requested, we execute it */
 -    if (start_time != 0) {
 +    if (o->start_time != 0) {
          ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD);
          if (ret < 0) {
--            fprintf(stderr, "%s: could not seek to position %0.3f\n",
--                    filename, (double)timestamp / AV_TIME_BASE);
++            av_log(NULL, AV_LOG_WARNING, "%s: could not seek to position %0.3f\n",
++                   filename, (double)timestamp / AV_TIME_BASE);
          }
 -        /* reset seek info */
 -        start_time = 0;
      }
  
      /* update the current parameters so that they match the one of the input stream */
 -    for(i=0;i<ic->nb_streams;i++) {
 -        AVStream *st = ic->streams[i];
 -        AVCodecContext *dec = st->codec;
 -        InputStream *ist;
 -
 -        dec->thread_count = thread_count;
 -
 -        input_streams = grow_array(input_streams, sizeof(*input_streams), &nb_input_streams, nb_input_streams + 1);
 -        ist = &input_streams[nb_input_streams - 1];
 -        ist->st = st;
 -        ist->file_index = nb_input_files;
 -        ist->discard = 1;
 -        ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st);
 -
 -        if (i < nb_ts_scale)
 -            ist->ts_scale = ts_scale[i];
 -
 -        switch (dec->codec_type) {
 -        case AVMEDIA_TYPE_AUDIO:
 -            ist->dec = avcodec_find_decoder_by_name(audio_codec_name);
 -            if(audio_disable)
 -                st->discard= AVDISCARD_ALL;
 -            break;
 -        case AVMEDIA_TYPE_VIDEO:
 -            ist->dec = avcodec_find_decoder_by_name(video_codec_name);
 -            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;
 -                dec->height >>= dec->lowres;
 -                dec->width  >>= dec->lowres;
 -            }
 -            if(me_threshold)
 -                dec->debug |= FF_DEBUG_MV;
 -
 -            if (dec->time_base.den != rfps*dec->ticks_per_frame || dec->time_base.num != rfps_base) {
 -
 -                if (verbose >= 0)
 -                    fprintf(stderr,"\nSeems stream %d codec frame rate differs from container frame rate: %2.2f (%d/%d) -> %2.2f (%d/%d)\n",
 -                            i, (float)dec->time_base.den / dec->time_base.num, dec->time_base.den, dec->time_base.num,
 -
 -                    (float)rfps / rfps_base, rfps, rfps_base);
 -            }
 -
 -            if(video_disable)
 -                st->discard= AVDISCARD_ALL;
 -            else if(video_discard)
 -                st->discard= video_discard;
 -            break;
 -        case AVMEDIA_TYPE_DATA:
 -            break;
 -        case AVMEDIA_TYPE_SUBTITLE:
 -            ist->dec = avcodec_find_decoder_by_name(subtitle_codec_name);
 -            if(subtitle_disable)
 -                st->discard = AVDISCARD_ALL;
 -            break;
 -        case AVMEDIA_TYPE_ATTACHMENT:
 -        case AVMEDIA_TYPE_UNKNOWN:
 -            break;
 -        default:
 -            abort();
 -        }
 -    }
 +    add_input_streams(o, ic);
  
      /* dump the file content */
--    if (verbose >= 0)
--        av_dump_format(ic, nb_input_files, filename, 0);
++    av_dump_format(ic, nb_input_files, filename, 0);
  
      input_files = grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1);
      input_files[nb_input_files - 1].ctx        = ic;
      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, AVCodecContext *avctx)
  {
 -    int has_video, has_audio, has_subtitle, has_data, i, j;
 -    AVFormatContext *ic;
 -
 -    has_video = 0;
 -    has_audio = 0;
 -    has_subtitle = 0;
 -    has_data = 0;
 +    char *p;
 +    int n = 1, i;
 +    int64_t t;
  
 -    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();
 -            }
 -        }
 +    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);
      }
 -    *has_video_ptr = has_video;
 -    *has_audio_ptr = has_audio;
 -    *has_subtitle_ptr = has_subtitle;
 -    *has_data_ptr = has_data;
  }
  
 -static void new_video_stream(AVFormatContext *oc, int file_idx)
 +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 = av_new_stream(oc, oc->nb_streams < o->nb_streamid_map ? o->streamid_map[oc->nb_streams] : 0);
 +    int idx      = oc->nb_streams - 1;
 +    int64_t max_frames = INT64_MAX;
 +    char *bsf = NULL, *next, *codec_tag = NULL;
 +    AVBitStreamFilterContext *bsfc, *bsfc_prev = NULL;
 +    double qscale = -1;
  
 -    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_ERROR, "Could not alloc stream.\n");
++        av_log(NULL, AV_LOG_FATAL, "Could not alloc stream.\n");
 +        exit_program(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;
 +    ost->enc = choose_codec(o, oc, st, type);
 +    if (ost->enc) {
 +        ost->opts  = filter_codec_opts(codec_opts, ost->enc->id, oc, st);
 +    }
 +
 +    avcodec_get_context_defaults3(st->codec, ost->enc);
 +    st->codec->codec_type = type; // XXX hack, avcodec_get_context_defaults2() sets type to unknown for stream copy
 +
 +    MATCH_PER_STREAM_OPT(max_frames, i64, max_frames, oc, st);
 +    ost->max_frames = max_frames;
 +
 +    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_ERROR, "Unknown bitstream filter %s\n", 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;
 +
 +        bsfc_prev = bsfc;
 +        bsf       = next;
      }
  
 -    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
 +    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;
      }
  
 -    ost->bitstream_filters = video_bitstream_filters;
 -    video_bitstream_filters= NULL;
 +    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;
 +    }
  
 -    st->codec->thread_count= thread_count;
 +    ost->sws_flags = av_get_int(sws_opts, "sws_flags", NULL);
 +    return ost;
 +}
  
 -    video_enc = st->codec;
 +static void parse_matrix_coeffs(uint16_t *dest, const char *str)
 +{
 +    int i;
 +    const char *p = str;
 +    for(i = 0;; i++) {
 +        dest[i] = atoi(p);
 +        if(i == 63)
 +            break;
 +        p = strchr(p, ',');
 +        if(!p) {
-             fprintf(stderr, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
++            av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
 +            exit_program(1);
 +        }
 +        p++;
 +    }
 +}
  
 -    if(video_codec_tag)
 -        video_enc->codec_tag= video_codec_tag;
 +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(oc->oformat->flags & AVFMT_GLOBALHEADER) {
          video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
      }
  
 -    video_enc->codec_type = AVMEDIA_TYPE_VIDEO;
 -    if (video_stream_copy) {
 -        st->stream_copy = 1;
 -        video_enc->sample_aspect_ratio =
 -        st->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255);
 -    } else {
 -        const char *p;
 -        int i;
 +    if (!st->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;
  
 -        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_ERROR, "Invalid framerate value: %s\n", frame_rate);
++            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_ERROR, "Invalid frame size: %s.\n", frame_size);
++            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_ERROR, "Unknown pixel format requested: %s.\n", frame_pix_fmt);
++            av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt);
 +            exit_program(1);
 +        }
          st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
  
          if (intra_only)
              video_enc->gop_size = 0;
 -        if (video_qscale || same_quality) {
 -            video_enc->flags |= CODEC_FLAG_QSCALE;
 -            video_enc->global_quality = FF_QP2LAMBDA * video_qscale;
 +        MATCH_PER_STREAM_OPT(intra_matrices, str, intra_matrix, oc, st);
 +        if (intra_matrix) {
 +            if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) {
-                 av_log(NULL, AV_LOG_ERROR, "Could not allocate memory for intra matrix.\n");
++                av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for intra matrix.\n");
 +                exit_program(1);
 +            }
 +            parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix);
 +        }
 +        MATCH_PER_STREAM_OPT(inter_matrices, str, inter_matrix, oc, st);
 +        if (inter_matrix) {
 +            if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) {
-                 av_log(NULL, AV_LOG_ERROR, "Could not allocate memory for inter matrix.\n");
++                av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for inter matrix.\n");
 +                exit_program(1);
 +            }
 +            parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix);
          }
  
 -        if(intra_matrix)
 -            video_enc->intra_matrix = intra_matrix;
 -        if(inter_matrix)
 -            video_enc->inter_matrix = inter_matrix;
 -
 -        p= video_rc_override_string;
 +        MATCH_PER_STREAM_OPT(rc_overrides, str, p, oc, st);
          for(i=0; p; i++){
              int start, end, q;
              int e=sscanf(p, "%d,%d,%d", &start, &end, &q);
              if(e!=3){
--                fprintf(stderr, "error parsing rc_override\n");
++                av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n");
                  exit_program(1);
              }
              video_enc->rc_override=
@@@ -3370,35 -3555,47 +3354,35 @@@ static OutputStream *new_audio_stream(O
      if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
          audio_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
      }
 -    if (audio_stream_copy) {
 -        st->stream_copy = 1;
 -    } else {
 -        audio_enc->codec_id = codec_id;
 +    if (!st->stream_copy) {
 +        char *sample_fmt = NULL;
 +
 +        MATCH_PER_STREAM_OPT(audio_channels, i, audio_enc->channels, oc, st);
  
 -        if (audio_qscale > QSCALE_NONE) {
 -            audio_enc->flags |= CODEC_FLAG_QSCALE;
 -            audio_enc->global_quality = FF_QP2LAMBDA * audio_qscale;
 +        MATCH_PER_STREAM_OPT(sample_fmts, str, sample_fmt, oc, st);
 +        if (sample_fmt &&
 +            (audio_enc->sample_fmt = av_get_sample_fmt(sample_fmt)) == AV_SAMPLE_FMT_NONE) {
-             av_log(NULL, AV_LOG_ERROR, "Invalid sample format '%s'\n", sample_fmt);
++            av_log(NULL, AV_LOG_FATAL, "Invalid sample format '%s'\n", sample_fmt);
 +            exit_program(1);
          }
 -        if (audio_channels)
 -            audio_enc->channels = audio_channels;
 -        if (audio_sample_fmt != AV_SAMPLE_FMT_NONE)
 -            audio_enc->sample_fmt = audio_sample_fmt;
 -        if (audio_sample_rate)
 -            audio_enc->sample_rate = audio_sample_rate;
 -    }
 -    if (audio_language) {
 -        av_dict_set(&st->metadata, "language", audio_language, 0);
 -        av_freep(&audio_language);
 +
 +        MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st);
      }
  
 -    /* reset some key parameters */
 -    audio_disable = 0;
 -    av_freep(&audio_codec_name);
 -    audio_stream_copy = 0;
 +    return ost;
  }
  
 -static void new_data_stream(AVFormatContext *oc, int file_idx)
 +static OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc)
  {
      AVStream *st;
      OutputStream *ost;
      AVCodecContext *data_enc;
  
 -    ost = new_output_stream(oc, file_idx, NULL);
 +    ost = new_output_stream(o, oc, AVMEDIA_TYPE_DATA);
      st  = ost->st;
      data_enc = st->codec;
 -    if (!data_stream_copy) {
 -        fprintf(stderr, "Data stream encoding not supported yet (only streamcopy)\n");
 +    if (!st->stream_copy) {
-         fprintf(stderr, "Data stream encoding not supported yet (only streamcopy)\n");
++        av_log(NULL, AV_LOG_FATAL, "Data stream encoding not supported yet (only streamcopy)\n");
          exit_program(1);
      }
  
@@@ -3438,9 -3692,9 +3422,9 @@@ static int opt_streamid(OptionsContext 
      av_strlcpy(idx_str, arg, sizeof(idx_str));
      p = strchr(idx_str, ':');
      if (!p) {
--        fprintf(stderr,
--                "Invalid value '%s' for option '%s', required syntax is 'index:value'\n",
--                arg, opt);
++        av_log(NULL, AV_LOG_FATAL,
++               "Invalid value '%s' for option '%s', required syntax is 'index:value'\n",
++               arg, opt);
          exit_program(1);
      }
      *p++ = '\0';
@@@ -3552,86 -3748,44 +3536,86 @@@ static void opt_output_file(void *optct
              print_error(filename, err);
              exit_program(1);
          }
 +    } 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 {
 -        use_video = file_oformat->video_codec != CODEC_ID_NONE || video_stream_copy || video_codec_name;
 -        use_audio = file_oformat->audio_codec != CODEC_ID_NONE || audio_stream_copy || audio_codec_name;
 -        use_subtitle = file_oformat->subtitle_codec != CODEC_ID_NONE || subtitle_stream_copy || subtitle_codec_name;
 -        use_data = data_stream_copy ||  data_codec_name; /* XXX once generic data codec will be available add a ->data_codec reference and use it here */
 -
 -        /* disable if no corresponding type found */
 -        check_inputs(&input_has_video,
 -                     &input_has_audio,
 -                     &input_has_subtitle,
 -                     &input_has_data);
 -
 -        if (!input_has_video)
 -            use_video = 0;
 -        if (!input_has_audio)
 -            use_audio = 0;
 -        if (!input_has_subtitle)
 -            use_subtitle = 0;
 -        if (!input_has_data)
 -            use_data = 0;
 -
 -        /* manual disable */
 -        if (audio_disable)    use_audio    = 0;
 -        if (video_disable)    use_video    = 0;
 -        if (subtitle_disable) use_subtitle = 0;
 -        if (data_disable)     use_data     = 0;
 -
 -        if (use_video)    new_video_stream(oc, nb_output_files);
 -        if (use_audio)    new_audio_stream(oc, nb_output_files);
 -        if (use_subtitle) new_subtitle_stream(oc, nb_output_files);
 -        if (use_data)     new_data_stream(oc, nb_output_files);
 -
 -        av_dict_copy(&oc->metadata, metadata, 0);
 -        av_dict_free(&metadata);
 +        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];
 +            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;
 +            default:
-                 av_log(NULL, AV_LOG_ERROR, "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;
 +        }
      }
  
 -    av_dict_copy(&output_opts[nb_output_files], format_opts, 0);
 -    output_files[nb_output_files++] = oc;
 +    output_files = grow_array(output_files, sizeof(*output_files), &nb_output_files, nb_output_files + 1);
 +    output_files[nb_output_files - 1].ctx       = oc;
 +    output_files[nb_output_files - 1].ost_index = nb_output_streams - oc->nb_streams;
 +    output_files[nb_output_files - 1].recording_time = o->recording_time;
 +    output_files[nb_output_files - 1].start_time     = o->start_time;
 +    output_files[nb_output_files - 1].limit_filesize = o->limit_filesize;
 +    av_dict_copy(&output_files[nb_output_files - 1].opts, format_opts, 0);
  
      /* check filename in case of an image number is expected */
      if (oc->oformat->flags & AVFMT_NEEDNUMBER) {
                      fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
                      fflush(stderr);
                      if (!read_yesno()) {
--                        fprintf(stderr, "Not overwriting - exiting\n");
++                        av_log(0, AV_LOG_FATAL, "Not overwriting - exiting\n");
                          exit_program(1);
                      }
                  }
                  else {
--                    fprintf(stderr,"File '%s' already exists. Exiting.\n", filename);
++                    av_log(0, AV_LOG_FATAL,"File '%s' already exists. Exiting.\n", filename);
                      exit_program(1);
                  }
              }
          av_log(NULL, AV_LOG_WARNING, "-loop_output is deprecated, use -loop\n");
          oc->loop_output = loop_output;
      }
 -    oc->flags |= AVFMT_FLAG_NONBLOCK;
  
 -    frame_rate    = (AVRational){0, 0};
 -    frame_width   = 0;
 -    frame_height  = 0;
 -    audio_sample_rate = 0;
 -    audio_channels    = 0;
 -    audio_sample_fmt  = AV_SAMPLE_FMT_NONE;
 +    /* copy chapters */
 +    if (o->chapters_input_file >= nb_input_files) {
 +        if (o->chapters_input_file == INT_MAX) {
 +            /* copy chapters from the first input file that has them*/
 +            o->chapters_input_file = -1;
 +            for (i = 0; i < nb_input_files; i++)
 +                if (input_files[i].ctx->nb_chapters) {
 +                    o->chapters_input_file = i;
 +                    break;
 +                }
 +        } else {
-             av_log(NULL, AV_LOG_ERROR, "Invalid input file index %d in chapter mapping.\n",
++            av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n",
 +                   o->chapters_input_file);
 +            exit_program(1);
 +        }
 +    }
 +    if (o->chapters_input_file >= 0)
 +        copy_chapters(&input_files[o->chapters_input_file], &output_files[nb_output_files - 1],
 +                      !o->metadata_chapters_manual);
 +
 +    /* copy metadata */
 +    for (i = 0; i < o->nb_meta_data_maps; i++) {
 +        AVFormatContext *files[2];
 +        AVDictionary    **meta[2];
 +        int j;
  
 -    av_freep(&forced_key_frames);
 -    uninit_opts();
 -    init_opts();
 +#define METADATA_CHECK_INDEX(index, nb_elems, desc)\
 +        if ((index) < 0 || (index) >= (nb_elems)) {\
-             av_log(NULL, AV_LOG_ERROR, "Invalid %s index %d while processing metadata maps\n",\
++            av_log(NULL, AV_LOG_FATAL, "Invalid %s index %d while processing metadata maps\n",\
 +                     (desc), (index));\
 +            exit_program(1);\
 +        }
 +
 +        int in_file_index = o->meta_data_maps[i][1].file;
 +        if (in_file_index < 0)
 +            continue;
 +        METADATA_CHECK_INDEX(in_file_index, nb_input_files, "input file")
 +
 +        files[0] = oc;
 +        files[1] = input_files[in_file_index].ctx;
 +
 +        for (j = 0; j < 2; j++) {
 +            MetadataMap *map = &o->meta_data_maps[i][j];
 +
 +            switch (map->type) {
 +            case 'g':
 +                meta[j] = &files[j]->metadata;
 +                break;
 +            case 's':
 +                METADATA_CHECK_INDEX(map->index, files[j]->nb_streams, "stream")
 +                meta[j] = &files[j]->streams[map->index]->metadata;
 +                break;
 +            case 'c':
 +                METADATA_CHECK_INDEX(map->index, files[j]->nb_chapters, "chapter")
 +                meta[j] = &files[j]->chapters[map->index]->metadata;
 +                break;
 +            case 'p':
 +                METADATA_CHECK_INDEX(map->index, files[j]->nb_programs, "program")
 +                meta[j] = &files[j]->programs[map->index]->metadata;
 +                break;
 +            }
 +        }
 +
 +        av_dict_copy(meta[0], *meta[1], AV_DICT_DONT_OVERWRITE);
 +    }
 +
 +    /* copy global metadata by default */
 +    if (!o->metadata_global_manual && nb_input_files){
 +        av_dict_copy(&oc->metadata, input_files[0].ctx->metadata,
 +                     AV_DICT_DONT_OVERWRITE);
 +        if(o->recording_time != INT64_MAX)
 +            av_dict_set(&oc->metadata, "duration", NULL, 0);
 +    }
 +    if (!o->metadata_streams_manual)
 +        for (i = output_files[nb_output_files - 1].ost_index; i < nb_output_streams; i++) {
 +            InputStream *ist = &input_streams[output_streams[i].source_index];
 +            av_dict_copy(&output_streams[i].st->metadata, ist->st->metadata, AV_DICT_DONT_OVERWRITE);
 +        }
 +
 +    /* process manually set metadata */
 +    for (i = 0; i < o->nb_metadata; i++) {
 +        AVDictionary **m;
 +        char type, *val;
 +        int index = 0;
 +
 +        val = strchr(o->metadata[i].u.str, '=');
 +        if (!val) {
-             av_log(NULL, AV_LOG_ERROR, "No '=' character in metadata string %s.\n",
++            av_log(NULL, AV_LOG_FATAL, "No '=' character in metadata string %s.\n",
 +                   o->metadata[i].u.str);
 +            exit_program(1);
 +        }
 +        *val++ = 0;
 +
 +        parse_meta_type(o->metadata[i].specifier, &type, &index);
 +        switch (type) {
 +        case 'g':
 +            m = &oc->metadata;
 +            break;
 +        case 's':
 +            if (index < 0 || index >= oc->nb_streams) {
-                 av_log(NULL, AV_LOG_ERROR, "Invalid stream index %d in metadata specifier.\n", index);
++                av_log(NULL, AV_LOG_FATAL, "Invalid stream index %d in metadata specifier.\n", index);
 +                exit_program(1);
 +            }
 +            m = &oc->streams[index]->metadata;
 +            break;
 +        case 'c':
 +            if (index < 0 || index >= oc->nb_chapters) {
-                 av_log(NULL, AV_LOG_ERROR, "Invalid chapter index %d in metadata specifier.\n", index);
++                av_log(NULL, AV_LOG_FATAL, "Invalid chapter index %d in metadata specifier.\n", index);
 +                exit_program(1);
 +            }
 +            m = &oc->chapters[index]->metadata;
 +            break;
 +        default:
-             av_log(NULL, AV_LOG_ERROR, "Invalid metadata specifier %s.\n", o->metadata[i].specifier);
++            av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", o->metadata[i].specifier);
 +            exit_program(1);
 +        }
 +
 +        av_dict_set(m, o->metadata[i].u.str, *val ? val : NULL, 0);
 +    }
 +
 +    reset_options(o, 0);
  }
  
  /* same option as mencoder */
@@@ -3942,35 -4008,44 +3926,35 @@@ static int opt_target(OptionsContext *o
          norm = FILM;
          arg += 5;
      } else {
 -        int fr;
 -        /* Calculate FR via float to avoid int overflow */
 -        fr = (int)(frame_rate.num * 1000.0 / frame_rate.den);
 -        if(fr == 25000) {
 -            norm = PAL;
 -        } else if((fr == 29970) || (fr == 23976)) {
 -            norm = NTSC;
 -        } else {
 -            /* Try to determine PAL/NTSC by peeking in the input files */
 -            if(nb_input_files) {
 -                int i, j;
 -                for (j = 0; j < nb_input_files; j++) {
 -                    for (i = 0; i < input_files[j].ctx->nb_streams; i++) {
 -                        AVCodecContext *c = input_files[j].ctx->streams[i]->codec;
 -                        if(c->codec_type != AVMEDIA_TYPE_VIDEO)
 -                            continue;
 -                        fr = c->time_base.den * 1000 / c->time_base.num;
 -                        if(fr == 25000) {
 -                            norm = PAL;
 -                            break;
 -                        } else if((fr == 29970) || (fr == 23976)) {
 -                            norm = NTSC;
 -                            break;
 -                        }
 -                    }
 -                    if(norm != UNKNOWN)
 +        /* Try to determine PAL/NTSC by peeking in the input files */
 +        if(nb_input_files) {
 +            int i, j, fr;
 +            for (j = 0; j < nb_input_files; j++) {
 +                for (i = 0; i < input_files[j].nb_streams; i++) {
 +                    AVCodecContext *c = input_files[j].ctx->streams[i]->codec;
 +                    if(c->codec_type != AVMEDIA_TYPE_VIDEO)
 +                        continue;
 +                    fr = c->time_base.den * 1000 / c->time_base.num;
 +                    if(fr == 25000) {
 +                        norm = PAL;
                          break;
 +                    } else if((fr == 29970) || (fr == 23976)) {
 +                        norm = NTSC;
 +                        break;
 +                    }
                  }
 +                if(norm != UNKNOWN)
 +                    break;
              }
          }
--        if(verbose > 0 && norm != UNKNOWN)
--            fprintf(stderr, "Assuming %s for target.\n", norm == PAL ? "PAL" : "NTSC");
++        if (norm != UNKNOWN)
++            av_log(NULL, AV_LOG_INFO, "Assuming %s for target.\n", norm == PAL ? "PAL" : "NTSC");
      }
  
      if(norm == UNKNOWN) {
--        fprintf(stderr, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n");
--        fprintf(stderr, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n");
--        fprintf(stderr, "or set a framerate with \"-r xxx\".\n");
++        av_log(NULL, AV_LOG_FATAL, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n");
++        av_log(NULL, AV_LOG_FATAL, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n");
++        av_log(NULL, AV_LOG_FATAL, "or set a framerate with \"-r xxx\".\n");
          exit_program(1);
      }
  
  
      } else if(!strncmp(arg, "dv", 2)) {
  
 -        opt_format("f", "dv");
 +        parse_option(o, "f", "dv", options);
  
 -        opt_frame_size("s", norm == PAL ? "720x576" : "720x480");
 -        opt_frame_pix_fmt("pix_fmt", !strncmp(arg, "dv50", 4) ? "yuv422p" :
 -                          norm == PAL ? "yuv420p" : "yuv411p");
 -        opt_frame_rate("r", frame_rates[norm]);
 +        parse_option(o, "s", norm == PAL ? "720x576" : "720x480", options);
 +        parse_option(o, "pix_fmt", !strncmp(arg, "dv50", 4) ? "yuv422p" :
 +                          norm == PAL ? "yuv420p" : "yuv411p", options);
 +        parse_option(o, "r", frame_rates[norm], options);
  
 -        audio_sample_rate = 48000;
 -        audio_channels = 2;
 +        parse_option(o, "ar", "48000", options);
 +        parse_option(o, "ac", "2", options);
  
      } else {
--        fprintf(stderr, "Unknown target: %s\n", arg);
++        av_log(NULL, AV_LOG_ERROR, "Unknown target: %s\n", arg);
          return AVERROR(EINVAL);
      }
      return 0;
@@@ -4102,15 -4181,12 +4086,15 @@@ static int opt_preset(OptionsContext *o
  {
      FILE *f=NULL;
      char filename[1000], tmp[1000], tmp2[1000], line[1000];
 -    char *codec_name = *opt == 'v' ? video_codec_name :
 -                       *opt == 'a' ? audio_codec_name :
 -                                     subtitle_codec_name;
 +    const char *codec_name = *opt == 'v' ? video_codec_name :
 +                             *opt == 'a' ? audio_codec_name :
 +                                           subtitle_codec_name;
  
      if (!(f = get_preset_file(filename, sizeof(filename), arg, *opt == 'f', codec_name))) {
 -        fprintf(stderr, "File for preset '%s' not found\n", arg);
 +        if(!strncmp(arg, "libx264-lossless", strlen("libx264-lossless"))){
-             fprintf(stderr, "Please use -preset <speed> -qp 0\n");
++            av_log(0, AV_LOG_FATAL, "Please use -preset <speed> -qp 0\n");
 +        }else
-             fprintf(stderr, "File for preset '%s' not found\n", arg);
++            av_log(0, AV_LOG_FATAL, "File for preset '%s' not found\n", arg);
          exit_program(1);
      }
  
              continue;
          e|= sscanf(line, "%999[^=]=%999[^\n]\n", tmp, tmp2) - 2;
          if(e){
--            fprintf(stderr, "%s: Invalid syntax: '%s'\n", filename, line);
++            av_log(0, AV_LOG_FATAL, "%s: Invalid syntax: '%s'\n", filename, line);
              exit_program(1);
          }
          if(!strcmp(tmp, "acodec")){
 -            opt_audio_codec(tmp, tmp2);
 +            opt_audio_codec(o, tmp, tmp2);
          }else if(!strcmp(tmp, "vcodec")){
 -            opt_video_codec(tmp, tmp2);
 +            opt_video_codec(o, tmp, tmp2);
          }else if(!strcmp(tmp, "scodec")){
 -            opt_subtitle_codec(tmp, tmp2);
 +            opt_subtitle_codec(o, tmp, tmp2);
          }else if(!strcmp(tmp, "dcodec")){
 -            opt_data_codec(tmp, tmp2);
 +            opt_data_codec(o, tmp, tmp2);
          }else if(opt_default(tmp, tmp2) < 0){
--            fprintf(stderr, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n", filename, line, tmp, tmp2);
++            av_log(0, AV_LOG_FATAL, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n", filename, line, tmp, tmp2);
              exit_program(1);
          }
      }
@@@ -4207,11 -4245,12 +4191,11 @@@ static const OptionDef options[] = 
        "dump each input packet" },
      { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump},
        "when dumping packets, also dump the payload" },
 -    { "re", OPT_BOOL | OPT_EXPERT, {(void*)&rate_emu}, "read input at native frame rate", "" },
 +    { "re", OPT_BOOL | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(rate_emu)}, "read input at native frame rate", "" },
      { "loop_input", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "deprecated, use -loop" },
      { "loop_output", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&loop_output}, "deprecated, use -loop", "" },
-     { "v", HAS_ARG, {(void*)opt_verbose}, "set the verbosity level", "number" },
 -    { "v", HAS_ARG, {(void*)opt_verbose}, "set ffmpeg verbosity level", "number" },
 -    { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
 -    { "threads",  HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
++    { "v", HAS_ARG, {(void*)opt_verbose}, "deprecated, use -loglevel instead", "number" },
 +    { "target", HAS_ARG | OPT_FUNC2, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
      { "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" },
      { "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" },
      { "adrift_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&audio_drift_threshold}, "audio drift threshold", "threshold" },
  
  int main(int argc, char **argv)
  {
 +    OptionsContext o = { 0 };
      int64_t ti;
  
 +    reset_options(&o, 0);
 +
      av_log_set_flags(AV_LOG_SKIP_REPEATED);
+     parse_loglevel(argc, argv, options);
  
-         verbose=-1;
 +    if(argc>1 && !strcmp(argv[1], "-d")){
 +        run_as_daemon=1;
 +        av_log_set_callback(log_callback_null);
 +        argc--;
 +        argv++;
 +    }
 +
      avcodec_register_all();
  #if CONFIG_AVDEVICE
      avdevice_register_all();
  #endif
      av_register_all();
  
 -    avio_set_interrupt_cb(decode_interrupt_cb);
 -
 -    init_opts();
 +#if HAVE_ISATTY
 +    if(isatty(STDIN_FILENO))
 +        avio_set_interrupt_cb(decode_interrupt_cb);
 +#endif
  
-     if(verbose>=0)
-         show_banner();
+     show_banner();
  
 -    av_log(NULL, AV_LOG_WARNING, "This program is not developed anymore and is only "
 -                                 "provided for compatibility. Use avconv instead "
 -                                 "(see Changelog for the list of incompatible changes).\n");
 -
      /* parse options */
 -    parse_options(NULL, argc, argv, options, opt_output_file);
 +    parse_options(&o, argc, argv, options, opt_output_file);
  
      if(nb_output_files <= 0 && nb_input_files == 0) {
          show_usage();
-         fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
 -        fprintf(stderr, "Use -h to get full help or, even better, run 'man ffmpeg'\n");
++        av_log(NULL, AV_LOG_WARNING, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
          exit_program(1);
      }
  
      /* file converter / grab */
      if (nb_output_files <= 0) {
--        fprintf(stderr, "At least one output file must be specified\n");
++        av_log(NULL, AV_LOG_FATAL, "At least one output file must be specified\n");
          exit_program(1);
      }
  
      if (nb_input_files == 0) {
--        fprintf(stderr, "At least one input file must be specified\n");
++        av_log(NULL, AV_LOG_FATAL, "At least one input file must be specified\n");
          exit_program(1);
      }
  
diff --cc ffplay.c
index b4215c5,0000000..af086a7
mode 100644,000000..100644
--- /dev/null
+++ b/ffplay.c
@@@ -1,3116 -1,0 +1,3117 @@@
 +/*
 + * ffplay : Simple Media Player based on the FFmpeg libraries
 + * Copyright (c) 2003 Fabrice Bellard
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
 + *
 + * FFmpeg is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with FFmpeg; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 + */
 +
 +#include "config.h"
 +#include <inttypes.h>
 +#include <math.h>
 +#include <limits.h>
 +#include "libavutil/avstring.h"
 +#include "libavutil/colorspace.h"
 +#include "libavutil/mathematics.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/imgutils.h"
 +#include "libavutil/dict.h"
 +#include "libavutil/parseutils.h"
 +#include "libavutil/samplefmt.h"
 +#include "libavutil/avassert.h"
 +#include "libavformat/avformat.h"
 +#include "libavdevice/avdevice.h"
 +#include "libswscale/swscale.h"
 +#include "libavcodec/audioconvert.h"
 +#include "libavutil/opt.h"
 +#include "libavcodec/avfft.h"
 +
 +#if CONFIG_AVFILTER
 +# include "libavfilter/avcodec.h"
 +# include "libavfilter/avfilter.h"
 +# include "libavfilter/avfiltergraph.h"
 +# include "libavfilter/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
 +
 +#define FRAME_SKIP_FACTOR 0.05
 +
 +/* maximum audio speed change to get correct sync */
 +#define SAMPLE_CORRECTION_PERCENT_MAX 10
 +
 +/* we use about AUDIO_DIFF_AVG_NB A-V differences to make the average */
 +#define AUDIO_DIFF_AVG_NB   20
 +
 +/* NOTE: the size must be big enough to compensate the hardware audio buffersize size */
 +#define SAMPLE_ARRAY_SIZE (2*65536)
 +
 +static int sws_flags = SWS_BICUBIC;
 +
 +typedef struct PacketQueue {
 +    AVPacketList *first_pkt, *last_pkt;
 +    int nb_packets;
 +    int size;
 +    int abort_request;
 +    SDL_mutex *mutex;
 +    SDL_cond *cond;
 +} PacketQueue;
 +
 +#define VIDEO_PICTURE_QUEUE_SIZE 2
 +#define SUBPICTURE_QUEUE_SIZE 4
 +
 +typedef struct VideoPicture {
 +    double pts;                                  ///<presentation time stamp for this picture
 +    double target_clock;                         ///<av_gettime() time at which this should be displayed ideally
 +    double duration;                             ///<expected duration of the frame
 +    int64_t pos;                                 ///<byte position in file
 +    SDL_Overlay *bmp;
 +    int width, height; /* source height & width */
 +    int allocated;
 +    enum PixelFormat pix_fmt;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterBufferRef *picref;
 +#endif
 +} VideoPicture;
 +
 +typedef struct SubPicture {
 +    double pts; /* presentation time stamp for this picture */
 +    AVSubtitle sub;
 +} SubPicture;
 +
 +enum {
 +    AV_SYNC_AUDIO_MASTER, /* default choice */
 +    AV_SYNC_VIDEO_MASTER,
 +    AV_SYNC_EXTERNAL_CLOCK, /* synchronize to an external clock */
 +};
 +
 +typedef struct VideoState {
 +    SDL_Thread *read_tid;
 +    SDL_Thread *video_tid;
 +    SDL_Thread *refresh_tid;
 +    AVInputFormat *iformat;
 +    int no_background;
 +    int abort_request;
 +    int paused;
 +    int last_paused;
 +    int seek_req;
 +    int seek_flags;
 +    int64_t seek_pos;
 +    int64_t seek_rel;
 +    int read_pause_return;
 +    AVFormatContext *ic;
 +
 +    int audio_stream;
 +
 +    int av_sync_type;
 +    double external_clock; /* external clock base */
 +    int64_t external_clock_time;
 +
 +    double audio_clock;
 +    double audio_diff_cum; /* used for AV difference average computation */
 +    double audio_diff_avg_coef;
 +    double audio_diff_threshold;
 +    int audio_diff_avg_count;
 +    AVStream *audio_st;
 +    PacketQueue audioq;
 +    int audio_hw_buf_size;
 +    /* samples output by the codec. we reserve more space for avsync
 +       compensation */
 +    DECLARE_ALIGNED(16,uint8_t,audio_buf1)[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2];
 +    DECLARE_ALIGNED(16,uint8_t,audio_buf2)[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2];
 +    uint8_t *audio_buf;
 +    unsigned int audio_buf_size; /* in bytes */
 +    int audio_buf_index; /* in bytes */
 +    int audio_write_buf_size;
 +    AVPacket audio_pkt_temp;
 +    AVPacket audio_pkt;
 +    enum AVSampleFormat audio_src_fmt;
 +    AVAudioConvert *reformat_ctx;
 +    double audio_current_pts;
 +    double audio_current_pts_drift;
 +
 +    enum ShowMode {
 +        SHOW_MODE_NONE = -1, SHOW_MODE_VIDEO = 0, SHOW_MODE_WAVES, SHOW_MODE_RDFT, SHOW_MODE_NB
 +    } show_mode;
 +    int16_t sample_array[SAMPLE_ARRAY_SIZE];
 +    int sample_array_index;
 +    int last_i_start;
 +    RDFTContext *rdft;
 +    int rdft_bits;
 +    FFTSample *rdft_data;
 +    int xpos;
 +
 +    SDL_Thread *subtitle_tid;
 +    int subtitle_stream;
 +    int subtitle_stream_changed;
 +    AVStream *subtitle_st;
 +    PacketQueue subtitleq;
 +    SubPicture subpq[SUBPICTURE_QUEUE_SIZE];
 +    int subpq_size, subpq_rindex, subpq_windex;
 +    SDL_mutex *subpq_mutex;
 +    SDL_cond *subpq_cond;
 +
 +    double frame_timer;
 +    double frame_last_pts;
 +    double frame_last_delay;
 +    double video_clock;                          ///<pts of last decoded frame / predicted pts of next decoded frame
 +    int video_stream;
 +    AVStream *video_st;
 +    PacketQueue videoq;
 +    double video_current_pts;                    ///<current displayed pts (different from video_clock if frame fifos are used)
 +    double video_current_pts_drift;              ///<video_current_pts - time (av_gettime) at which we updated video_current_pts - used to have running video pts
 +    int64_t video_current_pos;                   ///<current displayed file pos
 +    VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE];
 +    int pictq_size, pictq_rindex, pictq_windex;
 +    SDL_mutex *pictq_mutex;
 +    SDL_cond *pictq_cond;
 +#if !CONFIG_AVFILTER
 +    struct SwsContext *img_convert_ctx;
 +#endif
 +
 +    char filename[1024];
 +    int width, height, xleft, ytop;
 +    int step;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterContext *out_video_filter;          ///<the last filter in the video chain
 +#endif
 +
 +    float skip_frames;
 +    float skip_frames_index;
 +    int refresh;
 +} VideoState;
 +
 +static int opt_help(const char *opt, const char *arg);
 +
 +/* options specified by the user */
 +static AVInputFormat *file_iformat;
 +static const char *input_filename;
 +static const char *window_title;
 +static int fs_screen_width;
 +static int fs_screen_height;
 +static int screen_width = 0;
 +static int screen_height = 0;
 +static int audio_disable;
 +static int video_disable;
 +static int wanted_stream[AVMEDIA_TYPE_NB]={
 +    [AVMEDIA_TYPE_AUDIO]=-1,
 +    [AVMEDIA_TYPE_VIDEO]=-1,
 +    [AVMEDIA_TYPE_SUBTITLE]=-1,
 +};
 +static int seek_by_bytes=-1;
 +static int display_disable;
 +static int show_status = 1;
 +static int av_sync_type = AV_SYNC_AUDIO_MASTER;
 +static int64_t start_time = AV_NOPTS_VALUE;
 +static int64_t duration = AV_NOPTS_VALUE;
 +static int workaround_bugs = 1;
 +static int fast = 0;
 +static int genpts = 0;
 +static int lowres = 0;
 +static int idct = FF_IDCT_AUTO;
 +static enum AVDiscard skip_frame= AVDISCARD_DEFAULT;
 +static enum AVDiscard skip_idct= AVDISCARD_DEFAULT;
 +static enum AVDiscard skip_loop_filter= AVDISCARD_DEFAULT;
 +static int error_recognition = FF_ER_CAREFUL;
 +static int error_concealment = 3;
 +static int decoder_reorder_pts= -1;
 +static int autoexit;
 +static int exit_on_keydown;
 +static int exit_on_mousedown;
 +static int loop=1;
 +static int framedrop=-1;
 +static enum ShowMode show_mode = SHOW_MODE_NONE;
 +
 +static int rdftspeed=20;
 +#if CONFIG_AVFILTER
 +static char *vfilters = NULL;
 +#endif
 +
 +/* current context */
 +static int is_full_screen;
 +static 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_st->codec->channels;
 +    nb_display_channels = channels;
 +    if (!s->paused) {
 +        int data_used= s->show_mode == SHOW_MODE_WAVES ? s->width : (2*nb_freq);
 +        n = 2 * channels;
 +        delay = 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_st->codec->sample_rate) / 1000000;
 +        }
 +
 +        delay += 2*data_used;
 +        if (delay < data_used)
 +            delay = data_used;
 +
 +        i_start= x = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE);
 +        if (s->show_mode == SHOW_MODE_WAVES) {
 +            h= INT_MIN;
 +            for(i=0; i<1000; i+=channels){
 +                int idx= (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE;
 +                int a= s->sample_array[idx];
 +                int b= s->sample_array[(idx + 4*channels)%SAMPLE_ARRAY_SIZE];
 +                int c= s->sample_array[(idx + 5*channels)%SAMPLE_ARRAY_SIZE];
 +                int d= s->sample_array[(idx + 9*channels)%SAMPLE_ARRAY_SIZE];
 +                int score= a-d;
 +                if(h<score && (b^c)<0){
 +                    h= score;
 +                    i_start= idx;
 +                }
 +            }
 +        }
 +
 +        s->last_i_start = i_start;
 +    } else {
 +        i_start = s->last_i_start;
 +    }
 +
 +    bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +    if (s->show_mode == SHOW_MODE_WAVES) {
 +        fill_rectangle(screen,
 +                       s->xleft, s->ytop, s->width, s->height,
 +                       bgcolor);
 +
 +        fgcolor = SDL_MapRGB(screen->format, 0xff, 0xff, 0xff);
 +
 +        /* total height for one channel */
 +        h = s->height / nb_display_channels;
 +        /* graph height / 2 */
 +        h2 = (h * 9) / 20;
 +        for(ch = 0;ch < nb_display_channels; ch++) {
 +            i = i_start + ch;
 +            y1 = s->ytop + ch * h + (h / 2); /* position of center line */
 +            for(x = 0; x < s->width; x++) {
 +                y = (s->sample_array[i] * h2) >> 15;
 +                if (y < 0) {
 +                    y = -y;
 +                    ys = y1 - y;
 +                } else {
 +                    ys = y1;
 +                }
 +                fill_rectangle(screen,
 +                               s->xleft + x, ys, 1, y,
 +                               fgcolor);
 +                i += channels;
 +                if (i >= SAMPLE_ARRAY_SIZE)
 +                    i -= SAMPLE_ARRAY_SIZE;
 +            }
 +        }
 +
 +        fgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0xff);
 +
 +        for(ch = 1;ch < nb_display_channels; ch++) {
 +            y = s->ytop + ch * h;
 +            fill_rectangle(screen,
 +                           s->xleft, y, s->width, 1,
 +                           fgcolor);
 +        }
 +        SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height);
 +    }else{
 +        nb_display_channels= FFMIN(nb_display_channels, 2);
 +        if(rdft_bits != s->rdft_bits){
 +            av_rdft_end(s->rdft);
 +            av_free(s->rdft_data);
 +            s->rdft = av_rdft_init(rdft_bits, DFT_R2C);
 +            s->rdft_bits= rdft_bits;
 +            s->rdft_data= av_malloc(4*nb_freq*sizeof(*s->rdft_data));
 +        }
 +        {
 +            FFTSample *data[2];
 +            for(ch = 0;ch < nb_display_channels; ch++) {
 +                data[ch] = s->rdft_data + 2*nb_freq*ch;
 +                i = i_start + ch;
 +                for(x = 0; x < 2*nb_freq; x++) {
 +                    double w= (x-nb_freq)*(1.0/nb_freq);
 +                    data[ch][x]= s->sample_array[i]*(1.0-w*w);
 +                    i += channels;
 +                    if (i >= SAMPLE_ARRAY_SIZE)
 +                        i -= SAMPLE_ARRAY_SIZE;
 +                }
 +                av_rdft_calc(s->rdft, data[ch]);
 +            }
 +            //least efficient way to do this, we should of course directly access it but its more than fast enough
 +            for(y=0; y<s->height; y++){
 +                double w= 1/sqrt(nb_freq);
 +                int a= sqrt(w*sqrt(data[0][2*y+0]*data[0][2*y+0] + data[0][2*y+1]*data[0][2*y+1]));
 +                int b= (nb_display_channels == 2 ) ? sqrt(w*sqrt(data[1][2*y+0]*data[1][2*y+0]
 +                       + data[1][2*y+1]*data[1][2*y+1])) : a;
 +                a= FFMIN(a,255);
 +                b= FFMIN(b,255);
 +                fgcolor = SDL_MapRGB(screen->format, a, b, (a+b)/2);
 +
 +                fill_rectangle(screen,
 +                            s->xpos, s->height-y, 1, 1,
 +                            fgcolor);
 +            }
 +        }
 +        SDL_UpdateRect(screen, s->xpos, s->ytop, 1, s->height);
 +        s->xpos++;
 +        if(s->xpos >= s->width)
 +            s->xpos= s->xleft;
 +    }
 +}
 +
 +static void stream_close(VideoState *is)
 +{
 +    VideoPicture *vp;
 +    int i;
 +    /* XXX: use a special url_shutdown call to abort parse cleanly */
 +    is->abort_request = 1;
 +    SDL_WaitThread(is->read_tid, NULL);
 +    SDL_WaitThread(is->refresh_tid, NULL);
 +
 +    /* free all pictures */
 +    for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +        vp = &is->pictq[i];
 +#if CONFIG_AVFILTER
 +        if (vp->picref) {
 +            avfilter_unref_buffer(vp->picref);
 +            vp->picref = NULL;
 +        }
 +#endif
 +        if (vp->bmp) {
 +            SDL_FreeYUVOverlay(vp->bmp);
 +            vp->bmp = NULL;
 +        }
 +    }
 +    SDL_DestroyMutex(is->pictq_mutex);
 +    SDL_DestroyCond(is->pictq_cond);
 +    SDL_DestroyMutex(is->subpq_mutex);
 +    SDL_DestroyCond(is->subpq_cond);
 +#if !CONFIG_AVFILTER
 +    if (is->img_convert_ctx)
 +        sws_freeContext(is->img_convert_ctx);
 +#endif
 +    av_free(is);
 +}
 +
 +static void do_exit(VideoState *is)
 +{
 +    if (is) {
 +        stream_close(is);
 +    }
 +    av_lockmgr_register(NULL);
 +    uninit_opts();
 +#if CONFIG_AVFILTER
 +    avfilter_uninit();
 +#endif
 +    if (show_status)
 +        printf("\n");
 +    SDL_Quit();
 +    av_log(NULL, AV_LOG_QUIET, "%s", "");
 +    exit(0);
 +}
 +
 +static int video_open(VideoState *is){
 +    int flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL;
 +    int w,h;
 +
 +    if(is_full_screen) flags |= SDL_FULLSCREEN;
 +    else               flags |= SDL_RESIZABLE;
 +
 +    if (is_full_screen && fs_screen_width) {
 +        w = fs_screen_width;
 +        h = fs_screen_height;
 +    } else if(!is_full_screen && screen_width){
 +        w = screen_width;
 +        h = screen_height;
 +#if CONFIG_AVFILTER
 +    }else if (is->out_video_filter && is->out_video_filter->inputs[0]){
 +        w = is->out_video_filter->inputs[0]->w;
 +        h = is->out_video_filter->inputs[0]->h;
 +#else
 +    }else if (is->video_st && is->video_st->codec->width){
 +        w = is->video_st->codec->width;
 +        h = is->video_st->codec->height;
 +#endif
 +    } else {
 +        w = 640;
 +        h = 480;
 +    }
 +    if(screen && is->width == screen->w && screen->w == w
 +       && is->height== screen->h && screen->h == h)
 +        return 0;
 +
 +#ifndef __APPLE__
 +    screen = SDL_SetVideoMode(w, h, 0, flags);
 +#else
 +    /* setting bits_per_pixel = 0 or 32 causes blank video on OS X */
 +    screen = SDL_SetVideoMode(w, h, 24, flags);
 +#endif
 +    if (!screen) {
 +        fprintf(stderr, "SDL: could not set video mode - exiting\n");
 +        do_exit(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_time(double frame_current_pts, VideoState *is)
 +{
 +    double delay, sync_threshold, diff;
 +
 +    /* compute nominal delay */
 +    delay = frame_current_pts - is->frame_last_pts;
 +    if (delay <= 0 || delay >= 10.0) {
 +        /* if incorrect delay, use previous one */
 +        delay = is->frame_last_delay;
 +    } else {
 +        is->frame_last_delay = delay;
 +    }
 +    is->frame_last_pts = frame_current_pts;
 +
 +    /* update delay to follow master synchronisation source */
 +    if (((is->av_sync_type == AV_SYNC_AUDIO_MASTER && is->audio_st) ||
 +         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
 +        /* if video is slave, we try to correct big delays by
 +           duplicating or deleting a frame */
 +        diff = get_video_clock(is) - get_master_clock(is);
 +
 +        /* skip or repeat frame. We take into account the
 +           delay to compute the threshold. I still don't know
 +           if it is the best guess */
 +        sync_threshold = FFMAX(AV_SYNC_THRESHOLD, delay);
 +        if (fabs(diff) < AV_NOSYNC_THRESHOLD) {
 +            if (diff <= -sync_threshold)
 +                delay = 0;
 +            else if (diff >= sync_threshold)
 +                delay = 2 * delay;
 +        }
 +    }
 +    is->frame_timer += delay;
 +
 +    av_dlog(NULL, "video: delay=%0.3f pts=%0.3f A-V=%f\n",
 +            delay, frame_current_pts, -diff);
 +
 +    return is->frame_timer;
 +}
 +
 +/* called to display each frame */
 +static void video_refresh(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +
 +    SubPicture *sp, *sp2;
 +
 +    if (is->video_st) {
 +retry:
 +        if (is->pictq_size == 0) {
 +            //nothing to do, no picture to display in the que
 +        } else {
 +            double time= av_gettime()/1000000.0;
 +            double next_target;
 +            /* dequeue the picture */
 +            vp = &is->pictq[is->pictq_rindex];
 +
 +            if(time < vp->target_clock)
 +                return;
 +            /* update current video pts */
 +            is->video_current_pts = vp->pts;
 +            is->video_current_pts_drift = is->video_current_pts - time;
 +            is->video_current_pos = vp->pos;
 +            if(is->pictq_size > 1){
 +                VideoPicture *nextvp= &is->pictq[(is->pictq_rindex+1)%VIDEO_PICTURE_QUEUE_SIZE];
 +                assert(nextvp->target_clock >= vp->target_clock);
 +                next_target= nextvp->target_clock;
 +            }else{
 +                next_target= vp->target_clock + vp->duration;
 +            }
 +            if((framedrop>0 || (framedrop && is->audio_st)) && time > next_target){
 +                is->skip_frames *= 1.0 + FRAME_SKIP_FACTOR;
 +                if(is->pictq_size > 1){
 +                    /* update queue size and signal for next picture */
 +                    if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE)
 +                        is->pictq_rindex = 0;
 +
 +                    SDL_LockMutex(is->pictq_mutex);
 +                    is->pictq_size--;
 +                    SDL_CondSignal(is->pictq_cond);
 +                    SDL_UnlockMutex(is->pictq_mutex);
 +                    goto retry;
 +                }
 +            }
 +
 +            if(is->subtitle_st) {
 +                if (is->subtitle_stream_changed) {
 +                    SDL_LockMutex(is->subpq_mutex);
 +
 +                    while (is->subpq_size) {
 +                        free_subpicture(&is->subpq[is->subpq_rindex]);
 +
 +                        /* update queue size and signal for next picture */
 +                        if (++is->subpq_rindex == SUBPICTURE_QUEUE_SIZE)
 +                            is->subpq_rindex = 0;
 +
 +                        is->subpq_size--;
 +                    }
 +                    is->subtitle_stream_changed = 0;
 +
 +                    SDL_CondSignal(is->subpq_cond);
 +                    SDL_UnlockMutex(is->subpq_mutex);
 +                } else {
 +                    if (is->subpq_size > 0) {
 +                        sp = &is->subpq[is->subpq_rindex];
 +
 +                        if (is->subpq_size > 1)
 +                            sp2 = &is->subpq[(is->subpq_rindex + 1) % SUBPICTURE_QUEUE_SIZE];
 +                        else
 +                            sp2 = NULL;
 +
 +                        if ((is->video_current_pts > (sp->pts + ((float) sp->sub.end_display_time / 1000)))
 +                                || (sp2 && is->video_current_pts > (sp2->pts + ((float) sp2->sub.start_display_time / 1000))))
 +                        {
 +                            free_subpicture(sp);
 +
 +                            /* update queue size and signal for next picture */
 +                            if (++is->subpq_rindex == SUBPICTURE_QUEUE_SIZE)
 +                                is->subpq_rindex = 0;
 +
 +                            SDL_LockMutex(is->subpq_mutex);
 +                            is->subpq_size--;
 +                            SDL_CondSignal(is->subpq_cond);
 +                            SDL_UnlockMutex(is->subpq_mutex);
 +                        }
 +                    }
 +                }
 +            }
 +
 +            /* display picture */
 +            if (!display_disable)
 +                video_display(is);
 +
 +            /* update queue size and signal for next picture */
 +            if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE)
 +                is->pictq_rindex = 0;
 +
 +            SDL_LockMutex(is->pictq_mutex);
 +            is->pictq_size--;
 +            SDL_CondSignal(is->pictq_cond);
 +            SDL_UnlockMutex(is->pictq_mutex);
 +        }
 +    } else if (is->audio_st) {
 +        /* draw the next audio frame */
 +
 +        /* if only audio stream, then display the audio bars (better
 +           than nothing, just to test the implementation */
 +
 +        /* display picture */
 +        if (!display_disable)
 +            video_display(is);
 +    }
 +    if (show_status) {
 +        static int64_t last_time;
 +        int64_t cur_time;
 +        int aqsize, vqsize, sqsize;
 +        double av_diff;
 +
 +        cur_time = av_gettime();
 +        if (!last_time || (cur_time - last_time) >= 30000) {
 +            aqsize = 0;
 +            vqsize = 0;
 +            sqsize = 0;
 +            if (is->audio_st)
 +                aqsize = is->audioq.size;
 +            if (is->video_st)
 +                vqsize = is->videoq.size;
 +            if (is->subtitle_st)
 +                sqsize = is->subtitleq.size;
 +            av_diff = 0;
 +            if (is->audio_st && is->video_st)
 +                av_diff = get_audio_clock(is) - get_video_clock(is);
 +            printf("%7.2f A-V:%7.3f s:%3.1f aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64"   \r",
 +                   get_master_clock(is),
 +                   av_diff,
 +                   FFMAX(is->skip_frames-1, 0),
 +                   aqsize / 1024,
 +                   vqsize / 1024,
 +                   sqsize,
 +                   is->video_st ? is->video_st->codec->pts_correction_num_faulty_dts : 0,
 +                   is->video_st ? is->video_st->codec->pts_correction_num_faulty_pts : 0);
 +            fflush(stdout);
 +            last_time = cur_time;
 +        }
 +    }
 +}
 +
 +/* allocate a picture (needs to do that in main thread to avoid
 +   potential locking problems */
 +static void alloc_picture(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +
 +    vp = &is->pictq[is->pictq_windex];
 +
 +    if (vp->bmp)
 +        SDL_FreeYUVOverlay(vp->bmp);
 +
 +#if CONFIG_AVFILTER
 +    if (vp->picref)
 +        avfilter_unref_buffer(vp->picref);
 +    vp->picref = NULL;
 +
 +    vp->width   = is->out_video_filter->inputs[0]->w;
 +    vp->height  = is->out_video_filter->inputs[0]->h;
 +    vp->pix_fmt = is->out_video_filter->inputs[0]->format;
 +#else
 +    vp->width   = is->video_st->codec->width;
 +    vp->height  = is->video_st->codec->height;
 +    vp->pix_fmt = is->video_st->codec->pix_fmt;
 +#endif
 +
 +    vp->bmp = SDL_CreateYUVOverlay(vp->width, vp->height,
 +                                   SDL_YV12_OVERLAY,
 +                                   screen);
 +    if (!vp->bmp || vp->bmp->pitches[0] < vp->width) {
 +        /* SDL allocates a buffer smaller than requested if the video
 +         * overlay hardware is unable to support the requested size. */
 +        fprintf(stderr, "Error: the video system does not support an image\n"
 +                        "size of %dx%d pixels. Try using -lowres or -vf \"scale=w:h\"\n"
 +                        "to reduce the image size.\n", vp->width, vp->height );
 +        do_exit(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);
 +
 +    if(is->pictq_size>=VIDEO_PICTURE_QUEUE_SIZE && !is->refresh)
 +        is->skip_frames= FFMAX(1.0 - FRAME_SKIP_FACTOR, is->skip_frames * (1.0-FRAME_SKIP_FACTOR));
 +
 +    while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE &&
 +           !is->videoq.abort_request) {
 +        SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +    }
 +    SDL_UnlockMutex(is->pictq_mutex);
 +
 +    if (is->videoq.abort_request)
 +        return -1;
 +
 +    vp = &is->pictq[is->pictq_windex];
 +
 +    vp->duration = frame_delay;
 +
 +    /* alloc or resize hardware picture buffer */
 +    if (!vp->bmp ||
 +#if CONFIG_AVFILTER
 +        vp->width  != is->out_video_filter->inputs[0]->w ||
 +        vp->height != is->out_video_filter->inputs[0]->h) {
 +#else
 +        vp->width != is->video_st->codec->width ||
 +        vp->height != is->video_st->codec->height) {
 +#endif
 +        SDL_Event event;
 +
 +        vp->allocated = 0;
 +
 +        /* the allocation must be done in the main thread to avoid
 +           locking problems */
 +        event.type = FF_ALLOC_EVENT;
 +        event.user.data1 = is;
 +        SDL_PushEvent(&event);
 +
 +        /* wait until the picture is allocated */
 +        SDL_LockMutex(is->pictq_mutex);
 +        while (!vp->allocated && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        /* 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;
 +
 +        /* now we can update the picture count */
 +        if (++is->pictq_windex == VIDEO_PICTURE_QUEUE_SIZE)
 +            is->pictq_windex = 0;
 +        SDL_LockMutex(is->pictq_mutex);
 +        vp->target_clock= compute_target_time(vp->pts, is);
 +
 +        is->pictq_size++;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +    }
 +    return 0;
 +}
 +
 +static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacket *pkt)
 +{
 +    int got_picture, i;
 +
 +    if (packet_queue_get(&is->videoq, pkt, 1) < 0)
 +        return -1;
 +
 +    if (pkt->data == flush_pkt.data) {
 +        avcodec_flush_buffers(is->video_st->codec);
 +
 +        SDL_LockMutex(is->pictq_mutex);
 +        //Make sure there are no long delay timers (ideally we should just flush the que but thats harder)
 +        for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +            is->pictq[i].target_clock= 0;
 +        }
 +        while (is->pictq_size && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        is->video_current_pos = -1;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        is->frame_last_pts = AV_NOPTS_VALUE;
 +        is->frame_last_delay = 0;
 +        is->frame_timer = (double)av_gettime() / 1000000.0;
 +        is->skip_frames = 1;
 +        is->skip_frames_index = 0;
 +        return 0;
 +    }
 +
 +    avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt);
 +
 +    if (got_picture) {
 +        if (decoder_reorder_pts == -1) {
 +            *pts = frame->best_effort_timestamp;
 +        } else if (decoder_reorder_pts) {
 +            *pts = frame->pkt_pts;
 +        } else {
 +            *pts = frame->pkt_dts;
 +        }
 +
 +        if (*pts == AV_NOPTS_VALUE) {
 +            *pts = 0;
 +        }
 +
 +        is->skip_frames_index += 1;
 +        if(is->skip_frames_index >= is->skip_frames){
 +            is->skip_frames_index -= FFMAX(is->skip_frames, 1.0);
 +            return 1;
 +        }
 +
 +    }
 +    return 0;
 +}
 +
 +#if CONFIG_AVFILTER
 +typedef struct {
 +    VideoState *is;
 +    AVFrame *frame;
 +    int use_dr1;
 +} FilterPriv;
 +
 +static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    AVFilterContext *ctx = codec->opaque;
 +    AVFilterBufferRef  *ref;
 +    int perms = AV_PERM_WRITE;
 +    int i, w, h, stride[4];
 +    unsigned edge;
 +    int pixel_size;
 +
 +    av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE);
 +
 +    if (codec->codec->capabilities & CODEC_CAP_NEG_LINESIZES)
 +        perms |= AV_PERM_NEG_LINESIZES;
 +
 +    if(pic->buffer_hints & FF_BUFFER_HINTS_VALID) {
 +        if(pic->buffer_hints & FF_BUFFER_HINTS_READABLE) perms |= AV_PERM_READ;
 +        if(pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) perms |= AV_PERM_PRESERVE;
 +        if(pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) perms |= AV_PERM_REUSE2;
 +    }
 +    if(pic->reference) perms |= AV_PERM_READ | AV_PERM_PRESERVE;
 +
 +    w = codec->width;
 +    h = codec->height;
 +
 +    if(av_image_check_size(w, h, 0, codec))
 +        return -1;
 +
 +    avcodec_align_dimensions2(codec, &w, &h, stride);
 +    edge = codec->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width();
 +    w += edge << 1;
 +    h += edge << 1;
 +
 +    if(!(ref = avfilter_get_video_buffer(ctx->outputs[0], perms, w, h)))
 +        return -1;
 +
 +    pixel_size = av_pix_fmt_descriptors[ref->format].comp[0].step_minus1+1;
 +    ref->video->w = codec->width;
 +    ref->video->h = codec->height;
 +    for(i = 0; i < 4; i ++) {
 +        unsigned hshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_w : 0;
 +        unsigned vshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_h : 0;
 +
 +        if (ref->data[i]) {
 +            ref->data[i]    += ((edge * pixel_size) >> hshift) + ((edge * ref->linesize[i]) >> vshift);
 +        }
 +        pic->data[i]     = ref->data[i];
 +        pic->linesize[i] = ref->linesize[i];
 +    }
 +    pic->opaque = ref;
 +    pic->age    = INT_MAX;
 +    pic->type   = FF_BUFFER_TYPE_USER;
 +    pic->reordered_opaque = codec->reordered_opaque;
 +    if(codec->pkt) pic->pkt_pts = codec->pkt->pts;
 +    else           pic->pkt_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +static void input_release_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    memset(pic->data, 0, sizeof(pic->data));
 +    avfilter_unref_buffer(pic->opaque);
 +}
 +
 +static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    AVFilterBufferRef *ref = pic->opaque;
 +
 +    if (pic->data[0] == NULL) {
 +        pic->buffer_hints |= FF_BUFFER_HINTS_READABLE;
 +        return codec->get_buffer(codec, pic);
 +    }
 +
 +    if ((codec->width != ref->video->w) || (codec->height != ref->video->h) ||
 +        (codec->pix_fmt != ref->format)) {
 +        av_log(codec, AV_LOG_ERROR, "Picture properties changed.\n");
 +        return -1;
 +    }
 +
 +    pic->reordered_opaque = codec->reordered_opaque;
 +    if(codec->pkt) pic->pkt_pts = codec->pkt->pts;
 +    else           pic->pkt_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +static int input_init(AVFilterContext *ctx, const char *args, void *opaque)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    AVCodecContext *codec;
 +    if(!opaque) return -1;
 +
 +    priv->is = opaque;
 +    codec    = priv->is->video_st->codec;
 +    codec->opaque = ctx;
 +    if((codec->codec->capabilities & CODEC_CAP_DR1)
 +    ) {
 +        av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE);
 +        priv->use_dr1 = 1;
 +        codec->get_buffer     = input_get_buffer;
 +        codec->release_buffer = input_release_buffer;
 +        codec->reget_buffer   = input_reget_buffer;
 +        codec->thread_safe_callbacks = 1;
 +    }
 +
 +    priv->frame = avcodec_alloc_frame();
 +
 +    return 0;
 +}
 +
 +static void input_uninit(AVFilterContext *ctx)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    av_free(priv->frame);
 +}
 +
 +static int input_request_frame(AVFilterLink *link)
 +{
 +    FilterPriv *priv = link->src->priv;
 +    AVFilterBufferRef *picref;
 +    int64_t pts = 0;
 +    AVPacket pkt;
 +    int ret;
 +
 +    while (!(ret = get_video_frame(priv->is, priv->frame, &pts, &pkt)))
 +        av_free_packet(&pkt);
 +    if (ret < 0)
 +        return -1;
 +
 +    if(priv->use_dr1 && priv->frame->opaque) {
 +        picref = avfilter_ref_buffer(priv->frame->opaque, ~0);
 +    } else {
 +        picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h);
 +        av_image_copy(picref->data, picref->linesize,
 +                      priv->frame->data, priv->frame->linesize,
 +                      picref->format, link->w, link->h);
 +    }
 +    av_free_packet(&pkt);
 +
 +    avfilter_copy_frame_props(picref, priv->frame);
 +    picref->pts = pts;
 +
 +    avfilter_start_frame(link, picref);
 +    avfilter_draw_slice(link, 0, link->h, 1);
 +    avfilter_end_frame(link);
 +
 +    return 0;
 +}
 +
 +static int input_query_formats(AVFilterContext *ctx)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    enum PixelFormat pix_fmts[] = {
 +        priv->is->video_st->codec->pix_fmt, PIX_FMT_NONE
 +    };
 +
 +    avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts));
 +    return 0;
 +}
 +
 +static int input_config_props(AVFilterLink *link)
 +{
 +    FilterPriv *priv  = link->src->priv;
 +    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;
 +
 +#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 = 2 * is->audio_st->codec->channels;
 +    samples_size = samples_size1;
 +
 +    /* if not master, then we try to remove or add samples to correct the clock */
 +    if (((is->av_sync_type == AV_SYNC_VIDEO_MASTER && is->video_st) ||
 +         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
 +        double diff, avg_diff;
 +        int wanted_size, min_size, max_size, nb_samples;
 +
 +        ref_clock = get_master_clock(is);
 +        diff = get_audio_clock(is) - ref_clock;
 +
 +        if (diff < AV_NOSYNC_THRESHOLD) {
 +            is->audio_diff_cum = diff + is->audio_diff_avg_coef * is->audio_diff_cum;
 +            if (is->audio_diff_avg_count < AUDIO_DIFF_AVG_NB) {
 +                /* not enough measures to have a correct estimate */
 +                is->audio_diff_avg_count++;
 +            } else {
 +                /* estimate the A-V difference */
 +                avg_diff = is->audio_diff_cum * (1.0 - is->audio_diff_avg_coef);
 +
 +                if (fabs(avg_diff) >= is->audio_diff_threshold) {
 +                    wanted_size = samples_size + ((int)(diff * is->audio_st->codec->sample_rate) * n);
 +                    nb_samples = samples_size / n;
 +
 +                    min_size = ((nb_samples * (100 - SAMPLE_CORRECTION_PERCENT_MAX)) / 100) * n;
 +                    max_size = ((nb_samples * (100 + SAMPLE_CORRECTION_PERCENT_MAX)) / 100) * n;
 +                    if (wanted_size < min_size)
 +                        wanted_size = min_size;
 +                    else if (wanted_size > max_size)
 +                        wanted_size = max_size;
 +
 +                    /* add or remove samples to correction the synchro */
 +                    if (wanted_size < samples_size) {
 +                        /* remove samples */
 +                        samples_size = wanted_size;
 +                    } else if (wanted_size > samples_size) {
 +                        uint8_t *samples_end, *q;
 +                        int nb;
 +
 +                        /* add samples */
 +                        nb = (samples_size - wanted_size);
 +                        samples_end = (uint8_t *)samples + samples_size - n;
 +                        q = samples_end + n;
 +                        while (nb > 0) {
 +                            memcpy(q, samples_end, n);
 +                            q += n;
 +                            nb -= n;
 +                        }
 +                        samples_size = wanted_size;
 +                    }
 +                }
 +                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 n, len1, data_size;
 +    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;
 +            }
 +
 +            if (dec->sample_fmt != is->audio_src_fmt) {
 +                if (is->reformat_ctx)
 +                    av_audio_convert_free(is->reformat_ctx);
 +                is->reformat_ctx= av_audio_convert_alloc(AV_SAMPLE_FMT_S16, 1,
 +                                                         dec->sample_fmt, 1, NULL, 0);
 +                if (!is->reformat_ctx) {
 +                    fprintf(stderr, "Cannot convert %s sample format to %s sample format\n",
 +                        av_get_sample_fmt_name(dec->sample_fmt),
 +                        av_get_sample_fmt_name(AV_SAMPLE_FMT_S16));
 +                        break;
 +                }
 +                is->audio_src_fmt= dec->sample_fmt;
 +            }
 +
 +            if (is->reformat_ctx) {
 +                const void *ibuf[6]= {is->audio_buf1};
 +                void *obuf[6]= {is->audio_buf2};
 +                int istride[6]= {av_get_bytes_per_sample(dec->sample_fmt)};
 +                int ostride[6]= {2};
 +                int len= data_size/istride[0];
 +                if (av_audio_convert(is->reformat_ctx, obuf, ostride, ibuf, istride, len)<0) {
 +                    printf("av_audio_convert() failed\n");
 +                    break;
 +                }
 +                is->audio_buf= is->audio_buf2;
 +                /* FIXME: existing code assume that data_size equals framesize*channels*2
 +                          remove this legacy cruft */
 +                data_size= len*2;
 +            }else{
 +                is->audio_buf= is->audio_buf1;
 +            }
 +
 +            /* if no pts, then compute it */
 +            pts = is->audio_clock;
 +            *pts_ptr = pts;
 +            n = 2 * dec->channels;
 +            is->audio_clock += (double)data_size /
 +                (double)(n * dec->sample_rate);
 +#ifdef DEBUG
 +            {
 +                static double last_clock;
 +                printf("audio: delay=%0.3f clock=%0.3f pts=%0.3f\n",
 +                       is->audio_clock - last_clock,
 +                       is->audio_clock, pts);
 +                last_clock = is->audio_clock;
 +            }
 +#endif
 +            return data_size;
 +        }
 +
 +        /* free the current packet */
 +        if (pkt->data)
 +            av_free_packet(pkt);
 +
 +        if (is->paused || is->audioq.abort_request) {
 +            return -1;
 +        }
 +
 +        /* read next packet */
 +        if ((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 = 1024;
 +               memset(is->audio_buf, 0, is->audio_buf_size);
 +           } else {
 +               if (is->show_mode != SHOW_MODE_VIDEO)
 +                   update_sample_display(is, (int16_t *)is->audio_buf, audio_size);
 +               audio_size = synchronize_audio(is, (int16_t *)is->audio_buf, audio_size,
 +                                              pts);
 +               is->audio_buf_size = audio_size;
 +           }
 +           is->audio_buf_index = 0;
 +        }
 +        len1 = is->audio_buf_size - is->audio_buf_index;
 +        if (len1 > len)
 +            len1 = len;
 +        memcpy(stream, (uint8_t *)is->audio_buf + is->audio_buf_index, len1);
 +        len -= len1;
 +        stream += len1;
 +        is->audio_buf_index += len1;
 +    }
 +    bytes_per_sec = is->audio_st->codec->sample_rate *
 +            2 * is->audio_st->codec->channels;
 +    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;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return -1;
 +    avctx = ic->streams[stream_index]->codec;
 +
 +    opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index]);
 +
 +    /* prepare audio output */
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        if (avctx->channels > 0) {
 +            avctx->request_channels = FFMIN(2, avctx->channels);
 +        } else {
 +            avctx->request_channels = 2;
 +        }
 +    }
 +
 +    codec = avcodec_find_decoder(avctx->codec_id);
 +    if (!codec)
 +        return -1;
 +
 +    avctx->workaround_bugs = workaround_bugs;
 +    avctx->lowres = lowres;
 +    if(lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +    avctx->idct_algo= idct;
 +    if(fast) avctx->flags2 |= CODEC_FLAG2_FAST;
 +    avctx->skip_frame= skip_frame;
 +    avctx->skip_idct= skip_idct;
 +    avctx->skip_loop_filter= skip_loop_filter;
 +    avctx->error_recognition= error_recognition;
 +    avctx->error_concealment= error_concealment;
 +
 +    if(codec->capabilities & CODEC_CAP_DR1)
 +        avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +
 +    wanted_spec.freq = avctx->sample_rate;
 +    wanted_spec.channels = avctx->channels;
 +    if (!codec ||
 +        avcodec_open2(avctx, codec, &opts) < 0)
 +        return -1;
 +    if ((t = av_dict_get(opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        return AVERROR_OPTION_NOT_FOUND;
 +    }
 +
 +    /* prepare audio output */
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        if(avctx->sample_rate <= 0 || avctx->channels <= 0){
 +            fprintf(stderr, "Invalid sample rate or channel count\n");
 +            return -1;
 +        }
 +        wanted_spec.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;
 +        is->audio_src_fmt= AV_SAMPLE_FMT_S16;
 +    }
 +
 +    ic->streams[stream_index]->discard = AVDISCARD_DEFAULT;
 +    switch(avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        is->audio_stream = stream_index;
 +        is->audio_st = ic->streams[stream_index];
 +        is->audio_buf_size = 0;
 +        is->audio_buf_index = 0;
 +
 +        /* init averaging filter */
 +        is->audio_diff_avg_coef = exp(log(0.01) / AUDIO_DIFF_AVG_NB);
 +        is->audio_diff_avg_count = 0;
 +        /* since we do not have a precise anough audio fifo fullness,
 +           we correct audio sync only if larger than this threshold */
 +        is->audio_diff_threshold = 2.0 * SDL_AUDIO_BUFFER_SIZE / avctx->sample_rate;
 +
 +        memset(&is->audio_pkt, 0, sizeof(is->audio_pkt));
 +        packet_queue_init(&is->audioq);
 +        SDL_PauseAudio(0);
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_stream = stream_index;
 +        is->video_st = ic->streams[stream_index];
 +
 +        packet_queue_init(&is->videoq);
 +        is->video_tid = SDL_CreateThread(video_thread, is);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_stream = stream_index;
 +        is->subtitle_st = ic->streams[stream_index];
 +        packet_queue_init(&is->subtitleq);
 +
 +        is->subtitle_tid = SDL_CreateThread(subtitle_thread, is);
 +        break;
 +    default:
 +        break;
 +    }
 +    return 0;
 +}
 +
 +static void stream_component_close(VideoState *is, int stream_index)
 +{
 +    AVFormatContext *ic = is->ic;
 +    AVCodecContext *avctx;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return;
 +    avctx = ic->streams[stream_index]->codec;
 +
 +    switch(avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        packet_queue_abort(&is->audioq);
 +
 +        SDL_CloseAudio();
 +
 +        packet_queue_end(&is->audioq);
 +        if (is->reformat_ctx)
 +            av_audio_convert_free(is->reformat_ctx);
 +        is->reformat_ctx = NULL;
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        packet_queue_abort(&is->videoq);
 +
 +        /* note: we also signal this mutex to make sure we deblock the
 +           video thread in all cases */
 +        SDL_LockMutex(is->pictq_mutex);
 +        SDL_CondSignal(is->pictq_cond);
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        SDL_WaitThread(is->video_tid, NULL);
 +
 +        packet_queue_end(&is->videoq);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        packet_queue_abort(&is->subtitleq);
 +
 +        /* note: we also signal this mutex to make sure we deblock the
 +           video thread in all cases */
 +        SDL_LockMutex(is->subpq_mutex);
 +        is->subtitle_stream_changed = 1;
 +
 +        SDL_CondSignal(is->subpq_cond);
 +        SDL_UnlockMutex(is->subpq_mutex);
 +
 +        SDL_WaitThread(is->subtitle_tid, NULL);
 +
 +        packet_queue_end(&is->subtitleq);
 +        break;
 +    default:
 +        break;
 +    }
 +
 +    ic->streams[stream_index]->discard = AVDISCARD_ALL;
 +    avcodec_close(avctx);
 +    switch(avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        is->audio_st = NULL;
 +        is->audio_stream = -1;
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_st = NULL;
 +        is->video_stream = -1;
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_st = NULL;
 +        is->subtitle_stream = -1;
 +        break;
 +    default:
 +        break;
 +    }
 +}
 +
 +/* since we have only one decoding thread, we can use a global
 +   variable instead of a thread local variable */
 +static VideoState *global_video_state;
 +
 +static int decode_interrupt_cb(void)
 +{
 +    return (global_video_state && global_video_state->abort_request);
 +}
 +
 +/* this thread gets the stream from the disk or the network */
 +static int read_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    AVFormatContext *ic = NULL;
 +    int err, i, ret;
 +    int st_index[AVMEDIA_TYPE_NB];
 +    AVPacket pkt1, *pkt = &pkt1;
 +    int eof=0;
 +    int pkt_in_play_range = 0;
 +    AVDictionaryEntry *t;
 +    AVDictionary **opts;
 +    int orig_nb_streams;
 +
 +    memset(st_index, -1, sizeof(st_index));
 +    is->video_stream = -1;
 +    is->audio_stream = -1;
 +    is->subtitle_stream = -1;
 +
 +    global_video_state = is;
 +    avio_set_interrupt_cb(decode_interrupt_cb);
 +
 +    err = avformat_open_input(&ic, is->filename, is->iformat, &format_opts);
 +    if (err < 0) {
 +        print_error(is->filename, err);
 +        ret = -1;
 +        goto fail;
 +    }
 +    if ((t = av_dict_get(format_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        ret = AVERROR_OPTION_NOT_FOUND;
 +        goto fail;
 +    }
 +    is->ic = ic;
 +
 +    if(genpts)
 +        ic->flags |= AVFMT_FLAG_GENPTS;
 +
 +    opts = setup_find_stream_info_opts(ic, codec_opts);
 +    orig_nb_streams = ic->nb_streams;
 +
 +    err = avformat_find_stream_info(ic, opts);
 +    if (err < 0) {
 +        fprintf(stderr, "%s: could not find codec parameters\n", is->filename);
 +        ret = -1;
 +        goto fail;
 +    }
 +    for (i = 0; i < orig_nb_streams; i++)
 +        av_dict_free(&opts[i]);
 +    av_freep(&opts);
 +
 +    if(ic->pb)
 +        ic->pb->eof_reached= 0; //FIXME hack, ffplay maybe should not use url_feof() to test for the end
 +
 +    if(seek_by_bytes<0)
 +        seek_by_bytes= !!(ic->iformat->flags & AVFMT_TS_DISCONT);
 +
 +    /* if seeking requested, we execute it */
 +    if (start_time != AV_NOPTS_VALUE) {
 +        int64_t timestamp;
 +
 +        timestamp = start_time;
 +        /* add the stream start time */
 +        if (ic->start_time != AV_NOPTS_VALUE)
 +            timestamp += ic->start_time;
 +        ret = avformat_seek_file(ic, -1, INT64_MIN, timestamp, INT64_MAX, 0);
 +        if (ret < 0) {
 +            fprintf(stderr, "%s: could not seek to position %0.3f\n",
 +                    is->filename, (double)timestamp / AV_TIME_BASE);
 +        }
 +    }
 +
 +    for (i = 0; i < ic->nb_streams; i++)
 +        ic->streams[i]->discard = AVDISCARD_ALL;
 +    if (!video_disable)
 +        st_index[AVMEDIA_TYPE_VIDEO] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_VIDEO,
 +                                wanted_stream[AVMEDIA_TYPE_VIDEO], -1, NULL, 0);
 +    if (!audio_disable)
 +        st_index[AVMEDIA_TYPE_AUDIO] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO,
 +                                wanted_stream[AVMEDIA_TYPE_AUDIO],
 +                                st_index[AVMEDIA_TYPE_VIDEO],
 +                                NULL, 0);
 +    if (!video_disable)
 +        st_index[AVMEDIA_TYPE_SUBTITLE] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_SUBTITLE,
 +                                wanted_stream[AVMEDIA_TYPE_SUBTITLE],
 +                                (st_index[AVMEDIA_TYPE_AUDIO] >= 0 ?
 +                                 st_index[AVMEDIA_TYPE_AUDIO] :
 +                                 st_index[AVMEDIA_TYPE_VIDEO]),
 +                                NULL, 0);
 +    if (show_status) {
 +        av_dump_format(ic, 0, is->filename, 0);
 +    }
 +
 +    is->show_mode = show_mode;
 +
 +    /* open the streams */
 +    if (st_index[AVMEDIA_TYPE_AUDIO] >= 0) {
 +        stream_component_open(is, st_index[AVMEDIA_TYPE_AUDIO]);
 +    }
 +
 +    ret=-1;
 +    if (st_index[AVMEDIA_TYPE_VIDEO] >= 0) {
 +        ret= stream_component_open(is, st_index[AVMEDIA_TYPE_VIDEO]);
 +    }
 +    is->refresh_tid = SDL_CreateThread(refresh_thread, is);
 +    if (is->show_mode == SHOW_MODE_NONE)
 +        is->show_mode = ret >= 0 ? SHOW_MODE_VIDEO : SHOW_MODE_RDFT;
 +
 +    if (st_index[AVMEDIA_TYPE_SUBTITLE] >= 0) {
 +        stream_component_open(is, st_index[AVMEDIA_TYPE_SUBTITLE]);
 +    }
 +
 +    if (is->video_stream < 0 && is->audio_stream < 0) {
 +        fprintf(stderr, "%s: could not open codecs\n", is->filename);
 +        ret = -1;
 +        goto fail;
 +    }
 +
 +    for(;;) {
 +        if (is->abort_request)
 +            break;
 +        if (is->paused != is->last_paused) {
 +            is->last_paused = is->paused;
 +            if (is->paused)
 +                is->read_pause_return= av_read_pause(ic);
 +            else
 +                av_read_play(ic);
 +        }
 +#if CONFIG_RTSP_DEMUXER
 +        if (is->paused && !strcmp(ic->iformat->name, "rtsp")) {
 +            /* wait 10 ms to avoid trying to get another packet */
 +            /* XXX: horrible */
 +            SDL_Delay(10);
 +            continue;
 +        }
 +#endif
 +        if (is->seek_req) {
 +            int64_t seek_target= is->seek_pos;
 +            int64_t seek_min= is->seek_rel > 0 ? seek_target - is->seek_rel + 2: INT64_MIN;
 +            int64_t seek_max= is->seek_rel < 0 ? seek_target - is->seek_rel - 2: INT64_MAX;
 +//FIXME the +-2 is due to rounding being not done in the correct direction in generation
 +//      of the seek_pos/seek_rel variables
 +
 +            ret = avformat_seek_file(is->ic, -1, seek_min, seek_target, seek_max, is->seek_flags);
 +            if (ret < 0) {
 +                fprintf(stderr, "%s: error while seeking\n", is->ic->filename);
 +            }else{
 +                if (is->audio_stream >= 0) {
 +                    packet_queue_flush(&is->audioq);
 +                    packet_queue_put(&is->audioq, &flush_pkt);
 +                }
 +                if (is->subtitle_stream >= 0) {
 +                    packet_queue_flush(&is->subtitleq);
 +                    packet_queue_put(&is->subtitleq, &flush_pkt);
 +                }
 +                if (is->video_stream >= 0) {
 +                    packet_queue_flush(&is->videoq);
 +                    packet_queue_put(&is->videoq, &flush_pkt);
 +                }
 +            }
 +            is->seek_req = 0;
 +            eof= 0;
 +        }
 +
 +        /* if the queue are full, no need to read more */
 +        if (   is->audioq.size + is->videoq.size + is->subtitleq.size > MAX_QUEUE_SIZE
 +            || (   (is->audioq   .size  > MIN_AUDIOQ_SIZE || is->audio_stream<0)
 +                && (is->videoq   .nb_packets > MIN_FRAMES || is->video_stream<0)
 +                && (is->subtitleq.nb_packets > MIN_FRAMES || is->subtitle_stream<0))) {
 +            /* wait 10 ms */
 +            SDL_Delay(10);
 +            continue;
 +        }
 +        if(eof) {
 +            if(is->video_stream >= 0){
 +                av_init_packet(pkt);
 +                pkt->data=NULL;
 +                pkt->size=0;
 +                pkt->stream_index= is->video_stream;
 +                packet_queue_put(&is->videoq, pkt);
 +            }
 +            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;
 +    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 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"},
 +    { 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)
 +{
 +    const AVClass *class;
 +    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");
 +    class = avcodec_get_class();
 +    av_opt_show2(&class, NULL,
 +                 AV_OPT_FLAG_DECODING_PARAM, 0);
 +    printf("\n");
 +    class = avformat_get_class();
 +    av_opt_show2(&class, NULL,
 +                 AV_OPT_FLAG_DECODING_PARAM, 0);
 +#if !CONFIG_AVFILTER
 +    printf("\n");
 +    class = sws_get_class();
 +    av_opt_show2(&class, NULL,
 +                 AV_OPT_FLAG_ENCODING_PARAM, 0);
 +#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();
 +
 +    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 cabc8c8,0000000..31eec8a
mode 100644,000000..100644
--- /dev/null
+++ b/ffprobe.c
@@@ -1,691 -1,0 +1,692 @@@
 +/*
 + * 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/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;
 +}
 +
 +
 +struct writer {
 +    const char *name;
 +    const char *item_sep;           ///< separator between key/value couples
 +    const char *items_sep;          ///< separator between sets of key/value couples
 +    const char *section_sep;        ///< separator between sections (streams, packets, ...)
 +    const char *header, *footer;
 +    void (*print_section_start)(const char *, int);
 +    void (*print_section_end)  (const char *, int);
 +    void (*print_header)(const char *);
 +    void (*print_footer)(const char *);
 +    void (*print_integer)(const char *, int);
 +    void (*print_string)(const char *, const char *);
 +    void (*show_tags)(struct writer *w, AVDictionary *dict);
 +};
 +
 +
 +/* JSON output */
 +
 +static void json_print_header(const char *section)
 +{
 +    printf("{\n");
 +}
 +
 +static char *json_escape_str(const char *s)
 +{
 +    static const char json_escape[] = {'"', '\\', '\b', '\f', '\n', '\r', '\t', 0};
 +    static const char json_subst[]  = {'"', '\\',  'b',  'f',  'n',  'r',  't', 0};
 +    char *ret, *p;
 +    int i, len = 0;
 +
 +    // compute the length of the escaped string
 +    for (i = 0; s[i]; i++) {
 +        if (strchr(json_escape, s[i]))     len += 2; // simple escape
 +        else if ((unsigned char)s[i] < 32) len += 6; // handle non-printable chars
 +        else                               len += 1; // char copy
 +    }
 +
 +    p = ret = av_malloc(len + 1);
 +    if (!p)
 +        return NULL;
 +    for (i = 0; s[i]; i++) {
 +        char *q = strchr(json_escape, s[i]);
 +        if (q) {
 +            *p++ = '\\';
 +            *p++ = json_subst[q - json_escape];
 +        } else if ((unsigned char)s[i] < 32) {
 +            snprintf(p, 7, "\\u00%02x", s[i] & 0xff);
 +            p += 6;
 +        } else {
 +            *p++ = s[i];
 +        }
 +    }
 +    *p = 0;
 +    return ret;
 +}
 +
 +static void json_print_str(const char *key, const char *value)
 +{
 +    char *key_esc   = json_escape_str(key);
 +    char *value_esc = json_escape_str(value);
 +    printf("    \"%s\": \"%s\"",
 +           key_esc   ? key_esc   : "",
 +           value_esc ? value_esc : "");
 +    av_free(key_esc);
 +    av_free(value_esc);
 +}
 +
 +static void json_print_int(const char *key, int value)
 +{
 +    char *key_esc = json_escape_str(key);
 +    printf("    \"%s\": %d", key_esc ? key_esc : "", value);
 +    av_free(key_esc);
 +}
 +
 +static void json_print_footer(const char *section)
 +{
 +    printf("\n  }");
 +}
 +
 +static void json_print_section_start(const char *section, int multiple_entries)
 +{
 +    char *section_esc = json_escape_str(section);
 +    printf("\n  \"%s\":%s", section_esc ? section_esc : "",
 +           multiple_entries ? " [" : " ");
 +    av_free(section_esc);
 +}
 +
 +static void json_print_section_end(const char *section, int multiple_entries)
 +{
 +    if (multiple_entries)
 +        printf("]");
 +}
 +
 +
 +/* Default output */
 +
 +static void default_print_header(const char *section)
 +{
 +    printf("[%s]\n", section);
 +}
 +
 +static void default_print_str(const char *key, const char *value)
 +{
 +    printf("%s=%s", key, value);
 +}
 +
 +static void default_print_int(const char *key, int value)
 +{
 +    printf("%s=%d", key, value);
 +}
 +
 +static void default_print_footer(const char *section)
 +{
 +    printf("\n[/%s]", section);
 +}
 +
 +
 +/* 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 print_fmt0(k, f, ...) do {             \
 +    if (fast_asprintf(&pbuf, f, __VA_ARGS__))  \
 +        w->print_string(k, pbuf.s);            \
 +} while (0)
 +#define print_fmt( k, f, ...) do {     \
 +    if (w->item_sep)                   \
 +        printf("%s", w->item_sep);     \
 +    print_fmt0(k, f, __VA_ARGS__);     \
 +} while (0)
 +
 +#define print_int0(k, v) w->print_integer(k, v)
 +#define print_int( k, v) do {      \
 +    if (w->item_sep)               \
 +        printf("%s", w->item_sep); \
 +    print_int0(k, v);              \
 +} while (0)
 +
 +#define print_str0(k, v) print_fmt0(k, "%s", v)
 +#define print_str( k, v) print_fmt (k, "%s", v)
 +
 +
 +static void show_packet(struct writer *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};
 +
 +    if (packet_idx)
 +        printf("%s", w->items_sep);
 +    w->print_header("PACKET");
 +    print_str0("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' : '_');
 +    w->print_footer("PACKET");
 +    av_free(pbuf.s);
 +    fflush(stdout);
 +}
 +
 +static void show_packets(struct writer *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 json_show_tags(struct writer *w, AVDictionary *dict)
 +{
 +    AVDictionaryEntry *tag = NULL;
 +    struct print_buf pbuf = {.s = NULL};
 +    int first = 1;
 +
 +    if (!dict)
 +        return;
 +    printf(",\n    \"tags\": {\n");
 +    while ((tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX))) {
 +        if (first) {
 +            print_str0(tag->key, tag->value);
 +            first = 0;
 +        } else {
 +            print_str(tag->key, tag->value);
 +        }
 +    }
 +    printf("\n    }");
 +    av_free(pbuf.s);
 +}
 +
 +static void default_show_tags(struct writer *w, AVDictionary *dict)
 +{
 +    AVDictionaryEntry *tag = NULL;
 +    struct print_buf pbuf = {.s = NULL};
 +    while ((tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX))) {
 +        printf("\nTAG:");
 +        print_str0(tag->key, tag->value);
 +    }
 +    av_free(pbuf.s);
 +}
 +
 +static void show_stream(struct writer *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};
 +
 +    if (stream_idx)
 +        printf("%s", w->items_sep);
 +    w->print_header("STREAM");
 +
 +    print_int0("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_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 (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);
 +
 +    w->show_tags(w, stream->metadata);
 +
 +    w->print_footer("STREAM");
 +    av_free(pbuf.s);
 +    fflush(stdout);
 +}
 +
 +static void show_streams(struct writer *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(struct writer *w, AVFormatContext *fmt_ctx)
 +{
 +    char val_str[128];
 +    struct print_buf pbuf = {.s = NULL};
 +
 +    w->print_header("FORMAT");
 +    print_str0("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));
 +    print_str("size",             value_string(val_str, sizeof(val_str), fmt_ctx->file_size, unit_byte_str));
 +    print_str("bit_rate",         value_string(val_str, sizeof(val_str), fmt_ctx->bit_rate,  unit_bit_per_second_str));
 +    w->show_tags(w, fmt_ctx->metadata);
 +    w->print_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 WRITER_FUNC(func)                   \
 +    .print_header  = func ## _print_header, \
 +    .print_footer  = func ## _print_footer, \
 +    .print_integer = func ## _print_int,    \
 +    .print_string  = func ## _print_str,    \
 +    .show_tags     = func ## _show_tags
 +
 +static struct writer writers[] = {{
 +        .name         = "default",
 +        .item_sep     = "\n",
 +        .items_sep    = "\n",
 +        .section_sep  = "\n",
 +        .footer       = "\n",
 +        WRITER_FUNC(default),
 +    },{
 +        .name         = "json",
 +        .header       = "{",
 +        .item_sep     = ",\n",
 +        .items_sep    = ",",
 +        .section_sep  = ",",
 +        .footer       = "\n}\n",
 +        .print_section_start = json_print_section_start,
 +        .print_section_end   = json_print_section_end,
 +        WRITER_FUNC(json),
 +    }
 +};
 +
 +static int get_writer(const char *name)
 +{
 +    int i;
 +    if (!name)
 +        return 0;
 +    for (i = 0; i < FF_ARRAY_ELEMS(writers); i++)
 +        if (!strcmp(writers[i].name, name))
 +            return i;
 +    return -1;
 +}
 +
 +#define SECTION_PRINT(name, multiple_entries, left) do {      \
 +    if (do_show_ ## name) {                                   \
 +        if (w->print_section_start)                           \
 +            w->print_section_start(#name, multiple_entries);  \
 +        show_ ## name (w, fmt_ctx);                           \
 +        if (w->print_section_end)                             \
 +            w->print_section_end(#name, multiple_entries);    \
 +        if (left)                                             \
 +            printf("%s", w->section_sep);                     \
 +    }                                                         \
 +} while (0)
 +
 +static int probe_file(const char *filename)
 +{
 +    AVFormatContext *fmt_ctx;
 +    int ret, writer_id;
 +    struct writer *w;
 +
 +    writer_id = get_writer(print_format);
 +    if (writer_id < 0) {
 +        fprintf(stderr, "Invalid output format '%s'\n", print_format);
 +        return AVERROR(EINVAL);
 +    }
 +    w = &writers[writer_id];
 +
 +    if ((ret = open_input_file(&fmt_ctx, filename)))
 +        return ret;
 +
 +    if (w->header)
 +        printf("%s", w->header);
 +
 +    SECTION_PRINT(packets, 1, do_show_streams || do_show_format);
 +    SECTION_PRINT(streams, 1, do_show_format);
 +    SECTION_PRINT(format,  0, 0);
 +
 +    if (w->footer)
 +        printf("%s", w->footer);
 +
 +    av_close_input_file(fmt_ctx);
 +    return 0;
 +}
 +
 +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)
 +{
 +    const AVClass *class = avformat_get_class();
 +    av_log_set_callback(log_callback_help);
 +    show_usage();
 +    show_help_options(options, "Main options:\n", 0, 0);
 +    printf("\n");
 +    av_opt_show2(&class, NULL,
 +                 AV_OPT_FLAG_DECODING_PARAM, 0);
 +    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();
 +    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);
 +
 +    return ret;
 +}
diff --cc ffserver.c
index cf055a5,0000000..46f89fb
mode 100644,000000..100644
--- /dev/null
@@@ -1,4748 -1,0 +1,4749 @@@
 +/*
 + * 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>
 +#include <strings.h>
 +#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));
 +
 +    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)) {
 +