Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 11:55:23 +0000 (12:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 11:57:17 +0000 (12:57 +0100)
* commit 'df0229a7caa124dcfb84c34b48d316744c467311':
  avconv: Apply codec options to streams that are copied as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
ffmpeg.c
ffmpeg_opt.c

diff --combined ffmpeg.c
+++ b/ffmpeg.c
@@@ -1,47 -1,36 +1,47 @@@
  /*
 - * avconv main
 - * Copyright (c) 2000-2011 The libav developers.
 + * Copyright (c) 2000-2003 Fabrice Bellard
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * 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 Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
 +/**
 + * @file
 + * multimedia converter based on the FFmpeg libraries
 + */
 +
  #include "config.h"
  #include <ctype.h>
  #include <string.h>
  #include <math.h>
  #include <stdlib.h>
  #include <errno.h>
 -#include <signal.h>
  #include <limits.h>
 +#if HAVE_ISATTY
 +#if HAVE_IO_H
 +#include <io.h>
 +#endif
 +#if HAVE_UNISTD_H
 +#include <unistd.h>
 +#endif
 +#endif
  #include "libavformat/avformat.h"
  #include "libavdevice/avdevice.h"
  #include "libswscale/swscale.h"
 -#include "libavresample/avresample.h"
 +#include "libswresample/swresample.h"
  #include "libavutil/opt.h"
  #include "libavutil/channel_layout.h"
  #include "libavutil/parseutils.h"
  #include "libavutil/avstring.h"
  #include "libavutil/libm.h"
  #include "libavutil/imgutils.h"
 +#include "libavutil/timestamp.h"
 +#include "libavutil/bprint.h"
  #include "libavutil/time.h"
  #include "libavformat/os_support.h"
  
 +#include "libavformat/ffm.h" // not public API
 +
 +# include "libavfilter/avcodec.h"
  # include "libavfilter/avfilter.h"
  # include "libavfilter/avfiltergraph.h"
  # include "libavfilter/buffersrc.h"
  #include <sys/select.h>
  #endif
  
 +#if HAVE_TERMIOS_H
 +#include <fcntl.h>
 +#include <sys/ioctl.h>
 +#include <sys/time.h>
 +#include <termios.h>
 +#elif HAVE_KBHIT
 +#include <conio.h>
 +#endif
 +
  #if HAVE_PTHREADS
  #include <pthread.h>
  #endif
  
  #include <time.h>
  
 -#include "avconv.h"
 +#include "ffmpeg.h"
  #include "cmdutils.h"
  
  #include "libavutil/avassert.h"
  
 -const char program_name[] = "avconv";
 +const char program_name[] = "ffmpeg";
  const int program_birth_year = 2000;
  
  static FILE *vstats_file;
  
 +const char *const forced_keyframes_const_names[] = {
 +    "n",
 +    "n_forced",
 +    "prev_forced_n",
 +    "prev_forced_t",
 +    "t",
 +    NULL
 +};
 +
 +static void do_video_stats(OutputStream *ost, int frame_size);
 +static int64_t getutime(void);
 +
 +static int run_as_daemon  = 0;
  static int64_t video_size = 0;
  static int64_t audio_size = 0;
 +static int64_t subtitle_size = 0;
  static int64_t extra_size = 0;
  static int nb_frames_dup = 0;
  static int nb_frames_drop = 0;
  
 +static int current_time;
 +AVIOContext *progress_avio = NULL;
  
 +static uint8_t *subtitle_out;
  
  #if HAVE_PTHREADS
  /* signal to input threads that they should exit; set by the main thread */
  static int transcoding_finished;
  #endif
  
 -#define DEFAULT_PASS_LOGFILENAME_PREFIX "av2pass"
 +#define DEFAULT_PASS_LOGFILENAME_PREFIX "ffmpeg2pass"
  
  InputStream **input_streams = NULL;
  int        nb_input_streams = 0;
@@@ -154,141 -112,9 +154,141 @@@ int         nb_output_files   = 0
  FilterGraph **filtergraphs;
  int        nb_filtergraphs;
  
 -static void term_exit(void)
 +#if HAVE_TERMIOS_H
 +
 +/* init terminal so that we can grab keys */
 +static struct termios oldtty;
 +static int restore_tty;
 +#endif
 +
 +
 +/* sub2video hack:
 +   Convert subtitles to video with alpha to insert them in filter graphs.
 +   This is a temporary solution until libavfilter gets real subtitles support.
 + */
 +
 +
 +
 +static void sub2video_copy_rect(uint8_t *dst, int dst_linesize, int w, int h,
 +                                AVSubtitleRect *r)
 +{
 +    uint32_t *pal, *dst2;
 +    uint8_t *src, *src2;
 +    int x, y;
 +
 +    if (r->type != SUBTITLE_BITMAP) {
 +        av_log(NULL, AV_LOG_WARNING, "sub2video: non-bitmap subtitle\n");
 +        return;
 +    }
 +    if (r->x < 0 || r->x + r->w > w || r->y < 0 || r->y + r->h > h) {
 +        av_log(NULL, AV_LOG_WARNING, "sub2video: rectangle overflowing\n");
 +        return;
 +    }
 +
 +    dst += r->y * dst_linesize + r->x * 4;
 +    src = r->pict.data[0];
 +    pal = (uint32_t *)r->pict.data[1];
 +    for (y = 0; y < r->h; y++) {
 +        dst2 = (uint32_t *)dst;
 +        src2 = src;
 +        for (x = 0; x < r->w; x++)
 +            *(dst2++) = pal[*(src2++)];
 +        dst += dst_linesize;
 +        src += r->pict.linesize[0];
 +    }
 +}
 +
 +static void sub2video_push_ref(InputStream *ist, int64_t pts)
  {
 -    av_log(NULL, AV_LOG_QUIET, "");
 +    AVFilterBufferRef *ref = ist->sub2video.ref;
 +    int i;
 +
 +    ist->sub2video.last_pts = ref->pts = pts;
 +    for (i = 0; i < ist->nb_filters; i++)
 +        av_buffersrc_add_ref(ist->filters[i]->filter,
 +                             avfilter_ref_buffer(ref, ~0),
 +                             AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT |
 +                             AV_BUFFERSRC_FLAG_NO_COPY |
 +                             AV_BUFFERSRC_FLAG_PUSH);
 +}
 +
 +static void sub2video_update(InputStream *ist, AVSubtitle *sub)
 +{
 +    int w = ist->sub2video.w, h = ist->sub2video.h;
 +    AVFilterBufferRef *ref = ist->sub2video.ref;
 +    int8_t *dst;
 +    int     dst_linesize;
 +    int num_rects, i;
 +    int64_t pts, end_pts;
 +
 +    if (!ref)
 +        return;
 +    if (sub) {
 +        pts       = av_rescale_q(sub->pts + sub->start_display_time * 1000,
 +                                 AV_TIME_BASE_Q, ist->st->time_base);
 +        end_pts   = av_rescale_q(sub->pts + sub->end_display_time   * 1000,
 +                                 AV_TIME_BASE_Q, ist->st->time_base);
 +        num_rects = sub->num_rects;
 +    } else {
 +        pts       = ist->sub2video.end_pts;
 +        end_pts   = INT64_MAX;
 +        num_rects = 0;
 +    }
 +    dst          = ref->data    [0];
 +    dst_linesize = ref->linesize[0];
 +    memset(dst, 0, h * dst_linesize);
 +    for (i = 0; i < num_rects; i++)
 +        sub2video_copy_rect(dst, dst_linesize, w, h, sub->rects[i]);
 +    sub2video_push_ref(ist, pts);
 +    ist->sub2video.end_pts = end_pts;
 +}
 +
 +static void sub2video_heartbeat(InputStream *ist, int64_t pts)
 +{
 +    InputFile *infile = input_files[ist->file_index];
 +    int i, j, nb_reqs;
 +    int64_t pts2;
 +
 +    /* When a frame is read from a file, examine all sub2video streams in
 +       the same file and send the sub2video frame again. Otherwise, decoded
 +       video frames could be accumulating in the filter graph while a filter
 +       (possibly overlay) is desperately waiting for a subtitle frame. */
 +    for (i = 0; i < infile->nb_streams; i++) {
 +        InputStream *ist2 = input_streams[infile->ist_index + i];
 +        if (!ist2->sub2video.ref)
 +            continue;
 +        /* subtitles seem to be usually muxed ahead of other streams;
 +           if not, substracting a larger time here is necessary */
 +        pts2 = av_rescale_q(pts, ist->st->time_base, ist2->st->time_base) - 1;
 +        /* do not send the heartbeat frame if the subtitle is already ahead */
 +        if (pts2 <= ist2->sub2video.last_pts)
 +            continue;
 +        if (pts2 >= ist2->sub2video.end_pts)
 +            sub2video_update(ist2, NULL);
 +        for (j = 0, nb_reqs = 0; j < ist2->nb_filters; j++)
 +            nb_reqs += av_buffersrc_get_nb_failed_requests(ist2->filters[j]->filter);
 +        if (nb_reqs)
 +            sub2video_push_ref(ist2, pts2);
 +    }
 +}
 +
 +static void sub2video_flush(InputStream *ist)
 +{
 +    int i;
 +
 +    for (i = 0; i < ist->nb_filters; i++)
 +        av_buffersrc_add_ref(ist->filters[i]->filter, NULL, 0);
 +}
 +
 +/* end of sub2video hack */
 +
 +void term_exit(void)
 +{
 +    av_log(NULL, AV_LOG_QUIET, "%s", "");
 +#if HAVE_TERMIOS_H
 +    if(restore_tty)
 +        tcsetattr (0, TCSANOW, &oldtty);
 +#endif
  }
  
  static volatile int received_sigterm = 0;
@@@ -300,40 -126,10 +300,40 @@@ sigterm_handler(int sig
      received_sigterm = sig;
      received_nb_signals++;
      term_exit();
 +    if(received_nb_signals > 3)
 +        exit(123);
  }
  
 -static void term_init(void)
 +void term_init(void)
  {
 +#if HAVE_TERMIOS_H
 +    if(!run_as_daemon){
 +        struct termios tty;
 +        int istty = 1;
 +#if HAVE_ISATTY
 +        istty = isatty(0) && isatty(2);
 +#endif
 +        if (istty && tcgetattr (0, &tty) == 0) {
 +            oldtty = tty;
 +            restore_tty = 1;
 +            atexit(term_exit);
 +
 +            tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP
 +                             |INLCR|IGNCR|ICRNL|IXON);
 +            tty.c_oflag |= OPOST;
 +            tty.c_lflag &= ~(ECHO|ECHONL|ICANON|IEXTEN);
 +            tty.c_cflag &= ~(CSIZE|PARENB);
 +            tty.c_cflag |= CS8;
 +            tty.c_cc[VMIN] = 1;
 +            tty.c_cc[VTIME] = 0;
 +
 +            tcsetattr (0, TCSANOW, &tty);
 +        }
 +        signal(SIGQUIT, sigterm_handler); /* Quit (POSIX).  */
 +    }
 +#endif
 +    avformat_network_deinit();
 +
      signal(SIGINT , sigterm_handler); /* Interrupt (ANSI).    */
      signal(SIGTERM, sigterm_handler); /* Termination (ANSI).  */
  #ifdef SIGXCPU
  #endif
  }
  
 +/* read a key without blocking */
 +static int read_key(void)
 +{
 +    unsigned char ch;
 +#if HAVE_TERMIOS_H
 +    int n = 1;
 +    struct timeval tv;
 +    fd_set rfds;
 +
 +    FD_ZERO(&rfds);
 +    FD_SET(0, &rfds);
 +    tv.tv_sec = 0;
 +    tv.tv_usec = 0;
 +    n = select(1, &rfds, NULL, NULL, &tv);
 +    if (n > 0) {
 +        n = read(0, &ch, 1);
 +        if (n == 1)
 +            return ch;
 +
 +        return n;
 +    }
 +#elif HAVE_KBHIT
 +#    if HAVE_PEEKNAMEDPIPE
 +    static int is_pipe;
 +    static HANDLE input_handle;
 +    DWORD dw, nchars;
 +    if(!input_handle){
 +        input_handle = GetStdHandle(STD_INPUT_HANDLE);
 +        is_pipe = !GetConsoleMode(input_handle, &dw);
 +    }
 +
 +    if (stdin->_cnt > 0) {
 +        read(0, &ch, 1);
 +        return ch;
 +    }
 +    if (is_pipe) {
 +        /* When running under a GUI, you will end here. */
 +        if (!PeekNamedPipe(input_handle, NULL, 0, NULL, &nchars, NULL)) {
 +            // input pipe may have been closed by the program that ran ffmpeg
 +            return -1;
 +        }
 +        //Read it
 +        if(nchars != 0) {
 +            read(0, &ch, 1);
 +            return ch;
 +        }else{
 +            return -1;
 +        }
 +    }
 +#    endif
 +    if(kbhit())
 +        return(getch());
 +#endif
 +    return -1;
 +}
 +
  static int decode_interrupt_cb(void *ctx)
  {
      return received_nb_signals > 1;
@@@ -424,8 -164,6 +424,8 @@@ static void exit_program(void
      }
      av_freep(&filtergraphs);
  
 +    av_freep(&subtitle_out);
 +
      /* close files */
      for (i = 0; i < nb_output_files; i++) {
          AVFormatContext *s = output_files[i]->ctx;
          avcodec_free_frame(&output_streams[i]->filtered_frame);
  
          av_freep(&output_streams[i]->forced_keyframes);
 +        av_expr_free(output_streams[i]->forced_keyframes_pexpr);
          av_freep(&output_streams[i]->avfilter);
          av_freep(&output_streams[i]->logfile_prefix);
          av_freep(&output_streams[i]);
          avcodec_free_frame(&input_streams[i]->decoded_frame);
          av_dict_free(&input_streams[i]->opts);
          free_buffer_pool(&input_streams[i]->buffer_pool);
 +        avsubtitle_free(&input_streams[i]->prev_sub.subtitle);
 +        avfilter_unref_bufferp(&input_streams[i]->sub2video.ref);
          av_freep(&input_streams[i]->filters);
          av_freep(&input_streams[i]);
      }
      if (received_sigterm) {
          av_log(NULL, AV_LOG_INFO, "Received signal %d: terminating.\n",
                 (int) received_sigterm);
 -        exit (255);
      }
  }
  
@@@ -496,23 -232,74 +496,23 @@@ void assert_avoptions(AVDictionary *m
  
  static void abort_codec_experimental(AVCodec *c, int encoder)
  {
 -    const char *codec_string = encoder ? "encoder" : "decoder";
 -    AVCodec *codec;
 -    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->name);
 -    codec = encoder ? avcodec_find_encoder(c->id) : avcodec_find_decoder(c->id);
 -    if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL))
 -        av_log(NULL, AV_LOG_FATAL, "Or use the non experimental %s '%s'.\n",
 -               codec_string, codec->name);
      exit(1);
  }
  
 -/*
 - * Update the requested input sample format based on the output sample format.
 - * This is currently only used to request float output from decoders which
 - * support multiple sample formats, one of which is AV_SAMPLE_FMT_FLT.
 - * Ideally this will be removed in the future when decoders do not do format
 - * conversion and only output in their native format.
 - */
 -static void update_sample_fmt(AVCodecContext *dec, AVCodec *dec_codec,
 -                              AVCodecContext *enc)
 +static void update_benchmark(const char *fmt, ...)
  {
 -    /* if sample formats match or a decoder sample format has already been
 -       requested, just return */
 -    if (enc->sample_fmt == dec->sample_fmt ||
 -        dec->request_sample_fmt > AV_SAMPLE_FMT_NONE)
 -        return;
 -
 -    /* if decoder supports more than one output format */
 -    if (dec_codec && dec_codec->sample_fmts &&
 -        dec_codec->sample_fmts[0] != AV_SAMPLE_FMT_NONE &&
 -        dec_codec->sample_fmts[1] != AV_SAMPLE_FMT_NONE) {
 -        const enum AVSampleFormat *p;
 -        int min_dec = INT_MAX, min_inc = INT_MAX;
 -        enum AVSampleFormat dec_fmt = AV_SAMPLE_FMT_NONE;
 -        enum AVSampleFormat inc_fmt = AV_SAMPLE_FMT_NONE;
 -
 -        /* find a matching sample format in the encoder */
 -        for (p = dec_codec->sample_fmts; *p != AV_SAMPLE_FMT_NONE; p++) {
 -            if (*p == enc->sample_fmt) {
 -                dec->request_sample_fmt = *p;
 -                return;
 -            } else {
 -                enum AVSampleFormat dfmt = av_get_packed_sample_fmt(*p);
 -                enum AVSampleFormat efmt = av_get_packed_sample_fmt(enc->sample_fmt);
 -                int fmt_diff = 32 * abs(dfmt - efmt);
 -                if (av_sample_fmt_is_planar(*p) !=
 -                    av_sample_fmt_is_planar(enc->sample_fmt))
 -                    fmt_diff++;
 -                if (dfmt == efmt) {
 -                    min_inc = fmt_diff;
 -                    inc_fmt = *p;
 -                } else if (dfmt > efmt) {
 -                    if (fmt_diff < min_inc) {
 -                        min_inc = fmt_diff;
 -                        inc_fmt = *p;
 -                    }
 -                } else {
 -                    if (fmt_diff < min_dec) {
 -                        min_dec = fmt_diff;
 -                        dec_fmt = *p;
 -                    }
 -                }
 -            }
 +    if (do_benchmark_all) {
 +        int64_t t = getutime();
 +        va_list va;
 +        char buf[1024];
 +
 +        if (fmt) {
 +            va_start(va, fmt);
 +            vsnprintf(buf, sizeof(buf), fmt, va);
 +            va_end(va);
 +            printf("bench: %8"PRIu64" %s \n", t - current_time, buf);
          }
 -
 -        /* if none match, provide the one that matches quality closest */
 -        dec->request_sample_fmt = min_inc != INT_MAX ? inc_fmt : dec_fmt;
 +        current_time = t;
      }
  }
  
@@@ -522,21 -309,6 +522,21 @@@ static void write_frame(AVFormatContex
      AVCodecContext          *avctx = ost->st->codec;
      int ret;
  
 +    if ((avctx->codec_type == AVMEDIA_TYPE_VIDEO && video_sync_method == VSYNC_DROP) ||
 +        (avctx->codec_type == AVMEDIA_TYPE_AUDIO && audio_sync_method < 0))
 +        pkt->pts = pkt->dts = AV_NOPTS_VALUE;
 +
 +    if ((avctx->codec_type == AVMEDIA_TYPE_AUDIO || avctx->codec_type == AVMEDIA_TYPE_VIDEO) && pkt->dts != AV_NOPTS_VALUE) {
 +        int64_t max = ost->st->cur_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT);
 +        if (ost->st->cur_dts && ost->st->cur_dts != AV_NOPTS_VALUE &&  max > pkt->dts) {
 +            av_log(s, max - pkt->dts > 2 || avctx->codec_type == AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG,
 +                   "st:%d PTS: %"PRId64" DTS: %"PRId64" < %"PRId64" invalid, clipping\n", pkt->stream_index, pkt->pts, pkt->dts, max);
 +            if(pkt->pts >= pkt->dts)
 +                pkt->pts = FFMAX(pkt->pts, max);
 +            pkt->dts = max;
 +        }
 +    }
 +
      /*
       * Audio encoders may split the packets --  #frames in != #packets out.
       * But there is no reordering, so we can limit the number of output packets
                                             &new_pkt.data, &new_pkt.size,
                                             pkt->data, pkt->size,
                                             pkt->flags & AV_PKT_FLAG_KEY);
 +        if(a == 0 && new_pkt.data != pkt->data && new_pkt.destruct) {
 +            uint8_t *t = av_malloc(new_pkt.size + FF_INPUT_BUFFER_PADDING_SIZE); //the new should be a subset of the old so cannot overflow
 +            if(t) {
 +                memcpy(t, new_pkt.data, new_pkt.size);
 +                memset(t + new_pkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
 +                new_pkt.data = t;
 +                a = 1;
 +            } else
 +                a = AVERROR(ENOMEM);
 +        }
          if (a > 0) {
              av_free_packet(pkt);
              new_pkt.destruct = av_destruct_packet;
          } else if (a < 0) {
 -            av_log(NULL, AV_LOG_ERROR, "%s failed for stream %d, codec %s",
 +            av_log(NULL, AV_LOG_ERROR, "Failed to open bitstream filter %s for stream %d with codec %s",
                     bsfc->filter->name, pkt->stream_index,
                     avctx->codec ? avctx->codec->name : "copy");
              print_error("", a);
      }
  
      pkt->stream_index = ost->index;
 +
 +    if (debug_ts) {
 +        av_log(NULL, AV_LOG_INFO, "muxer <- type:%s "
 +                "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s size:%d\n",
 +                av_get_media_type_string(ost->st->codec->codec_type),
 +                av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &ost->st->time_base),
 +                av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &ost->st->time_base),
 +                pkt->size
 +              );
 +    }
 +
      ret = av_interleaved_write_frame(s, pkt);
      if (ret < 0) {
          print_error("av_interleaved_write_frame()", ret);
      }
  }
  
 +static void close_output_stream(OutputStream *ost)
 +{
 +    OutputFile *of = output_files[ost->file_index];
 +
 +    ost->finished = 1;
 +    if (of->shortest) {
 +        int64_t end = av_rescale_q(ost->sync_opts - ost->first_pts, ost->st->codec->time_base, AV_TIME_BASE_Q);
 +        of->recording_time = FFMIN(of->recording_time, end);
 +    }
 +}
 +
  static int check_recording_time(OutputStream *ost)
  {
      OutputFile *of = output_files[ost->file_index];
      if (of->recording_time != INT64_MAX &&
          av_compare_ts(ost->sync_opts - ost->first_pts, ost->st->codec->time_base, of->recording_time,
                        AV_TIME_BASE_Q) >= 0) {
 -        ost->finished = 1;
 +        close_output_stream(ost);
          return 0;
      }
      return 1;
@@@ -645,13 -385,10 +645,13 @@@ static void do_audio_out(AVFormatContex
          frame->pts = ost->sync_opts;
      ost->sync_opts = frame->pts + frame->nb_samples;
  
 +    av_assert0(pkt.size || !pkt.data);
 +    update_benchmark(NULL);
      if (avcodec_encode_audio2(enc, &pkt, frame, &got_packet) < 0) {
 -        av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
 +        av_log(NULL, AV_LOG_FATAL, "Audio encoding failed (avcodec_encode_audio2)\n");
          exit(1);
      }
 +    update_benchmark("encode_audio %d.%d", ost->file_index, ost->index);
  
      if (got_packet) {
          if (pkt.pts != AV_NOPTS_VALUE)
          if (pkt.duration > 0)
              pkt.duration = av_rescale_q(pkt.duration, enc->time_base, ost->st->time_base);
  
 -        write_frame(s, &pkt, ost);
 +        if (debug_ts) {
 +            av_log(NULL, AV_LOG_INFO, "encoder -> type:audio "
 +                   "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s\n",
 +                   av_ts2str(pkt.pts), av_ts2timestr(pkt.pts, &ost->st->time_base),
 +                   av_ts2str(pkt.dts), av_ts2timestr(pkt.dts, &ost->st->time_base));
 +        }
  
          audio_size += pkt.size;
 +        write_frame(s, &pkt, ost);
 +
 +        av_free_packet(&pkt);
      }
  }
  
@@@ -690,8 -419,6 +690,8 @@@ static void pre_process_video_frame(Inp
  
          /* create temporary picture */
          size = avpicture_get_size(dec->pix_fmt, dec->width, dec->height);
 +        if (size < 0)
 +            return;
          buf  = av_malloc(size);
          if (!buf)
              return;
  static void do_subtitle_out(AVFormatContext *s,
                              OutputStream *ost,
                              InputStream *ist,
 -                            AVSubtitle *sub,
 -                            int64_t pts)
 +                            AVSubtitle *sub)
  {
 -    static uint8_t *subtitle_out = NULL;
      int subtitle_out_max_size = 1024 * 1024;
      int subtitle_out_size, nb, i;
      AVCodecContext *enc;
      AVPacket pkt;
 +    int64_t pts;
  
 -    if (pts == AV_NOPTS_VALUE) {
 +    if (sub->pts == AV_NOPTS_VALUE) {
          av_log(NULL, AV_LOG_ERROR, "Subtitle packets must have a pts\n");
          if (exit_on_error)
              exit(1);
      else
          nb = 1;
  
 +    /* shift timestamp to honor -ss and make check_recording_time() work with -t */
 +    pts = sub->pts - output_files[ost->file_index]->start_time;
      for (i = 0; i < nb; i++) {
 -        ost->sync_opts = av_rescale_q(pts, ist->st->time_base, enc->time_base);
 +        ost->sync_opts = av_rescale_q(pts, AV_TIME_BASE_Q, enc->time_base);
          if (!check_recording_time(ost))
              return;
  
 -        sub->pts = av_rescale_q(pts, ist->st->time_base, AV_TIME_BASE_Q);
 +        sub->pts = pts;
          // start_display_time is required to be 0
          sub->pts               += av_rescale_q(sub->start_display_time, (AVRational){ 1, 1000 }, AV_TIME_BASE_Q);
          sub->end_display_time  -= sub->start_display_time;
          sub->start_display_time = 0;
 +        if (i == 1)
 +            sub->num_rects = 0;
          subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out,
                                                      subtitle_out_max_size, sub);
          if (subtitle_out_size < 0) {
          pkt.data = subtitle_out;
          pkt.size = subtitle_out_size;
          pkt.pts  = av_rescale_q(sub->pts, AV_TIME_BASE_Q, ost->st->time_base);
 +        pkt.duration = av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, ost->st->time_base);
          if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {
              /* XXX: the pts correction is handled here. Maybe handling
                 it in the codec would be better */
              else
                  pkt.pts += 90 * sub->end_display_time;
          }
 +        subtitle_size += pkt.size;
          write_frame(s, &pkt, ost);
      }
  }
  
  static void do_video_out(AVFormatContext *s,
                           OutputStream *ost,
 -                         AVFrame *in_picture,
 -                         int *frame_size)
 +                         AVFrame *in_picture)
  {
      int ret, format_video_sync;
      AVPacket pkt;
      AVCodecContext *enc = ost->st->codec;
 +    int nb_frames, i;
 +    double sync_ipts, delta;
 +    double duration = 0;
 +    int frame_size = 0;
 +    InputStream *ist = NULL;
 +
 +    if (ost->source_index >= 0)
 +        ist = input_streams[ost->source_index];
 +
 +    if(ist && ist->st->start_time != AV_NOPTS_VALUE && ist->st->first_dts != AV_NOPTS_VALUE && ost->frame_rate.num)
 +        duration = 1/(av_q2d(ost->frame_rate) * av_q2d(enc->time_base));
  
 -    *frame_size = 0;
 +    sync_ipts = in_picture->pts;
 +    delta = sync_ipts - ost->sync_opts + duration;
 +
 +    /* by default, we output a single frame */
 +    nb_frames = 1;
  
      format_video_sync = video_sync_method;
      if (format_video_sync == VSYNC_AUTO)
 -        format_video_sync = (s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH :
 -                            (s->oformat->flags & AVFMT_VARIABLE_FPS) ? VSYNC_VFR : VSYNC_CFR;
 -    if (format_video_sync != VSYNC_PASSTHROUGH &&
 -        ost->frame_number &&
 -        in_picture->pts != AV_NOPTS_VALUE &&
 -        in_picture->pts < ost->sync_opts) {
 +        format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? ((s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH : VSYNC_VFR) : VSYNC_CFR;
 +
 +    switch (format_video_sync) {
 +    case VSYNC_CFR:
 +        // FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
 +        if (delta < -1.1)
 +            nb_frames = 0;
 +        else if (delta > 1.1)
 +            nb_frames = lrintf(delta);
 +        break;
 +    case VSYNC_VFR:
 +        if (delta <= -0.6)
 +            nb_frames = 0;
 +        else if (delta > 0.6)
 +            ost->sync_opts = lrint(sync_ipts);
 +        break;
 +    case VSYNC_DROP:
 +    case VSYNC_PASSTHROUGH:
 +        ost->sync_opts = lrint(sync_ipts);
 +        break;
 +    default:
 +        av_assert0(0);
 +    }
 +
 +    nb_frames = FFMIN(nb_frames, ost->max_frames - ost->frame_number);
 +    if (nb_frames == 0) {
          nb_frames_drop++;
          av_log(NULL, AV_LOG_VERBOSE, "*** drop!\n");
          return;
 +    } else if (nb_frames > 1) {
 +        if (nb_frames > dts_error_threshold * 30) {
 +            av_log(NULL, AV_LOG_ERROR, "%d frame duplication too large, skipping\n", nb_frames - 1);
 +            nb_frames_drop++;
 +            return;
 +        }
 +        nb_frames_dup += nb_frames - 1;
 +        av_log(NULL, AV_LOG_VERBOSE, "*** %d dup!\n", nb_frames - 1);
      }
  
 -    if (in_picture->pts == AV_NOPTS_VALUE)
 -        in_picture->pts = ost->sync_opts;
 -    ost->sync_opts = in_picture->pts;
 -
 -
 -    if (!ost->frame_number)
 -        ost->first_pts = in_picture->pts;
 -
 +  /* duplicates frame if needed */
 +  for (i = 0; i < nb_frames; i++) {
      av_init_packet(&pkt);
      pkt.data = NULL;
      pkt.size = 0;
  
 -    if (!check_recording_time(ost) ||
 -        ost->frame_number >= ost->max_frames)
 +    in_picture->pts = ost->sync_opts;
 +
 +    if (!check_recording_time(ost))
          return;
  
      if (s->oformat->flags & AVFMT_RAWPICTURE &&
             method. */
          enc->coded_frame->interlaced_frame = in_picture->interlaced_frame;
          enc->coded_frame->top_field_first  = in_picture->top_field_first;
 +        if (enc->coded_frame->interlaced_frame)
 +            enc->field_order = enc->coded_frame->top_field_first ? AV_FIELD_TB:AV_FIELD_BT;
 +        else
 +            enc->field_order = AV_FIELD_PROGRESSIVE;
          pkt.data   = (uint8_t *)in_picture;
          pkt.size   =  sizeof(AVPicture);
          pkt.pts    = av_rescale_q(in_picture->pts, enc->time_base, ost->st->time_base);
          pkt.flags |= AV_PKT_FLAG_KEY;
  
 +        video_size += pkt.size;
          write_frame(s, &pkt, ost);
      } else {
 -        int got_packet;
 +        int got_packet, forced_keyframe = 0;
          AVFrame big_picture;
 +        double pts_time;
  
          big_picture = *in_picture;
          /* better than nothing: use input picture interlaced
                  big_picture.top_field_first = !!ost->top_field_first;
          }
  
 +        if (big_picture.interlaced_frame) {
 +            if (enc->codec->id == AV_CODEC_ID_MJPEG)
 +                enc->field_order = big_picture.top_field_first ? AV_FIELD_TT:AV_FIELD_BB;
 +            else
 +                enc->field_order = big_picture.top_field_first ? AV_FIELD_TB:AV_FIELD_BT;
 +        } else
 +            enc->field_order = AV_FIELD_PROGRESSIVE;
 +
          big_picture.quality = ost->st->codec->global_quality;
          if (!enc->me_threshold)
              big_picture.pict_type = 0;
 +
 +        pts_time = big_picture.pts != AV_NOPTS_VALUE ?
 +            big_picture.pts * av_q2d(enc->time_base) : NAN;
          if (ost->forced_kf_index < ost->forced_kf_count &&
              big_picture.pts >= ost->forced_kf_pts[ost->forced_kf_index]) {
 -            big_picture.pict_type = AV_PICTURE_TYPE_I;
              ost->forced_kf_index++;
 +            forced_keyframe = 1;
 +        } else if (ost->forced_keyframes_pexpr) {
 +            double res;
 +            ost->forced_keyframes_expr_const_values[FKF_T] = pts_time;
 +            res = av_expr_eval(ost->forced_keyframes_pexpr,
 +                               ost->forced_keyframes_expr_const_values, NULL);
 +            av_dlog(NULL, "force_key_frame: n:%f n_forced:%f prev_forced_n:%f t:%f prev_forced_t:%f -> res:%f\n",
 +                    ost->forced_keyframes_expr_const_values[FKF_N],
 +                    ost->forced_keyframes_expr_const_values[FKF_N_FORCED],
 +                    ost->forced_keyframes_expr_const_values[FKF_PREV_FORCED_N],
 +                    ost->forced_keyframes_expr_const_values[FKF_T],
 +                    ost->forced_keyframes_expr_const_values[FKF_PREV_FORCED_T],
 +                    res);
 +            if (res) {
 +                forced_keyframe = 1;
 +                ost->forced_keyframes_expr_const_values[FKF_PREV_FORCED_N] =
 +                    ost->forced_keyframes_expr_const_values[FKF_N];
 +                ost->forced_keyframes_expr_const_values[FKF_PREV_FORCED_T] =
 +                    ost->forced_keyframes_expr_const_values[FKF_T];
 +                ost->forced_keyframes_expr_const_values[FKF_N_FORCED] += 1;
 +            }
 +
 +            ost->forced_keyframes_expr_const_values[FKF_N] += 1;
 +        }
 +        if (forced_keyframe) {
 +            big_picture.pict_type = AV_PICTURE_TYPE_I;
 +            av_log(NULL, AV_LOG_DEBUG, "Forced keyframe at time %f\n", pts_time);
          }
 +
 +        update_benchmark(NULL);
          ret = avcodec_encode_video2(enc, &pkt, &big_picture, &got_packet);
 +        update_benchmark("encode_video %d.%d", ost->file_index, ost->index);
          if (ret < 0) {
              av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n");
              exit(1);
          }
  
          if (got_packet) {
 +            if (pkt.pts == AV_NOPTS_VALUE && !(enc->codec->capabilities & CODEC_CAP_DELAY))
 +                pkt.pts = ost->sync_opts;
 +
              if (pkt.pts != AV_NOPTS_VALUE)
                  pkt.pts = av_rescale_q(pkt.pts, enc->time_base, ost->st->time_base);
              if (pkt.dts != AV_NOPTS_VALUE)
                  pkt.dts = av_rescale_q(pkt.dts, enc->time_base, ost->st->time_base);
  
 -            write_frame(s, &pkt, ost);
 -            *frame_size = pkt.size;
 +            if (debug_ts) {
 +                av_log(NULL, AV_LOG_INFO, "encoder -> type:video "
 +                    "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s\n",
 +                    av_ts2str(pkt.pts), av_ts2timestr(pkt.pts, &ost->st->time_base),
 +                    av_ts2str(pkt.dts), av_ts2timestr(pkt.dts, &ost->st->time_base));
 +            }
 +
 +            frame_size = pkt.size;
              video_size += pkt.size;
 +            write_frame(s, &pkt, ost);
 +            av_free_packet(&pkt);
  
              /* if two pass, output log */
              if (ost->logfile && enc->stats_out) {
       * flush, we need to limit them here, before they go into encoder.
       */
      ost->frame_number++;
 +  }
 +
 +    if (vstats_filename && frame_size)
 +        do_video_stats(ost, frame_size);
  }
  
  static double psnr(double d)
@@@ -1014,14 -638,14 +1014,14 @@@ static void do_video_stats(OutputStrea
  
      enc = ost->st->codec;
      if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
 -        frame_number = ost->frame_number;
 +        frame_number = ost->st->nb_frames;
          fprintf(vstats_file, "frame= %5d q= %2.1f ", frame_number, enc->coded_frame->quality / (float)FF_QP2LAMBDA);
          if (enc->flags&CODEC_FLAG_PSNR)
              fprintf(vstats_file, "PSNR= %6.2f ", psnr(enc->coded_frame->error[0] / (enc->width * enc->height * 255.0 * 255.0)));
  
          fprintf(vstats_file,"f_size= %6d ", frame_size);
          /* compute pts value */
 -        ti1 = ost->sync_opts * av_q2d(enc->time_base);
 +        ti1 = ost->st->pts.val * av_q2d(enc->time_base);
          if (ti1 < 0.01)
              ti1 = 0.01;
  
      }
  }
  
 -/*
 - * Read one frame for lavfi output for ost and encode it.
 +/**
 + * Get and encode new output from any of the filtergraphs, without causing
 + * activity.
 + *
 + * @return  0 for success, <0 for severe errors
   */
 -static int poll_filter(OutputStream *ost)
 +static int reap_filters(void)
  {
 -    OutputFile    *of = output_files[ost->file_index];
      AVFilterBufferRef *picref;
      AVFrame *filtered_frame = NULL;
 -    int frame_size, ret;
 -
 -    if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) {
 -        return AVERROR(ENOMEM);
 -    } else
 -        avcodec_get_frame_defaults(ost->filtered_frame);
 -    filtered_frame = ost->filtered_frame;
 -
 -    if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
 -        !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
 -        ret = av_buffersink_read_samples(ost->filter->filter, &picref,
 -                                         ost->st->codec->frame_size);
 -    else
 -        ret = av_buffersink_read(ost->filter->filter, &picref);
 -
 -    if (ret < 0)
 -        return ret;
 -
 -    avfilter_copy_buf_props(filtered_frame, picref);
 -    if (picref->pts != AV_NOPTS_VALUE) {
 -        filtered_frame->pts = av_rescale_q(picref->pts,
 -                                           ost->filter->filter->inputs[0]->time_base,
 -                                           ost->st->codec->time_base) -
 -                              av_rescale_q(of->start_time,
 -                                           AV_TIME_BASE_Q,
 -                                           ost->st->codec->time_base);
 -
 -        if (of->start_time && filtered_frame->pts < 0) {
 -            avfilter_unref_buffer(picref);
 -            return 0;
 -        }
 -    }
 -
 -    switch (ost->filter->filter->inputs[0]->type) {
 -    case AVMEDIA_TYPE_VIDEO:
 -        if (!ost->frame_aspect_ratio)
 -            ost->st->codec->sample_aspect_ratio = picref->video->pixel_aspect;
 -
 -        do_video_out(of->ctx, ost, filtered_frame, &frame_size);
 -        if (vstats_filename && frame_size)
 -            do_video_stats(ost, frame_size);
 -        break;
 -    case AVMEDIA_TYPE_AUDIO:
 -        do_audio_out(of->ctx, ost, filtered_frame);
 -        break;
 -    default:
 -        // TODO support subtitle filters
 -        av_assert0(0);
 -    }
 -
 -    avfilter_unref_buffer(picref);
 -
 -    return 0;
 -}
 -
 -/*
 - * Read as many frames from possible from lavfi and encode them.
 - *
 - * Always read from the active stream with the lowest timestamp. If no frames
 - * are available for it then return EAGAIN and wait for more input. This way we
 - * can use lavfi sources that generate unlimited amount of frames without memory
 - * usage exploding.
 - */
 -static int poll_filters(void)
 -{
 -    int i, j, ret = 0;
 -
 -    while (ret >= 0 && !received_sigterm) {
 -        OutputStream *ost = NULL;
 -        int64_t min_pts = INT64_MAX;
 +    int i;
 +    int64_t frame_pts;
  
 -        /* choose output stream with the lowest timestamp */
 -        for (i = 0; i < nb_output_streams; i++) {
 -            int64_t pts = output_streams[i]->sync_opts;
 +    /* Reap all buffers present in the buffer sinks */
 +    for (i = 0; i < nb_output_streams; i++) {
 +        OutputStream *ost = output_streams[i];
 +        OutputFile    *of = output_files[ost->file_index];
 +        int ret = 0;
  
 -            if (!output_streams[i]->filter || output_streams[i]->finished)
 -                continue;
 +        if (!ost->filter)
 +            continue;
  
 -            pts = av_rescale_q(pts, output_streams[i]->st->codec->time_base,
 -                               AV_TIME_BASE_Q);
 -            if (pts < min_pts) {
 -                min_pts = pts;
 -                ost = output_streams[i];
 +        if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) {
 +            return AVERROR(ENOMEM);
 +        } else
 +            avcodec_get_frame_defaults(ost->filtered_frame);
 +        filtered_frame = ost->filtered_frame;
 +
 +        while (1) {
 +            ret = av_buffersink_get_buffer_ref(ost->filter->filter, &picref,
 +                                               AV_BUFFERSINK_FLAG_NO_REQUEST);
 +            if (ret < 0) {
 +                if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
 +                    char buf[256];
 +                    av_strerror(ret, buf, sizeof(buf));
 +                    av_log(NULL, AV_LOG_WARNING,
 +                           "Error in av_buffersink_get_buffer_ref(): %s\n", buf);
 +                }
 +                break;
              }
 -        }
 -
 -        if (!ost)
 -            break;
 -
 -        ret = poll_filter(ost);
 +            frame_pts = AV_NOPTS_VALUE;
 +            if (picref->pts != AV_NOPTS_VALUE) {
 +                filtered_frame->pts = frame_pts = av_rescale_q(picref->pts,
 +                                                ost->filter->filter->inputs[0]->time_base,
 +                                                ost->st->codec->time_base) -
 +                                    av_rescale_q(of->start_time,
 +                                                AV_TIME_BASE_Q,
 +                                                ost->st->codec->time_base);
 +
 +                if (of->start_time && filtered_frame->pts < 0) {
 +                    avfilter_unref_buffer(picref);
 +                    continue;
 +                }
 +            }
 +            //if (ost->source_index >= 0)
 +            //    *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold
  
 -        if (ret == AVERROR_EOF) {
 -            OutputFile *of = output_files[ost->file_index];
  
 -            ost->finished = 1;
 +            switch (ost->filter->filter->inputs[0]->type) {
 +            case AVMEDIA_TYPE_VIDEO:
 +                avfilter_copy_buf_props(filtered_frame, picref);
 +                filtered_frame->pts = frame_pts;
 +                if (!ost->frame_aspect_ratio)
 +                    ost->st->codec->sample_aspect_ratio = picref->video->sample_aspect_ratio;
  
 -            if (of->shortest) {
 -                for (j = 0; j < of->ctx->nb_streams; j++)
 -                    output_streams[of->ost_index + j]->finished = 1;
 +                do_video_out(of->ctx, ost, filtered_frame);
 +                break;
 +            case AVMEDIA_TYPE_AUDIO:
 +                avfilter_copy_buf_props(filtered_frame, picref);
 +                filtered_frame->pts = frame_pts;
 +                if (!(ost->st->codec->codec->capabilities & CODEC_CAP_PARAM_CHANGE) &&
 +                    ost->st->codec->channels != av_frame_get_channels(filtered_frame)) {
 +                    av_log(NULL, AV_LOG_ERROR,
 +                           "Audio filter graph output is not normalized and encoder does not support parameter changes\n");
 +                    break;
 +                }
 +                do_audio_out(of->ctx, ost, filtered_frame);
 +                break;
 +            default:
 +                // TODO support subtitle filters
 +                av_assert0(0);
              }
  
 -            ret = 0;
 -        } else if (ret == AVERROR(EAGAIN))
 -            return 0;
 +            avfilter_unref_buffer(picref);
 +        }
      }
  
 -    return ret;
 +    return 0;
  }
  
 -static void print_report(int is_last_report, int64_t timer_start)
 +static void print_report(int is_last_report, int64_t timer_start, int64_t cur_time)
  {
      char buf[1024];
 +    AVBPrint buf_script;
      OutputStream *ost;
      AVFormatContext *oc;
      int64_t total_size;
      AVCodecContext *enc;
      int frame_number, vid, i;
 -    double bitrate, ti1, pts;
 +    double bitrate;
 +    int64_t pts = INT64_MIN;
      static int64_t last_time = -1;
      static int qp_histogram[52];
 +    int hours, mins, secs, us;
  
 -    if (!print_stats && !is_last_report)
 +    if (!print_stats && !is_last_report && !progress_avio)
          return;
  
      if (!is_last_report) {
 -        int64_t cur_time;
 -        /* display the report every 0.5 seconds */
 -        cur_time = av_gettime();
          if (last_time == -1) {
              last_time = cur_time;
              return;
      total_size = avio_size(oc->pb);
      if (total_size <= 0) // FIXME improve avio_size() so it works with non seekable output too
          total_size = avio_tell(oc->pb);
 -    if (total_size < 0) {
 -        char errbuf[128];
 -        av_strerror(total_size, errbuf, sizeof(errbuf));
 -        av_log(NULL, AV_LOG_VERBOSE, "Bitrate not available, "
 -               "avio_tell() failed: %s\n", errbuf);
 -        total_size = 0;
 -    }
  
      buf[0] = '\0';
 -    ti1 = 1e10;
      vid = 0;
 +    av_bprint_init(&buf_script, 0, 1);
      for (i = 0; i < nb_output_streams; i++) {
          float q = -1;
          ost = output_streams[i];
              q = enc->coded_frame->quality / (float)FF_QP2LAMBDA;
          if (vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) {
              snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "q=%2.1f ", q);
 +            av_bprintf(&buf_script, "stream_%d_%d_q=%.1f\n",
 +                       ost->file_index, ost->index, q);
          }
          if (!vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) {
 -            float t = (av_gettime() - timer_start) / 1000000.0;
 +            float fps, t = (cur_time-timer_start) / 1000000.0;
  
              frame_number = ost->frame_number;
 -            snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "frame=%5d fps=%3d q=%3.1f ",
 -                     frame_number, (t > 1) ? (int)(frame_number / t + 0.5) : 0, q);
 +            fps = t > 1 ? frame_number / t : 0;
 +            snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "frame=%5d fps=%3.*f q=%3.1f ",
 +                     frame_number, fps < 9.95, fps, q);
 +            av_bprintf(&buf_script, "frame=%d\n", frame_number);
 +            av_bprintf(&buf_script, "fps=%.1f\n", fps);
 +            av_bprintf(&buf_script, "stream_%d_%d_q=%.1f\n",
 +                       ost->file_index, ost->index, q);
              if (is_last_report)
                  snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "L");
              if (qp_hist) {
                  for (j = 0; j < 32; j++)
                      snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%X", (int)lrintf(log2(qp_histogram[j] + 1)));
              }
 -            if (enc->flags&CODEC_FLAG_PSNR) {
 +            if ((enc->flags&CODEC_FLAG_PSNR) && (enc->coded_frame || is_last_report)) {
                  int j;
                  double error, error_sum = 0;
                  double scale, scale_sum = 0;
 +                double p;
                  char type[3] = { 'Y','U','V' };
                  snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "PSNR=");
                  for (j = 0; j < 3; j++) {
                          scale /= 4;
                      error_sum += error;
                      scale_sum += scale;
 -                    snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%c:%2.2f ", type[j], psnr(error / scale));
 +                    p = psnr(error / scale);
 +                    snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%c:%2.2f ", type[j], p);
 +                    av_bprintf(&buf_script, "stream_%d_%d_psnr_%c=%2.2f\n",
 +                               ost->file_index, ost->index, type[j] | 32, p);
                  }
 +                p = psnr(error_sum / scale_sum);
                  snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "*:%2.2f ", psnr(error_sum / scale_sum));
 +                av_bprintf(&buf_script, "stream_%d_%d_psnr_all=%2.2f\n",
 +                           ost->file_index, ost->index, p);
              }
              vid = 1;
          }
          /* compute min output value */
 -        pts = (double)ost->st->pts.val * av_q2d(ost->st->time_base);
 -        if ((pts < ti1) && (pts > 0))
 -            ti1 = pts;
 +        if ((is_last_report || !ost->finished) && ost->st->pts.val != AV_NOPTS_VALUE)
 +            pts = FFMAX(pts, av_rescale_q(ost->st->pts.val,
 +                                          ost->st->time_base, AV_TIME_BASE_Q));
      }
 -    if (ti1 < 0.01)
 -        ti1 = 0.01;
  
 -    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 >= 0 ? total_size * 8 / (pts / 1000.0) : -1;
  
 +    if (total_size < 0) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
 +                                 "size=N/A time=");
 +    else                snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
 +                                 "size=%8.0fkB time=", total_size / 1024.0);
      snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
 -            "size=%8.0fkB time=%0.2f bitrate=%6.1fkbits/s",
 -            (double)total_size / 1024, ti1, bitrate);
 +             "%02d:%02d:%02d.%02d ", hours, mins, secs,
 +             (100 * us) / AV_TIME_BASE);
 +    if (bitrate < 0) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
 +                              "bitrate=N/A");
 +    else             snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
 +                              "bitrate=%6.1fkbits/s", bitrate);
 +    if (total_size < 0) av_bprintf(&buf_script, "total_size=N/A\n");
 +    else                av_bprintf(&buf_script, "total_size=%"PRId64"\n", total_size);
 +    av_bprintf(&buf_script, "out_time_ms=%"PRId64"\n", pts);
 +    av_bprintf(&buf_script, "out_time=%02d:%02d:%02d.%06d\n",
 +               hours, mins, secs, us);
  
      if (nb_frames_dup || nb_frames_drop)
          snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
                  nb_frames_dup, nb_frames_drop);
 +    av_bprintf(&buf_script, "dup_frames=%d\n", nb_frames_dup);
 +    av_bprintf(&buf_script, "drop_frames=%d\n", nb_frames_drop);
  
 +    if (print_stats || is_last_report) {
      av_log(NULL, AV_LOG_INFO, "%s    \r", buf);
  
      fflush(stderr);
 +    }
 +
 +    if (progress_avio) {
 +        av_bprintf(&buf_script, "progress=%s\n",
 +                   is_last_report ? "end" : "continue");
 +        avio_write(progress_avio, buf_script.str,
 +                   FFMIN(buf_script.len, buf_script.size - 1));
 +        avio_flush(progress_avio);
 +        av_bprint_finalize(&buf_script, NULL);
 +        if (is_last_report) {
 +            avio_close(progress_avio);
 +            progress_avio = NULL;
 +        }
 +    }
  
      if (is_last_report) {
 -        int64_t raw= audio_size + video_size + extra_size;
 +        int64_t raw= audio_size + video_size + subtitle_size + extra_size;
          av_log(NULL, AV_LOG_INFO, "\n");
 -        av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n",
 +        av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB subtitle:%1.0f global headers:%1.0fkB muxing overhead %f%%\n",
                 video_size / 1024.0,
                 audio_size / 1024.0,
 +               subtitle_size / 1024.0,
                 extra_size / 1024.0,
                 100.0 * (total_size - raw) / raw
          );
 +        if(video_size + audio_size + subtitle_size + extra_size == 0){
 +            av_log(NULL, AV_LOG_WARNING, "Output file is empty, nothing was encoded (check -ss / -t / -frames parameters if used)\n");
 +        }
      }
  }
  
@@@ -1342,14 -947,12 +1342,14 @@@ static void flush_encoders(void
                  pkt.data = NULL;
                  pkt.size = 0;
  
 +                update_benchmark(NULL);
                  ret = encode(enc, &pkt, NULL, &got_packet);
 +                update_benchmark("flush %s %d.%d", desc, ost->file_index, ost->index);
                  if (ret < 0) {
                      av_log(NULL, AV_LOG_FATAL, "%s encoding failed\n", desc);
                      exit(1);
                  }
 -                *size += ret;
 +                *size += pkt.size;
                  if (ost->logfile && enc->stats_out) {
                      fprintf(ost->logfile, "%s", enc->stats_out);
                  }
                  if (pkt.duration > 0)
                      pkt.duration = av_rescale_q(pkt.duration, enc->time_base, ost->st->time_base);
                  write_frame(os, &pkt, ost);
 +                if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && vstats_filename) {
 +                    do_video_stats(ost, pkt.size);
 +                }
              }
  
              if (stop_encoding)
@@@ -1386,7 -986,7 +1386,7 @@@ static int check_output_constraints(Inp
      if (ost->source_index != ist_index)
          return 0;
  
 -    if (of->start_time && ist->last_dts < of->start_time)
 +    if (of->start_time && ist->pts < of->start_time)
          return 0;
  
      return 1;
@@@ -1396,7 -996,6 +1396,7 @@@ static void do_streamcopy(InputStream *
  {
      OutputFile *of = output_files[ost->file_index];
      int64_t ost_tb_start_time = av_rescale_q(of->start_time, AV_TIME_BASE_Q, ost->st->time_base);
 +    AVPicture pict;
      AVPacket opkt;
  
      av_init_packet(&opkt);
          !ost->copy_initial_nonkeyframes)
          return;
  
 +    if (!ost->frame_number && ist->pts < of->start_time &&
 +        !ost->copy_prior_start)
 +        return;
 +
      if (of->recording_time != INT64_MAX &&
 -        ist->last_dts >= of->recording_time + of->start_time) {
 -        ost->finished = 1;
 +        ist->pts >= of->recording_time + of->start_time) {
 +        close_output_stream(ost);
          return;
      }
  
      else if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
          video_size += pkt->size;
          ost->sync_opts++;
 +    } else if (ost->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
 +        subtitle_size += pkt->size;
      }
  
      if (pkt->pts != AV_NOPTS_VALUE)
          opkt.pts = AV_NOPTS_VALUE;
  
      if (pkt->dts == AV_NOPTS_VALUE)
 -        opkt.dts = av_rescale_q(ist->last_dts, AV_TIME_BASE_Q, ost->st->time_base);
 +        opkt.dts = av_rescale_q(ist->dts, AV_TIME_BASE_Q, ost->st->time_base);
      else
          opkt.dts = av_rescale_q(pkt->dts, ist->st->time_base, ost->st->time_base);
      opkt.dts -= ost_tb_start_time;
  
 +    if (ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO && pkt->dts != AV_NOPTS_VALUE) {
 +        int duration = av_get_audio_frame_duration(ist->st->codec, pkt->size);
 +        if(!duration)
 +            duration = ist->st->codec->frame_size;
 +        opkt.dts = opkt.pts = av_rescale_delta(ist->st->time_base, pkt->dts,
 +                                               (AVRational){1, ist->st->codec->sample_rate}, duration, &ist->filter_in_rescale_delta_last,
 +                                               ost->st->time_base) - ost_tb_start_time;
 +    }
 +
      opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->st->time_base);
      opkt.flags    = pkt->flags;
  
          opkt.size = pkt->size;
      }
  
 +    if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
 +        /* store AVPicture in AVPacket, as expected by the output format */
 +        avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, ost->st->codec->width, ost->st->codec->height);
 +        opkt.data = (uint8_t *)&pict;
 +        opkt.size = sizeof(AVPicture);
 +        opkt.flags |= AV_PKT_FLAG_KEY;
 +    }
 +
      write_frame(of->ctx, &opkt, ost);
      ost->st->codec->frame_number++;
  }
  static void rate_emu_sleep(InputStream *ist)
  {
      if (input_files[ist->file_index]->rate_emu) {
 -        int64_t pts = av_rescale(ist->last_dts, 1000000, AV_TIME_BASE);
 +        int64_t pts = av_rescale(ist->dts, 1000000, AV_TIME_BASE);
          int64_t now = av_gettime() - ist->start;
          if (pts > now)
              av_usleep(pts - now);
@@@ -1490,8 -1066,6 +1490,8 @@@ int guess_input_channel_layout(InputStr
      if (!dec->channel_layout) {
          char layout_name[256];
  
 +        if (dec->channels > ist->guess_layout_max)
 +            return 0;
          dec->channel_layout = av_get_default_channel_layout(dec->channels);
          if (!dec->channel_layout)
              return 0;
@@@ -1508,37 -1082,28 +1508,37 @@@ static int decode_audio(InputStream *is
      AVFrame *decoded_frame;
      AVCodecContext *avctx = ist->st->codec;
      int i, ret, resample_changed;
 +    AVRational decoded_frame_tb;
  
      if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
          return AVERROR(ENOMEM);
      decoded_frame = ist->decoded_frame;
  
 +    update_benchmark(NULL);
      ret = avcodec_decode_audio4(avctx, decoded_frame, got_output, pkt);
 +    update_benchmark("decode_audio %d.%d", ist->file_index, ist->st->index);
 +
 +    if (ret >= 0 && avctx->sample_rate <= 0) {
 +        av_log(avctx, AV_LOG_ERROR, "Sample rate %d invalid\n", avctx->sample_rate);
 +        ret = AVERROR_INVALIDDATA;
 +    }
 +
      if (!*got_output || ret < 0) {
          if (!pkt->size) {
              for (i = 0; i < ist->nb_filters; i++)
 -                av_buffersrc_buffer(ist->filters[i]->filter, NULL);
 +                av_buffersrc_add_ref(ist->filters[i]->filter, NULL, 0);
          }
          return ret;
      }
  
 -    /* if the decoder provides a pts, use it instead of the last packet pts.
 -       the decoder could be delaying output by a packet or more. */
 -    if (decoded_frame->pts != AV_NOPTS_VALUE)
 -        ist->next_dts = decoded_frame->pts;
 -    else if (pkt->pts != AV_NOPTS_VALUE) {
 -        decoded_frame->pts = pkt->pts;
 -        pkt->pts           = AV_NOPTS_VALUE;
 -    }
 +#if 1
 +    /* increment next_dts to use for the case where the input stream does not
 +       have timestamps or there are multiple frames in the packet */
 +    ist->next_pts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) /
 +                     avctx->sample_rate;
 +    ist->next_dts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) /
 +                     avctx->sample_rate;
 +#endif
  
      rate_emu_sleep(ist);
  
          ist->resample_channels       = avctx->channels;
  
          for (i = 0; i < nb_filtergraphs; i++)
 -            if (ist_in_filtergraph(filtergraphs[i], ist) &&
 -                configure_filtergraph(filtergraphs[i]) < 0) {
 -                av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
 -                exit(1);
 +            if (ist_in_filtergraph(filtergraphs[i], ist)) {
 +                FilterGraph *fg = filtergraphs[i];
 +                int j;
 +                if (configure_filtergraph(fg) < 0) {
 +                    av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
 +                    exit(1);
 +                }
 +                for (j = 0; j < fg->nb_outputs; j++) {
 +                    OutputStream *ost = fg->outputs[j]->ost;
 +                    if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
 +                        !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
 +                        av_buffersink_set_frame_size(ost->filter->filter,
 +                                                     ost->st->codec->frame_size);
 +                }
              }
      }
  
 +    /* if the decoder provides a pts, use it instead of the last packet pts.
 +       the decoder could be delaying output by a packet or more. */
 +    if (decoded_frame->pts != AV_NOPTS_VALUE) {
 +        ist->dts = ist->next_dts = ist->pts = ist->next_pts = av_rescale_q(decoded_frame->pts, avctx->time_base, AV_TIME_BASE_Q);
 +        decoded_frame_tb   = avctx->time_base;
 +    } else if (decoded_frame->pkt_pts != AV_NOPTS_VALUE) {
 +        decoded_frame->pts = decoded_frame->pkt_pts;
 +        pkt->pts           = AV_NOPTS_VALUE;
 +        decoded_frame_tb   = ist->st->time_base;
 +    } else if (pkt->pts != AV_NOPTS_VALUE) {
 +        decoded_frame->pts = pkt->pts;
 +        pkt->pts           = AV_NOPTS_VALUE;
 +        decoded_frame_tb   = ist->st->time_base;
 +    }else {
 +        decoded_frame->pts = ist->dts;
 +        decoded_frame_tb   = AV_TIME_BASE_Q;
 +    }
      if (decoded_frame->pts != AV_NOPTS_VALUE)
 -        decoded_frame->pts = av_rescale_q(decoded_frame->pts,
 -                                          ist->st->time_base,
 -                                          (AVRational){1, ist->st->codec->sample_rate});
 +        decoded_frame->pts = av_rescale_delta(decoded_frame_tb, decoded_frame->pts,
 +                                              (AVRational){1, ist->st->codec->sample_rate}, decoded_frame->nb_samples, &ist->filter_in_rescale_delta_last,
 +                                              (AVRational){1, ist->st->codec->sample_rate});
      for (i = 0; i < ist->nb_filters; i++)
 -        av_buffersrc_write_frame(ist->filters[i]->filter, decoded_frame);
 +        av_buffersrc_add_frame(ist->filters[i]->filter, decoded_frame,
 +                               AV_BUFFERSRC_FLAG_PUSH);
 +
 +    decoded_frame->pts = AV_NOPTS_VALUE;
  
      return ret;
  }
@@@ -1628,43 -1163,23 +1628,43 @@@ static int decode_video(InputStream *is
      AVFrame *decoded_frame;
      void *buffer_to_free = NULL;
      int i, ret = 0, resample_changed;
 +    int64_t best_effort_timestamp;
 +    AVRational *frame_sample_aspect;
  
      if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
          return AVERROR(ENOMEM);
      decoded_frame = ist->decoded_frame;
 +    pkt->dts  = av_rescale_q(ist->dts, AV_TIME_BASE_Q, ist->st->time_base);
  
 +    update_benchmark(NULL);
      ret = avcodec_decode_video2(ist->st->codec,
                                  decoded_frame, got_output, pkt);
 +    update_benchmark("decode_video %d.%d", ist->file_index, ist->st->index);
      if (!*got_output || ret < 0) {
          if (!pkt->size) {
              for (i = 0; i < ist->nb_filters; i++)
 -                av_buffersrc_buffer(ist->filters[i]->filter, NULL);
 +                av_buffersrc_add_ref(ist->filters[i]->filter, NULL, 0);
          }
          return ret;
      }
  
 -    decoded_frame->pts = guess_correct_pts(&ist->pts_ctx, decoded_frame->pkt_pts,
 -                                           decoded_frame->pkt_dts);
 +    if(ist->top_field_first>=0)
 +        decoded_frame->top_field_first = ist->top_field_first;
 +
 +    best_effort_timestamp= av_frame_get_best_effort_timestamp(decoded_frame);
 +    if(best_effort_timestamp != AV_NOPTS_VALUE)
 +        ist->next_pts = ist->pts = av_rescale_q(decoded_frame->pts = best_effort_timestamp, ist->st->time_base, AV_TIME_BASE_Q);
 +
 +    if (debug_ts) {
 +        av_log(NULL, AV_LOG_INFO, "decoder -> ist_index:%d type:video "
 +                "frame_pts:%s frame_pts_time:%s best_effort_ts:%"PRId64" best_effort_ts_time:%s keyframe:%d frame_type:%d \n",
 +                ist->st->index, av_ts2str(decoded_frame->pts),
 +                av_ts2timestr(decoded_frame->pts, &ist->st->time_base),
 +                best_effort_timestamp,
 +                av_ts2timestr(best_effort_timestamp, &ist->st->time_base),
 +                decoded_frame->key_frame, decoded_frame->pict_type);
 +    }
 +
      pkt->size = 0;
      pre_process_video_frame(ist, (AVPicture *)decoded_frame, &buffer_to_free);
  
                 ist->resample_width,  ist->resample_height,  av_get_pix_fmt_name(ist->resample_pix_fmt),
                 decoded_frame->width, decoded_frame->height, av_get_pix_fmt_name(decoded_frame->format));
  
 -        ret = poll_filters();
 -        if (ret < 0 && (ret != AVERROR_EOF && ret != AVERROR(EAGAIN)))
 -            av_log(NULL, AV_LOG_ERROR, "Error while filtering.\n");
 -
          ist->resample_width   = decoded_frame->width;
          ist->resample_height  = decoded_frame->height;
          ist->resample_pix_fmt = decoded_frame->format;
  
 -        for (i = 0; i < nb_filtergraphs; i++)
 -            if (ist_in_filtergraph(filtergraphs[i], ist) &&
 +        for (i = 0; i < nb_filtergraphs; i++) {
 +            if (ist_in_filtergraph(filtergraphs[i], ist) && ist->reinit_filters &&
                  configure_filtergraph(filtergraphs[i]) < 0) {
                  av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
                  exit(1);
              }
 +        }
      }
  
 +    frame_sample_aspect= av_opt_ptr(avcodec_get_frame_class(), decoded_frame, "sample_aspect_ratio");
      for (i = 0; i < ist->nb_filters; i++) {
 -        if (ist->st->codec->codec->capabilities & CODEC_CAP_DR1) {
 +        int changed =      ist->st->codec->width   != ist->filters[i]->filter->outputs[0]->w
 +                        || ist->st->codec->height  != ist->filters[i]->filter->outputs[0]->h
 +                        || ist->st->codec->pix_fmt != ist->filters[i]->filter->outputs[0]->format;
 +
 +        if (!frame_sample_aspect->num)
 +            *frame_sample_aspect = ist->st->sample_aspect_ratio;
 +        if (ist->dr1 && decoded_frame->type==FF_BUFFER_TYPE_USER && !changed) {
              FrameBuffer      *buf = decoded_frame->opaque;
              AVFilterBufferRef *fb = avfilter_get_video_buffer_ref_from_arrays(
                                          decoded_frame->data, decoded_frame->linesize,
              fb->buf->priv           = buf;
              fb->buf->free           = filter_release_buffer;
  
 +            av_assert0(buf->refcount>0);
              buf->refcount++;
 -            av_buffersrc_buffer(ist->filters[i]->filter, fb);
 +            av_buffersrc_add_ref(ist->filters[i]->filter, fb,
 +                                 AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT |
 +                                 AV_BUFFERSRC_FLAG_NO_COPY |
 +                                 AV_BUFFERSRC_FLAG_PUSH);
          } else
 -            av_buffersrc_write_frame(ist->filters[i]->filter, decoded_frame);
 +        if(av_buffersrc_add_frame(ist->filters[i]->filter, decoded_frame, AV_BUFFERSRC_FLAG_PUSH)<0) {
 +            av_log(NULL, AV_LOG_FATAL, "Failed to inject frame into filter network\n");
 +            exit(1);
 +        }
 +
      }
  
      av_free(buffer_to_free);
@@@ -1739,31 -1242,9 +1739,31 @@@ static int transcode_subtitles(InputStr
      AVSubtitle subtitle;
      int i, ret = avcodec_decode_subtitle2(ist->st->codec,
                                            &subtitle, got_output, pkt);
 -    if (ret < 0)
 +    if (ret < 0 || !*got_output) {
 +        if (!pkt->size)
 +            sub2video_flush(ist);
          return ret;
 -    if (!*got_output)
 +    }
 +
 +    if (ist->fix_sub_duration) {
 +        if (ist->prev_sub.got_output) {
 +            int end = av_rescale(subtitle.pts - ist->prev_sub.subtitle.pts,
 +                                 1000, AV_TIME_BASE);
 +            if (end < ist->prev_sub.subtitle.end_display_time) {
 +                av_log(ist->st->codec, AV_LOG_DEBUG,
 +                       "Subtitle duration reduced from %d to %d\n",
 +                       ist->prev_sub.subtitle.end_display_time, end);
 +                ist->prev_sub.subtitle.end_display_time = end;
 +            }
 +        }
 +        FFSWAP(int,        *got_output, ist->prev_sub.got_output);
 +        FFSWAP(int,        ret,         ist->prev_sub.ret);
 +        FFSWAP(AVSubtitle, subtitle,    ist->prev_sub.subtitle);
 +    }
 +
 +    sub2video_update(ist, &subtitle);
 +
 +    if (!*got_output || !subtitle.num_rects)
          return ret;
  
      rate_emu_sleep(ist);
          if (!check_output_constraints(ist, ost) || !ost->encoding_needed)
              continue;
  
 -        do_subtitle_out(output_files[ost->file_index]->ctx, ost, ist, &subtitle, pkt->pts);
 +        do_subtitle_out(output_files[ost->file_index]->ctx, ost, ist, &subtitle);
      }
  
      avsubtitle_free(&subtitle);
  /* pkt = NULL means EOF (needed to flush decoder buffers) */
  static int output_packet(InputStream *ist, const AVPacket *pkt)
  {
 -    int i;
 +    int ret = 0, i;
      int got_output;
 +
      AVPacket avpkt;
 +    if (!ist->saw_first_ts) {
 +        ist->dts = ist->st->avg_frame_rate.num ? - ist->st->codec->has_b_frames * AV_TIME_BASE / av_q2d(ist->st->avg_frame_rate) : 0;
 +        ist->pts = 0;
 +        if (pkt != NULL && pkt->pts != AV_NOPTS_VALUE && !ist->decoding_needed) {
 +            ist->dts += av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q);
 +            ist->pts = ist->dts; //unused but better to set it to a value thats not totally wrong
 +        }
 +        ist->saw_first_ts = 1;
 +    }
  
      if (ist->next_dts == AV_NOPTS_VALUE)
 -        ist->next_dts = ist->last_dts;
 +        ist->next_dts = ist->dts;
 +    if (ist->next_pts == AV_NOPTS_VALUE)
 +        ist->next_pts = ist->pts;
  
      if (pkt == NULL) {
          /* EOF handling */
          avpkt = *pkt;
      }
  
 -    if (pkt->dts != AV_NOPTS_VALUE)
 -        ist->next_dts = ist->last_dts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
 +    if (pkt->dts != AV_NOPTS_VALUE) {
 +        ist->next_dts = ist->dts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
 +        if (ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || !ist->decoding_needed)
 +            ist->next_pts = ist->pts = ist->dts;
 +    }
  
      // while we have more to decode or while the decoder did output something on EOF
      while (ist->decoding_needed && (avpkt.size > 0 || (!pkt && got_output))) {
 -        int ret = 0;
 +        int duration;
      handle_eof:
  
 -        ist->last_dts = ist->next_dts;
 +        ist->pts = ist->next_pts;
 +        ist->dts = ist->next_dts;
  
          if (avpkt.size && avpkt.size != pkt->size) {
              av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING,
              break;
          case AVMEDIA_TYPE_VIDEO:
              ret = decode_video    (ist, &avpkt, &got_output);
 -            if (avpkt.duration)
 -                ist->next_dts += av_rescale_q(avpkt.duration, ist->st->time_base, AV_TIME_BASE_Q);
 -            else if (ist->st->avg_frame_rate.num)
 -                ist->next_dts += av_rescale_q(1, av_inv_q(ist->st->avg_frame_rate),
 -                                              AV_TIME_BASE_Q);
 -            else if (ist->st->codec->time_base.num != 0) {
 -                int ticks      = ist->st->parser ? ist->st->parser->repeat_pict + 1 :
 -                                                   ist->st->codec->ticks_per_frame;
 -                ist->next_dts += av_rescale_q(ticks, ist->st->codec->time_base, AV_TIME_BASE_Q);
 -            }
 +            if (avpkt.duration) {
 +                duration = av_rescale_q(avpkt.duration, ist->st->time_base, AV_TIME_BASE_Q);
 +            } else if(ist->st->codec->time_base.num != 0 && ist->st->codec->time_base.den != 0) {
 +                int ticks= ist->st->parser ? ist->st->parser->repeat_pict+1 : ist->st->codec->ticks_per_frame;
 +                duration = ((int64_t)AV_TIME_BASE *
 +                                ist->st->codec->time_base.num * ticks) /
 +                                ist->st->codec->time_base.den;
 +            } else
 +                duration = 0;
 +
 +            if(ist->dts != AV_NOPTS_VALUE && duration) {
 +                ist->next_dts += duration;
 +            }else
 +                ist->next_dts = AV_NOPTS_VALUE;
 +
 +            if (got_output)
 +                ist->next_pts += duration; //FIXME the duration is not correct in some cases
              break;
          case AVMEDIA_TYPE_SUBTITLE:
              ret = transcode_subtitles(ist, &avpkt, &got_output);
  
          if (ret < 0)
              return ret;
 +
 +        avpkt.dts=
 +        avpkt.pts= AV_NOPTS_VALUE;
 +
          // touch data and size only if not EOF
          if (pkt) {
 +            if(ist->st->codec->codec_type != AVMEDIA_TYPE_AUDIO)
 +                ret = avpkt.size;
              avpkt.data += ret;
              avpkt.size -= ret;
          }
      /* handle stream copy */
      if (!ist->decoding_needed) {
          rate_emu_sleep(ist);
 -        ist->last_dts = ist->next_dts;
 +        ist->dts = ist->next_dts;
          switch (ist->st->codec->codec_type) {
          case AVMEDIA_TYPE_AUDIO:
              ist->next_dts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) /
                               ist->st->codec->sample_rate;
              break;
          case AVMEDIA_TYPE_VIDEO:
 -            if (ist->st->codec->time_base.num != 0) {
 -                int ticks = ist->st->parser ? ist->st->parser->repeat_pict + 1 : ist->st->codec->ticks_per_frame;
 +            if (pkt->duration) {
 +                ist->next_dts += av_rescale_q(pkt->duration, ist->st->time_base, AV_TIME_BASE_Q);
 +            } else if(ist->st->codec->time_base.num != 0) {
 +                int ticks= ist->st->parser ? ist->st->parser->repeat_pict + 1 : ist->st->codec->ticks_per_frame;
                  ist->next_dts += ((int64_t)AV_TIME_BASE *
                                    ist->st->codec->time_base.num * ticks) /
                                    ist->st->codec->time_base.den;
              }
              break;
          }
 +        ist->pts = ist->dts;
 +        ist->next_pts = ist->next_dts;
      }
      for (i = 0; pkt && i < nb_output_streams; i++) {
          OutputStream *ost = output_streams[i];
@@@ -1936,19 -1384,27 +1936,19 @@@ static void print_sdp(void
  
  static int init_input_stream(int ist_index, char *error, int error_len)
  {
 -    int i, ret;
 +    int ret;
      InputStream *ist = input_streams[ist_index];
 +
      if (ist->decoding_needed) {
          AVCodec *codec = ist->dec;
          if (!codec) {
 -            snprintf(error, error_len, "Decoder (codec id %d) not found for input stream #%d:%d",
 -                    ist->st->codec->codec_id, ist->file_index, ist->st->index);
 +            snprintf(error, error_len, "Decoder (codec %s) not found for input stream #%d:%d",
 +                    avcodec_get_name(ist->st->codec->codec_id), ist->file_index, ist->st->index);
              return AVERROR(EINVAL);
          }
  
 -        /* update requested sample format for the decoder based on the
 -           corresponding encoder sample format */
 -        for (i = 0; i < nb_output_streams; i++) {
 -            OutputStream *ost = output_streams[i];
 -            if (ost->source_index == ist_index) {
 -                update_sample_fmt(ist->st->codec, codec, ost->st->codec);
 -                break;
 -            }
 -        }
 -
 -        if (codec->type == AVMEDIA_TYPE_VIDEO && codec->capabilities & CODEC_CAP_DR1) {
 +        ist->dr1 = (codec->capabilities & CODEC_CAP_DR1) && !do_deinterlace;
 +        if (codec->type == AVMEDIA_TYPE_VIDEO && ist->dr1) {
              ist->st->codec->get_buffer     = codec_get_buffer;
              ist->st->codec->release_buffer = codec_release_buffer;
              ist->st->codec->opaque         = &ist->buffer_pool;
          assert_avoptions(ist->opts);
      }
  
 -    ist->last_dts = ist->st->avg_frame_rate.num ? - ist->st->codec->has_b_frames * AV_TIME_BASE / av_q2d(ist->st->avg_frame_rate) : 0;
 +    ist->next_pts = AV_NOPTS_VALUE;
      ist->next_dts = AV_NOPTS_VALUE;
 -    init_pts_correction(&ist->pts_ctx);
      ist->is_start = 1;
  
      return 0;
@@@ -1977,28 -1434,32 +1977,28 @@@ static InputStream *get_input_stream(Ou
  {
      if (ost->source_index >= 0)
          return input_streams[ost->source_index];
 -
 -    if (ost->filter) {
 -        FilterGraph *fg = ost->filter->graph;
 -        int i;
 -
 -        for (i = 0; i < fg->nb_inputs; i++)
 -            if (fg->inputs[i]->ist->st->codec->codec_type == ost->st->codec->codec_type)
 -                return fg->inputs[i]->ist;
 -    }
 -
      return NULL;
  }
  
 +static int compare_int64(const void *a, const void *b)
 +{
 +    int64_t va = *(int64_t *)a, vb = *(int64_t *)b;
 +    return va < vb ? -1 : va > vb ? +1 : 0;
 +}
 +
  static void parse_forced_key_frames(char *kf, OutputStream *ost,
                                      AVCodecContext *avctx)
  {
      char *p;
 -    int n = 1, i;
 -    int64_t t;
 +    int n = 1, i, size, index = 0;
 +    int64_t t, *pts;
  
      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) {
 +    size = n;
 +    pts = av_malloc(sizeof(*pts) * size);
 +    if (!pts) {
          av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
          exit(1);
      }
          if (next)
              *next++ = 0;
  
 -        t = parse_time_or_die("force_key_frames", p, 1);
 -        ost->forced_kf_pts[i] = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base);
 +        if (!memcmp(p, "chapters", 8)) {
 +
 +            AVFormatContext *avf = output_files[ost->file_index]->ctx;
 +            int j;
 +
 +            if (avf->nb_chapters > INT_MAX - size ||
 +                !(pts = av_realloc_f(pts, size += avf->nb_chapters - 1,
 +                                     sizeof(*pts)))) {
 +                av_log(NULL, AV_LOG_FATAL,
 +                       "Could not allocate forced key frames array.\n");
 +                exit(1);
 +            }
 +            t = p[8] ? parse_time_or_die("force_key_frames", p + 8, 1) : 0;
 +            t = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base);
 +
 +            for (j = 0; j < avf->nb_chapters; j++) {
 +                AVChapter *c = avf->chapters[j];
 +                av_assert1(index < size);
 +                pts[index++] = av_rescale_q(c->start, c->time_base,
 +                                            avctx->time_base) + t;
 +            }
 +
 +        } else {
 +
 +            t = parse_time_or_die("force_key_frames", p, 1);
 +            av_assert1(index < size);
 +            pts[index++] = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base);
 +
 +        }
  
          p = next;
      }
 +
 +    av_assert0(index == size);
 +    qsort(pts, size, sizeof(*pts), compare_int64);
 +    ost->forced_kf_count = size;
 +    ost->forced_kf_pts   = pts;
 +}
 +
 +static void report_new_stream(int input_index, AVPacket *pkt)
 +{
 +    InputFile *file = input_files[input_index];
 +    AVStream *st = file->ctx->streams[pkt->stream_index];
 +
 +    if (pkt->stream_index < file->nb_streams_warn)
 +        return;
 +    av_log(file->ctx, AV_LOG_WARNING,
 +           "New %s stream %d:%d at pos:%"PRId64" and DTS:%ss\n",
 +           av_get_media_type_string(st->codec->codec_type),
 +           input_index, pkt->stream_index,
 +           pkt->pos, av_ts2timestr(pkt->dts, &st->time_base));
 +    file->nb_streams_warn = pkt->stream_index + 1;
  }
  
  static int transcode_init(void)
              codec->codec_type = icodec->codec_type;
  
              if (!codec->codec_tag) {
 +                unsigned int codec_tag;
                  if (!oc->oformat->codec_tag ||
                       av_codec_get_id (oc->oformat->codec_tag, icodec->codec_tag) == codec->codec_id ||
 -                     av_codec_get_tag(oc->oformat->codec_tag, icodec->codec_id) <= 0)
 +                     !av_codec_get_tag2(oc->oformat->codec_tag, icodec->codec_id, &codec_tag))
                      codec->codec_tag = icodec->codec_tag;
              }
  
                  return AVERROR(ENOMEM);
              }
              memcpy(codec->extradata, icodec->extradata, icodec->extradata_size);
 -            codec->extradata_size = icodec->extradata_size;
 -            if (!copy_tb) {
 -                codec->time_base      = icodec->time_base;
 -                codec->time_base.num *= icodec->ticks_per_frame;
 -                av_reduce(&codec->time_base.num, &codec->time_base.den,
 -                          codec->time_base.num, codec->time_base.den, INT_MAX);
 -            } else
 -                codec->time_base = ist->st->time_base;
 +            codec->extradata_size= icodec->extradata_size;
 +            codec->bits_per_coded_sample  = icodec->bits_per_coded_sample;
 +
 +            codec->time_base = ist->st->time_base;
 +            /*
 +             * Avi is a special case here because it supports variable fps but
 +             * having the fps and timebase differe significantly adds quite some
 +             * overhead
 +             */
 +            if(!strcmp(oc->oformat->name, "avi")) {
 +                if ( copy_tb<0 && av_q2d(ist->st->r_frame_rate) >= av_q2d(ist->st->avg_frame_rate)
 +                               && 0.5/av_q2d(ist->st->r_frame_rate) > av_q2d(ist->st->time_base)
 +                               && 0.5/av_q2d(ist->st->r_frame_rate) > av_q2d(icodec->time_base)
 +                               && av_q2d(ist->st->time_base) < 1.0/500 && av_q2d(icodec->time_base) < 1.0/500
 +                     || copy_tb==2){
 +                    codec->time_base.num = ist->st->r_frame_rate.den;
 +                    codec->time_base.den = 2*ist->st->r_frame_rate.num;
 +                    codec->ticks_per_frame = 2;
 +                } else if (   copy_tb<0 && av_q2d(icodec->time_base)*icodec->ticks_per_frame > 2*av_q2d(ist->st->time_base)
 +                                 && av_q2d(ist->st->time_base) < 1.0/500
 +                    || copy_tb==0){
 +                    codec->time_base = icodec->time_base;
 +                    codec->time_base.num *= icodec->ticks_per_frame;
 +                    codec->time_base.den *= 2;
 +                    codec->ticks_per_frame = 2;
 +                }
 +            } else if(!(oc->oformat->flags & AVFMT_VARIABLE_FPS)
 +                      && strcmp(oc->oformat->name, "mov") && strcmp(oc->oformat->name, "mp4") && strcmp(oc->oformat->name, "3gp")
 +                      && strcmp(oc->oformat->name, "3g2") && strcmp(oc->oformat->name, "psp") && strcmp(oc->oformat->name, "ipod")
 +                      && strcmp(oc->oformat->name, "f4v")
 +            ) {
 +                if(   copy_tb<0 && icodec->time_base.den
 +                                && av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base)
 +                                && av_q2d(ist->st->time_base) < 1.0/500
 +                   || copy_tb==0){
 +                    codec->time_base = icodec->time_base;
 +                    codec->time_base.num *= icodec->ticks_per_frame;
 +                }
 +            }
 +            if (   codec->codec_tag == AV_RL32("tmcd")
 +                && icodec->time_base.num < icodec->time_base.den
 +                && icodec->time_base.num > 0
 +                && 121LL*icodec->time_base.num > icodec->time_base.den) {
 +                codec->time_base = icodec->time_base;
 +            }
 +
 +            if(ost->frame_rate.num)
 +                codec->time_base = av_inv_q(ost->frame_rate);
 +
 +            av_reduce(&codec->time_base.num, &codec->time_base.den,
 +                        codec->time_base.num, codec->time_base.den, INT_MAX);
  
              switch (codec->codec_type) {
              case AVMEDIA_TYPE_AUDIO:
                  codec->frame_size         = icodec->frame_size;
                  codec->audio_service_type = icodec->audio_service_type;
                  codec->block_align        = icodec->block_align;
 +                if((codec->block_align == 1 || codec->block_align == 1152 || codec->block_align == 576) && codec->codec_id == AV_CODEC_ID_MP3)
 +                    codec->block_align= 0;
 +                if(codec->codec_id == AV_CODEC_ID_AC3)
 +                    codec->block_align= 0;
                  break;
              case AVMEDIA_TYPE_VIDEO:
                  codec->pix_fmt            = icodec->pix_fmt;
                          ist->st->codec->sample_aspect_ratio.num ?
                          ist->st->codec->sample_aspect_ratio : (AVRational){0, 1};
                  }
 +                ost->st->avg_frame_rate = ist->st->avg_frame_rate;
                  break;
              case AVMEDIA_TYPE_SUBTITLE:
                  codec->width  = icodec->width;
                  abort();
              }
          } else {
 +            if (!ost->enc)
 +                ost->enc = avcodec_find_encoder(codec->codec_id);
              if (!ost->enc) {
                  /* should only happen when a default codec is not present. */
 -                snprintf(error, sizeof(error), "Automatic encoder selection "
 -                         "failed for output stream #%d:%d. Default encoder for "
 -                         "format %s is probably disabled. Please choose an "
 -                         "encoder manually.\n", ost->file_index, ost->index,
 -                         oc->oformat->name);
 +                snprintf(error, sizeof(error), "Encoder (codec %s) not found for output stream #%d:%d",
 +                         avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index);
                  ret = AVERROR(EINVAL);
                  goto dump_format;
              }
  
              if (ist)
 -                ist->decoding_needed = 1;
 +                ist->decoding_needed++;
              ost->encoding_needed = 1;
  
 -            /*
 -             * We want CFR output if and only if one of those is true:
 -             * 1) user specified output framerate with -r
 -             * 2) user specified -vsync cfr
 -             * 3) output format is CFR and the user didn't force vsync to
 -             *    something else than CFR
 -             *
 -             * in such a case, set ost->frame_rate
 -             */
 -            if (codec->codec_type == AVMEDIA_TYPE_VIDEO &&
 -                !ost->frame_rate.num && ist &&
 -                (video_sync_method ==  VSYNC_CFR ||
 -                 (video_sync_method ==  VSYNC_AUTO &&
 -                  !(oc->oformat->flags & (AVFMT_NOTIMESTAMPS | AVFMT_VARIABLE_FPS))))) {
 -                ost->frame_rate = ist->framerate.num ? ist->framerate :
 -                                  ist->st->avg_frame_rate.num ?
 -                                  ist->st->avg_frame_rate :
 -                                  (AVRational){25, 1};
 -
 -                if (ost->enc && ost->enc->supported_framerates && !ost->force_fps) {
 -                    int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
 -                    ost->frame_rate = ost->enc->supported_framerates[idx];
 -                }
 -            }
 -
              if (!ost->filter &&
                  (codec->codec_type == AVMEDIA_TYPE_VIDEO ||
                   codec->codec_type == AVMEDIA_TYPE_AUDIO)) {
                      }
              }
  
 +            if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 +                if (ost->filter && !ost->frame_rate.num)
 +                    ost->frame_rate = av_buffersink_get_frame_rate(ost->filter->filter);
 +                if (ist && !ost->frame_rate.num)
 +                    ost->frame_rate = ist->framerate;
 +                if (ist && !ost->frame_rate.num)
 +                    ost->frame_rate = ist->st->r_frame_rate.num ? ist->st->r_frame_rate : (AVRational){25, 1};
 +//                    ost->frame_rate = ist->st->avg_frame_rate.num ? ist->st->avg_frame_rate : (AVRational){25, 1};
 +                if (ost->enc && ost->enc->supported_framerates && !ost->force_fps) {
 +                    int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
 +                    ost->frame_rate = ost->enc->supported_framerates[idx];
 +                }
 +            }
 +
              switch (codec->codec_type) {
              case AVMEDIA_TYPE_AUDIO:
                  codec->sample_fmt     = ost->filter->filter->inputs[0]->format;
                  codec->sample_rate    = ost->filter->filter->inputs[0]->sample_rate;
                  codec->channel_layout = ost->filter->filter->inputs[0]->channel_layout;
 -                codec->channels       = av_get_channel_layout_nb_channels(codec->channel_layout);
 +                codec->channels       = avfilter_link_get_channels(ost->filter->filter->inputs[0]);
                  codec->time_base      = (AVRational){ 1, codec->sample_rate };
                  break;
              case AVMEDIA_TYPE_VIDEO:
 -                codec->time_base = ost->filter->filter->inputs[0]->time_base;
 +                codec->time_base = av_inv_q(ost->frame_rate);
 +                if (ost->filter && !(codec->time_base.num && codec->time_base.den))
 +                    codec->time_base = ost->filter->filter->inputs[0]->time_base;
 +                if (   av_q2d(codec->time_base) < 0.001 && video_sync_method != VSYNC_PASSTHROUGH
 +                   && (video_sync_method == VSYNC_CFR || (video_sync_method == VSYNC_AUTO && !(oc->oformat->flags & AVFMT_VARIABLE_FPS)))){
 +                    av_log(oc, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n"
 +                                               "Please consider specifying a lower framerate, a different muxer or -vsync 2\n");
 +                }
 +                for (j = 0; j < ost->forced_kf_count; j++)
 +                    ost->forced_kf_pts[j] = av_rescale_q(ost->forced_kf_pts[j],
 +                                                         AV_TIME_BASE_Q,
 +                                                         codec->time_base);
  
                  codec->width  = ost->filter->filter->inputs[0]->w;
                  codec->height = ost->filter->filter->inputs[0]->h;
                      ost->filter->filter->inputs[0]->sample_aspect_ratio;
                  codec->pix_fmt = ost->filter->filter->inputs[0]->format;
  
 -                if (icodec &&
 -                    (codec->width   != icodec->width  ||
 -                     codec->height  != icodec->height ||
 -                     codec->pix_fmt != icodec->pix_fmt)) {
 -                    codec->bits_per_raw_sample = 0;
 +                if (!icodec ||
 +                    codec->width   != icodec->width  ||
 +                    codec->height  != icodec->height ||
 +                    codec->pix_fmt != icodec->pix_fmt) {
 +                    codec->bits_per_raw_sample = frame_bits_per_raw_sample;
                  }
  
 -                if (ost->forced_keyframes)
 -                    parse_forced_key_frames(ost->forced_keyframes, ost,
 -                                            ost->st->codec);
 +                if (ost->forced_keyframes) {
 +                    if (!strncmp(ost->forced_keyframes, "expr:", 5)) {
 +                        ret = av_expr_parse(&ost->forced_keyframes_pexpr, ost->forced_keyframes+5,
 +                                            forced_keyframes_const_names, NULL, NULL, NULL, NULL, 0, NULL);
 +                        if (ret < 0) {
 +                            av_log(NULL, AV_LOG_ERROR,
 +                                   "Invalid force_key_frames expression '%s'\n", ost->forced_keyframes+5);
 +                            return ret;
 +                        }
 +                        ost->forced_keyframes_expr_const_values[FKF_N] = 0;
 +                        ost->forced_keyframes_expr_const_values[FKF_N_FORCED] = 0;
 +                        ost->forced_keyframes_expr_const_values[FKF_PREV_FORCED_N] = NAN;
 +                        ost->forced_keyframes_expr_const_values[FKF_PREV_FORCED_T] = NAN;
 +                    } else {
 +                        parse_forced_key_frames(ost->forced_keyframes, ost, ost->st->codec);
 +                    }
 +                }
                  break;
              case AVMEDIA_TYPE_SUBTITLE:
                  codec->time_base = (AVRational){1, 1000};
 +                if (!codec->width) {
 +                    codec->width     = input_streams[ost->source_index]->st->codec->width;
 +                    codec->height    = input_streams[ost->source_index]->st->codec->height;
 +                }
                  break;
              default:
                  abort();
                  break;
              }
              /* two pass mode */
 -            if ((codec->flags & (CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2))) {
 +            if (codec->flags & (CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2)) {
                  char logfilename[1024];
                  FILE *f;
  
                  if (!strcmp(ost->enc->name, "libx264")) {
                      av_dict_set(&ost->opts, "stats", logfilename, AV_DICT_DONT_OVERWRITE);
                  } else {
 -                    if (codec->flags & CODEC_FLAG_PASS1) {
 -                        f = fopen(logfilename, "wb");
 -                        if (!f) {
 -                            av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n",
 -                                   logfilename, strerror(errno));
 -                            exit(1);
 -                        }
 -                        ost->logfile = f;
 -                    } else {
 +                    if (codec->flags & CODEC_FLAG_PASS2) {
                          char  *logbuffer;
                          size_t logbuffer_size;
                          if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
                          }
                          codec->stats_in = logbuffer;
                      }
 +                    if (codec->flags & CODEC_FLAG_PASS1) {
 +                        f = fopen(logfilename, "wb");
 +                        if (!f) {
 +                            av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n",
 +                                logfilename, strerror(errno));
 +                            exit(1);
 +                        }
 +                        ost->logfile = f;
 +                    }
                  }
              }
          }
              if ((ist = get_input_stream(ost)))
                  dec = ist->st->codec;
              if (dec && dec->subtitle_header) {
 -                ost->st->codec->subtitle_header = av_malloc(dec->subtitle_header_size);
 +                /* ASS code assumes this buffer is null terminated so add extra byte. */
 +                ost->st->codec->subtitle_header = av_mallocz(dec->subtitle_header_size + 1);
                  if (!ost->st->codec->subtitle_header) {
                      ret = AVERROR(ENOMEM);
                      goto dump_format;
                          ost->file_index, ost->index);
                  goto dump_format;
              }
 +            if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
 +                !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
 +                av_buffersink_set_frame_size(ost->filter->filter,
 +                                             ost->st->codec->frame_size);
              assert_avoptions(ost->opts);
              if (ost->st->codec->bit_rate && ost->st->codec->bit_rate < 1000)
                  av_log(NULL, AV_LOG_WARNING, "The bitrate parameter is set too low."
 -                                             "It takes bits/s as argument, not kbits/s\n");
 +                                             " It takes bits/s as argument, not kbits/s\n");
              extra_size += ost->st->codec->extradata_size;
  
              if (ost->st->codec->me_threshold)
                  input_streams[ost->source_index]->st->codec->debug |= FF_DEBUG_MV;
+         } else {
+             av_opt_set_dict(ost->st->codec, &ost->opts);
          }
      }
  
              ret = AVERROR(EINVAL);
              goto dump_format;
          }
 -        assert_avoptions(output_files[i]->opts);
 +//         assert_avoptions(output_files[i]->opts);
          if (strcmp(oc->oformat->name, "rtp")) {
              want_sdp = 0;
          }
@@@ -2558,7 -1902,7 +2560,7 @@@ static int need_output(void
          if (ost->frame_number >= ost->max_frames) {
              int j;
              for (j = 0; j < of->ctx->nb_streams; j++)
 -                output_streams[of->ost_index + j]->finished = 1;
 +                close_output_stream(output_streams[of->ost_index + j]);
              continue;
          }
  
      return 0;
  }
  
 -static InputFile *select_input_file(void)
 +/**
 + * Select the output stream to process.
 + *
 + * @return  selected output stream, or NULL if none available
 + */
 +static OutputStream *choose_output(void)
  {
 -    InputFile *ifile = NULL;
 -    int64_t ipts_min = INT64_MAX;
      int i;
 +    int64_t opts_min = INT64_MAX;
 +    OutputStream *ost_min = NULL;
  
 -    for (i = 0; i < nb_input_streams; i++) {
 -        InputStream *ist = input_streams[i];
 -        int64_t ipts     = ist->last_dts;
 +    for (i = 0; i < nb_output_streams; i++) {
 +        OutputStream *ost = output_streams[i];
 +        int64_t opts = av_rescale_q(ost->st->cur_dts, ost->st->time_base,
 +                                    AV_TIME_BASE_Q);
 +        if (!ost->unavailable && !ost->finished && opts < opts_min) {
 +            opts_min = opts;
 +            ost_min  = ost;
 +        }
 +    }
 +    return ost_min;
 +}
  
 -        if (ist->discard || input_files[ist->file_index]->eagain)
 -            continue;
 -        if (!input_files[ist->file_index]->eof_reached) {
 -            if (ipts < ipts_min) {
 -                ipts_min = ipts;
 -                ifile    = input_files[ist->file_index];
 +static int check_keyboard_interaction(int64_t cur_time)
 +{
 +    int i, ret, key;
 +    static int64_t last_time;
 +    if (received_nb_signals)
 +        return AVERROR_EXIT;
 +    /* read_key() returns 0 on EOF */
 +    if(cur_time - last_time >= 100000 && !run_as_daemon){
 +        key =  read_key();
 +        last_time = cur_time;
 +    }else
 +        key = -1;
 +    if (key == 'q')
 +        return AVERROR_EXIT;
 +    if (key == '+') av_log_set_level(av_log_get_level()+10);
 +    if (key == '-') av_log_set_level(av_log_get_level()-10);
 +    if (key == 's') qp_hist     ^= 1;
 +    if (key == 'h'){
 +        if (do_hex_dump){
 +            do_hex_dump = do_pkt_dump = 0;
 +        } else if(do_pkt_dump){
 +            do_hex_dump = 1;
 +        } else
 +            do_pkt_dump = 1;
 +        av_log_set_level(AV_LOG_DEBUG);
 +    }
 +    if (key == 'c' || key == 'C'){
 +        char buf[4096], target[64], command[256], arg[256] = {0};
 +        double time;
 +        int k, n = 0;
 +        fprintf(stderr, "\nEnter command: <target> <time> <command>[ <argument>]\n");
 +        i = 0;
 +        while ((k = read_key()) != '\n' && k != '\r' && i < sizeof(buf)-1)
 +            if (k > 0)
 +                buf[i++] = k;
 +        buf[i] = 0;
 +        if (k > 0 &&
 +            (n = sscanf(buf, "%63[^ ] %lf %255[^ ] %255[^\n]", target, &time, command, arg)) >= 3) {
 +            av_log(NULL, AV_LOG_DEBUG, "Processing command target:%s time:%f command:%s arg:%s",
 +                   target, time, command, arg);
 +            for (i = 0; i < nb_filtergraphs; i++) {
 +                FilterGraph *fg = filtergraphs[i];
 +                if (fg->graph) {
 +                    if (time < 0) {
 +                        ret = avfilter_graph_send_command(fg->graph, target, command, arg, buf, sizeof(buf),
 +                                                          key == 'c' ? AVFILTER_CMD_FLAG_ONE : 0);
 +                        fprintf(stderr, "Command reply for stream %d: ret:%d res:%s\n", i, ret, buf);
 +                    } else {
 +                        ret = avfilter_graph_queue_command(fg->graph, target, command, arg, 0, time);
 +                    }
 +                }
              }
 +        } else {
 +            av_log(NULL, AV_LOG_ERROR,
 +                   "Parse error, at least 3 arguments were expected, "
 +                   "only %d given in string '%s'\n", n, buf);
          }
      }
 -
 -    return ifile;
 +    if (key == 'd' || key == 'D'){
 +        int debug=0;
 +        if(key == 'D') {
 +            debug = input_streams[0]->st->codec->debug<<1;
 +            if(!debug) debug = 1;
 +            while(debug & (FF_DEBUG_DCT_COEFF|FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) //unsupported, would just crash
 +                debug += debug;
 +        }else
 +            if(scanf("%d", &debug)!=1)
 +                fprintf(stderr,"error parsing debug value\n");
 +        for(i=0;i<nb_input_streams;i++) {
 +            input_streams[i]->st->codec->debug = debug;
 +        }
 +        for(i=0;i<nb_output_streams;i++) {
 +            OutputStream *ost = output_streams[i];
 +            ost->st->codec->debug = debug;
 +        }
 +        if(debug) av_log_set_level(AV_LOG_DEBUG);
 +        fprintf(stderr,"debug=%d\n", debug);
 +    }
 +    if (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"
 +        );
 +    }
 +    return 0;
  }
  
  #if HAVE_PTHREADS
@@@ -2806,8 -2057,8 +2808,8 @@@ static int get_input_packet(InputFile *
  static int got_eagain(void)
  {
      int i;
 -    for (i = 0; i < nb_input_files; i++)
 -        if (input_files[i]->eagain)
 +    for (i = 0; i < nb_output_streams; i++)
 +        if (output_streams[i]->unavailable)
              return 1;
      return 0;
  }
@@@ -2817,25 -2068,41 +2819,25 @@@ static void reset_eagain(void
      int i;
      for (i = 0; i < nb_input_files; i++)
          input_files[i]->eagain = 0;
 +    for (i = 0; i < nb_output_streams; i++)
 +        output_streams[i]->unavailable = 0;
  }
  
  /*
 - * Read one packet from an input file and send it for
 - * - decoding -> lavfi (audio/video)
 - * - decoding -> encoding -> muxing (subtitles)
 - * - muxing (streamcopy)
 - *
   * Return
   * - 0 -- one packet was read and processed
   * - AVERROR(EAGAIN) -- no packets were available for selected file,
   *   this function should be called again
   * - AVERROR_EOF -- this function should not be called again
   */
 -static int process_input(void)
 +static int process_input(int file_index)
  {
 -    InputFile *ifile;
 +    InputFile *ifile = input_files[file_index];
      AVFormatContext *is;
      InputStream *ist;
      AVPacket pkt;
      int ret, i, j;
  
 -    /* select the stream that we must read now */
 -    ifile = select_input_file();
 -    /* if none, if is finished */
 -    if (!ifile) {
 -        if (got_eagain()) {
 -            reset_eagain();
 -            av_usleep(10000);
 -            return AVERROR(EAGAIN);
 -        }
 -        av_log(NULL, AV_LOG_VERBOSE, "No more inputs to read from.\n");
 -        return AVERROR_EOF;
 -    }
 -
      is  = ifile->ctx;
      ret = get_input_packet(ifile, &pkt);
  
  
                  if (ost->source_index == ifile->ist_index + i &&
                      (ost->stream_copy || ost->enc->type == AVMEDIA_TYPE_SUBTITLE))
 -                    ost->finished= 1;
 +                    close_output_stream(ost);
              }
          }
  
      }
      /* the following test is needed in case new streams appear
         dynamically in stream : we ignore them */
 -    if (pkt.stream_index >= ifile->nb_streams)
 +    if (pkt.stream_index >= ifile->nb_streams) {
 +        report_new_stream(file_index, &pkt);
          goto discard_packet;
 +    }
  
      ist = input_streams[ifile->ist_index + pkt.stream_index];
      if (ist->discard)
          goto discard_packet;
  
 +    if (debug_ts) {
 +        av_log(NULL, AV_LOG_INFO, "demuxer -> ist_index:%d type:%s "
 +               "next_dts:%s next_dts_time:%s next_pts:%s next_pts_time:%s pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s off:%s off_time:%s\n",
 +               ifile->ist_index + pkt.stream_index, av_get_media_type_string(ist->st->codec->codec_type),
 +               av_ts2str(ist->next_dts), av_ts2timestr(ist->next_dts, &AV_TIME_BASE_Q),
 +               av_ts2str(ist->next_pts), av_ts2timestr(ist->next_pts, &AV_TIME_BASE_Q),
 +               av_ts2str(pkt.pts), av_ts2timestr(pkt.pts, &ist->st->time_base),
 +               av_ts2str(pkt.dts), av_ts2timestr(pkt.dts, &ist->st->time_base),
 +               av_ts2str(input_files[ist->file_index]->ts_offset),
 +               av_ts2timestr(input_files[ist->file_index]->ts_offset, &AV_TIME_BASE_Q));
 +    }
 +
 +    if(!ist->wrap_correction_done && is->start_time != AV_NOPTS_VALUE && ist->st->pts_wrap_bits < 64){
 +        int64_t stime, stime2;
 +        // Correcting starttime based on the enabled streams
 +        // FIXME this ideally should be done before the first use of starttime but we do not know which are the enabled streams at that point.
 +        //       so we instead do it here as part of discontinuity handling
 +        if (   ist->next_dts == AV_NOPTS_VALUE
 +            && ifile->ts_offset == -is->start_time
 +            && (is->iformat->flags & AVFMT_TS_DISCONT)) {
 +            int64_t new_start_time = INT64_MAX;
 +            for (i=0; i<is->nb_streams; i++) {
 +                AVStream *st = is->streams[i];
 +                if(st->discard == AVDISCARD_ALL || st->start_time == AV_NOPTS_VALUE)
 +                    continue;
 +                new_start_time = FFMIN(new_start_time, av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q));
 +            }
 +            if (new_start_time > is->start_time) {
 +                av_log(is, AV_LOG_VERBOSE, "Correcting start time by %"PRId64"\n", new_start_time - is->start_time);
 +                ifile->ts_offset = -new_start_time;
 +            }
 +        }
 +
 +        stime = av_rescale_q(is->start_time, AV_TIME_BASE_Q, ist->st->time_base);
 +        stime2= stime + (1ULL<<ist->st->pts_wrap_bits);
 +        ist->wrap_correction_done = 1;
 +
 +        if(stime2 > stime && pkt.dts != AV_NOPTS_VALUE && pkt.dts > stime + (1LL<<(ist->st->pts_wrap_bits-1))) {
 +            pkt.dts -= 1ULL<<ist->st->pts_wrap_bits;
 +            ist->wrap_correction_done = 0;
 +        }
 +        if(stime2 > stime && pkt.pts != AV_NOPTS_VALUE && pkt.pts > stime + (1LL<<(ist->st->pts_wrap_bits-1))) {
 +            pkt.pts -= 1ULL<<ist->st->pts_wrap_bits;
 +            ist->wrap_correction_done = 0;
 +        }
 +    }
 +
      if (pkt.dts != AV_NOPTS_VALUE)
          pkt.dts += av_rescale_q(ifile->ts_offset, AV_TIME_BASE_Q, ist->st->time_base);
      if (pkt.pts != AV_NOPTS_VALUE)
          pkt.dts *= ist->ts_scale;
  
      if (pkt.dts != AV_NOPTS_VALUE && ist->next_dts != AV_NOPTS_VALUE &&
 -        (is->iformat->flags & AVFMT_TS_DISCONT)) {
 +        !copy_ts) {
          int64_t pkt_dts = av_rescale_q(pkt.dts, ist->st->time_base, AV_TIME_BASE_Q);
          int64_t delta   = pkt_dts - ist->next_dts;
 -
 -        if ((FFABS(delta) > 1LL * dts_delta_threshold * AV_TIME_BASE || pkt_dts + 1 < ist->last_dts) && !copy_ts) {
 +        if (is->iformat->flags & AVFMT_TS_DISCONT) {
 +        if(delta < -1LL*dts_delta_threshold*AV_TIME_BASE ||
 +            (delta > 1LL*dts_delta_threshold*AV_TIME_BASE &&
 +                ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) ||
 +            pkt_dts+1<ist->pts){
              ifile->ts_offset -= delta;
              av_log(NULL, AV_LOG_DEBUG,
                     "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n",
              if (pkt.pts != AV_NOPTS_VALUE)
                  pkt.pts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
          }
 +        } else {
 +            if ( delta < -1LL*dts_error_threshold*AV_TIME_BASE ||
 +                (delta > 1LL*dts_error_threshold*AV_TIME_BASE && ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE)
 +               ) {
 +                av_log(NULL, AV_LOG_WARNING, "DTS %"PRId64", next:%"PRId64" st:%d invalid dropping\n", pkt.dts, ist->next_dts, pkt.stream_index);
 +                pkt.dts = AV_NOPTS_VALUE;
 +            }
 +            if (pkt.pts != AV_NOPTS_VALUE){
 +                int64_t pkt_pts = av_rescale_q(pkt.pts, ist->st->time_base, AV_TIME_BASE_Q);
 +                delta   = pkt_pts - ist->next_dts;
 +                if ( delta < -1LL*dts_error_threshold*AV_TIME_BASE ||
 +                    (delta > 1LL*dts_error_threshold*AV_TIME_BASE && ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE)
 +                   ) {
 +                    av_log(NULL, AV_LOG_WARNING, "PTS %"PRId64", next:%"PRId64" invalid dropping st:%d\n", pkt.pts, ist->next_dts, pkt.stream_index);
 +                    pkt.pts = AV_NOPTS_VALUE;
 +                }
 +            }
 +        }
 +    }
 +
 +    if (debug_ts) {
 +        av_log(NULL, AV_LOG_INFO, "demuxer+ffmpeg -> ist_index:%d type:%s pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s off:%s off_time:%s\n",
 +               ifile->ist_index + pkt.stream_index, av_get_media_type_string(ist->st->codec->codec_type),
 +               av_ts2str(pkt.pts), av_ts2timestr(pkt.pts, &ist->st->time_base),
 +               av_ts2str(pkt.dts), av_ts2timestr(pkt.dts, &ist->st->time_base),
 +               av_ts2str(input_files[ist->file_index]->ts_offset),
 +               av_ts2timestr(input_files[ist->file_index]->ts_offset, &AV_TIME_BASE_Q));
      }
  
 +    sub2video_heartbeat(ist, pkt.pts);
 +
      ret = output_packet(ist, &pkt);
      if (ret < 0) {
 -        av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n",
 -               ist->file_index, ist->st->index);
 +        char buf[128];
 +        av_strerror(ret, buf, sizeof(buf));
 +        av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d: %s\n",
 +                ist->file_index, ist->st->index, buf);
          if (exit_on_error)
              exit(1);
      }
@@@ -3007,104 -2191,12 +3009,104 @@@ discard_packet
      return 0;
  }
  
 +/**
 + * Perform a step of transcoding for the specified filter graph.
 + *
 + * @param[in]  graph     filter graph to consider
 + * @param[out] best_ist  input stream where a frame would allow to continue
 + * @return  0 for success, <0 for error
 + */
 +static int transcode_from_filter(FilterGraph *graph, InputStream **best_ist)
 +{
 +    int i, ret;
 +    int nb_requests, nb_requests_max = 0;
 +    InputFilter *ifilter;
 +    InputStream *ist;
 +
 +    *best_ist = NULL;
 +    ret = avfilter_graph_request_oldest(graph->graph);
 +    if (ret >= 0)
 +        return reap_filters();
 +
 +    if (ret == AVERROR_EOF) {
 +        ret = reap_filters();
 +        for (i = 0; i < graph->nb_outputs; i++)
 +            close_output_stream(graph->outputs[i]->ost);
 +        return ret;
 +    }
 +    if (ret != AVERROR(EAGAIN))
 +        return ret;
 +
 +    for (i = 0; i < graph->nb_inputs; i++) {
 +        ifilter = graph->inputs[i];
 +        ist = ifilter->ist;
 +        if (input_files[ist->file_index]->eagain ||
 +            input_files[ist->file_index]->eof_reached)
 +            continue;
 +        nb_requests = av_buffersrc_get_nb_failed_requests(ifilter->filter);
 +        if (nb_requests > nb_requests_max) {
 +            nb_requests_max = nb_requests;
 +            *best_ist = ist;
 +        }
 +    }
 +
 +    if (!*best_ist)
 +        for (i = 0; i < graph->nb_outputs; i++)
 +            graph->outputs[i]->ost->unavailable = 1;
 +
 +    return 0;
 +}
 +
 +/**
 + * Run a single step of transcoding.
 + *
 + * @return  0 for success, <0 for error
 + */
 +static int transcode_step(void)
 +{
 +    OutputStream *ost;
 +    InputStream  *ist;
 +    int ret;
 +
 +    ost = choose_output();
 +    if (!ost) {
 +        if (got_eagain()) {
 +            reset_eagain();
 +            av_usleep(10000);
 +            return 0;
 +        }
 +        av_log(NULL, AV_LOG_VERBOSE, "No more inputs to read from, finishing.\n");
 +        return AVERROR_EOF;
 +    }
 +
 +    if (ost->filter) {
 +        if ((ret = transcode_from_filter(ost->filter->graph, &ist)) < 0)
 +            return ret;
 +        if (!ist)
 +            return 0;
 +    } else {
 +        av_assert0(ost->source_index >= 0);
 +        ist = input_streams[ost->source_index];
 +    }
 +
 +    ret = process_input(ist->file_index);
 +    if (ret == AVERROR(EAGAIN)) {
 +        if (input_files[ist->file_index]->eagain)
 +            ost->unavailable = 1;
 +        return 0;
 +    }
 +    if (ret < 0)
 +        return ret == AVERROR_EOF ? 0 : ret;
 +
 +    return reap_filters();
 +}
 +
  /*
   * The following code is the main loop of the file converter
   */
  static int transcode(void)
  {
 -    int ret, i, need_input = 1;
 +    int ret, i;
      AVFormatContext *os;
      OutputStream *ost;
      InputStream *ist;
      if (ret < 0)
          goto fail;
  
 -    av_log(NULL, AV_LOG_INFO, "Press ctrl-c to stop encoding\n");
 -    term_init();
 +    if (stdin_interaction) {
 +        av_log(NULL, AV_LOG_INFO, "Press [q] to stop, [?] for help\n");
 +    }
  
      timer_start = av_gettime();
  
  #endif
  
      while (!received_sigterm) {
 +        int64_t cur_time= av_gettime();
 +
 +        /* if 'q' pressed, exits */
 +        if (stdin_interaction)
 +            if (check_keyboard_interaction(cur_time) < 0)
 +                break;
 +
          /* check if there's any stream where output is still needed */
          if (!need_output()) {
              av_log(NULL, AV_LOG_VERBOSE, "No more output streams to write to, finishing.\n");
              break;
          }
  
 -        /* read and process one input packet if needed */
 -        if (need_input) {
 -            ret = process_input();
 -            if (ret == AVERROR_EOF)
 -                need_input = 0;
 -        }
 -
 -        ret = poll_filters();
 +        ret = transcode_step();
          if (ret < 0) {
              if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN))
                  continue;
          }
  
          /* dump report by using the output first video and audio streams */
 -        print_report(0, timer_start);
 +        print_report(0, timer_start, cur_time);
      }
  #if HAVE_PTHREADS
      free_input_threads();
              output_packet(ist, NULL);
          }
      }
 -    poll_filters();
      flush_encoders();
  
      term_exit();
      }
  
      /* dump report by using the first video and audio streams */
 -    print_report(1, timer_start);
 +    print_report(1, timer_start, av_gettime());
  
      /* close each encoder */
      for (i = 0; i < nb_output_streams; i++) {
                  av_freep(&ost->st->codec->subtitle_header);
                  av_free(ost->forced_kf_pts);
                  av_dict_free(&ost->opts);
 +                av_dict_free(&ost->swr_opts);
                  av_dict_free(&ost->resample_opts);
              }
          }
      return ret;
  }
  
 +
  static int64_t getutime(void)
  {
  #if HAVE_GETRUSAGE
@@@ -3258,10 -2348,6 +3260,10 @@@ static int64_t getmaxrss(void
  #endif
  }
  
 +static void log_callback_null(void *ptr, int level, const char *fmt, va_list vl)
 +{
 +}
 +
  int main(int argc, char **argv)
  {
      int ret;
  
      atexit(exit_program);
  
 +    setvbuf(stderr,NULL,_IONBF,0); /* win32 runtime needs this */
 +
      av_log_set_flags(AV_LOG_SKIP_REPEATED);
      parse_loglevel(argc, argv, options);
  
 +    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();
      av_register_all();
      avformat_network_init();
  
 -    show_banner();
 +    show_banner(argc, argv, options);
 +
 +    term_init();
  
      /* parse options and open all input/output files */
 -    ret = avconv_parse_options(argc, argv);
 +    ret = ffmpeg_parse_options(argc, argv);
      if (ret < 0)
          exit(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(1);
      }
  
 -    ti = getutime();
 +//     if (nb_input_files == 0) {
 +//         av_log(NULL, AV_LOG_FATAL, "At least one input file must be specified\n");
 +//         exit(1);
 +//     }
 +
 +    current_time = ti = getutime();
      if (transcode() < 0)
          exit(1);
      ti = getutime() - ti;
          printf("bench: utime=%0.3fs maxrss=%ikB\n", ti / 1000000.0, maxrss);
      }
  
 -    exit(0);
 +    exit(received_nb_signals ? 255 : 0);
      return 0;
  }
diff --combined ffmpeg_opt.c
@@@ -1,26 -1,26 +1,26 @@@
  /*
 - * avconv option parsing
 + * ffmpeg option parsing
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * 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 Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
  #include <stdint.h>
  
 -#include "avconv.h"
 +#include "ffmpeg.h"
  #include "cmdutils.h"
  
  #include "libavformat/avformat.h"
      }\
  }
  
 +#define MATCH_PER_TYPE_OPT(name, type, outvar, fmtctx, mediatype)\
 +{\
 +    int i;\
 +    for (i = 0; i < o->nb_ ## name; i++) {\
 +        char *spec = o->name[i].specifier;\
 +        if (!strcmp(spec, mediatype))\
 +            outvar = o->name[i].u.type;\
 +    }\
 +}
  char *vstats_filename;
  
  float audio_drift_threshold = 0.1;
  float dts_delta_threshold   = 10;
 +float dts_error_threshold   = 3600*30;
  
  int audio_volume      = 256;
  int audio_sync_method = 0;
  int video_sync_method = VSYNC_AUTO;
  int do_deinterlace    = 0;
  int do_benchmark      = 0;
 +int do_benchmark_all  = 0;
  int do_hex_dump       = 0;
  int do_pkt_dump       = 0;
  int copy_ts           = 0;
 -int copy_tb           = 1;
 +int copy_tb           = -1;
 +int debug_ts          = 0;
  int exit_on_error     = 0;
  int print_stats       = 1;
  int qp_hist           = 0;
 +int stdin_interaction = 1;
 +int frame_bits_per_raw_sample = 0;
  
 +
 +static int intra_only         = 0;
  static int file_overwrite     = 0;
 +static int no_file_overwrite  = 0;
  static int video_discard      = 0;
  static int intra_dc_precision = 8;
 -static int using_stdin        = 0;
 +static int do_psnr            = 0;
  static int input_sync;
  
 -static void uninit_options(OptionsContext *o)
 +static int64_t recording_time = INT64_MAX;
 +
 +static void uninit_options(OptionsContext *o, int is_input)
  {
      const OptionDef *po = options;
      int i;
      for (i = 0; i < o->nb_stream_maps; i++)
          av_freep(&o->stream_maps[i].linklabel);
      av_freep(&o->stream_maps);
 -    av_freep(&o->meta_data_maps);
 +    av_freep(&o->audio_channel_maps);
      av_freep(&o->streamid_map);
 +    av_freep(&o->attachments);
 +
 +    if (is_input)
 +        recording_time = o->recording_time;
 +    else
 +        recording_time = INT64_MAX;
  }
  
 -static void init_options(OptionsContext *o)
 +static void init_options(OptionsContext *o, int is_input)
  {
      memset(o, 0, sizeof(*o));
  
 +    if (!is_input && recording_time != INT64_MAX) {
 +        o->recording_time = recording_time;
 +        av_log(NULL, AV_LOG_WARNING,
 +                "-t is not an input option, keeping it for the next output;"
 +                " consider fixing your command line.\n");
 +    } else
 +        o->recording_time = INT64_MAX;
 +    o->stop_time = INT64_MAX;
      o->mux_max_delay  = 0.7;
 -    o->recording_time = INT64_MAX;
      o->limit_filesize = UINT64_MAX;
      o->chapters_input_file = INT_MAX;
  }
  
 -static double parse_frame_aspect_ratio(const char *arg)
 +static int opt_sameq(void *optctx, const char *opt, const char *arg)
  {
 -    int x = 0, y = 0;
 -    double ar = 0;
 -    const char *p;
 -    char *end;
 -
 -    p = strchr(arg, ':');
 -    if (p) {
 -        x = strtol(arg, &end, 10);
 -        if (end == p)
 -            y = strtol(end + 1, &end, 10);
 -        if (x > 0 && y > 0)
 -            ar = (double)x / (double)y;
 -    } else
 -        ar = strtod(arg, NULL);
 +    av_log(NULL, AV_LOG_ERROR, "Option '%s' was removed. "
 +           "If you are looking for an option to preserve the quality (which is not "
 +           "what -%s was for), use -qscale 0 or an equivalent quality factor option.\n",
 +           opt, opt);
 +    return AVERROR(EINVAL);
 +}
  
 -    if (!ar) {
 -        av_log(NULL, AV_LOG_FATAL, "Incorrect aspect ratio specification.\n");
 -        exit(1);
 -    }
 -    return ar;
 +static int opt_video_channel(void *optctx, const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "This option is deprecated, use -channel.\n");
 +    return opt_default(optctx, "channel", arg);
 +}
 +
 +static int opt_video_standard(void *optctx, const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "This option is deprecated, use -standard.\n");
 +    return opt_default(optctx, "standard", arg);
  }
  
  static int opt_audio_codec(void *optctx, const char *opt, const char *arg)
@@@ -201,7 -172,7 +201,7 @@@ static int opt_map(void *optctx, const 
      OptionsContext *o = optctx;
      StreamMap *m = NULL;
      int i, negative = 0, file_idx;
 -    int sync_file_idx = -1, sync_stream_idx;
 +    int sync_file_idx = -1, sync_stream_idx = 0;
      char *p, *sync;
      char *map;
  
@@@ -299,65 -270,6 +299,65 @@@ static int opt_attach(void *optctx, con
      return 0;
  }
  
 +static int opt_map_channel(void *optctx, const char *opt, const char *arg)
 +{
 +    OptionsContext *o = optctx;
 +    int n;
 +    AVStream *st;
 +    AudioChannelMap *m;
 +
 +    GROW_ARRAY(o->audio_channel_maps, o->nb_audio_channel_maps);
 +    m = &o->audio_channel_maps[o->nb_audio_channel_maps - 1];
 +
 +    /* muted channel syntax */
 +    n = sscanf(arg, "%d:%d.%d", &m->channel_idx, &m->ofile_idx, &m->ostream_idx);
 +    if ((n == 1 || n == 3) && m->channel_idx == -1) {
 +        m->file_idx = m->stream_idx = -1;
 +        if (n == 1)
 +            m->ofile_idx = m->ostream_idx = -1;
 +        return 0;
 +    }
 +
 +    /* normal syntax */
 +    n = sscanf(arg, "%d.%d.%d:%d.%d",
 +               &m->file_idx,  &m->stream_idx, &m->channel_idx,
 +               &m->ofile_idx, &m->ostream_idx);
 +
 +    if (n != 3 && n != 5) {
 +        av_log(NULL, AV_LOG_FATAL, "Syntax error, mapchan usage: "
 +               "[file.stream.channel|-1][:syncfile:syncstream]\n");
 +        exit(1);
 +    }
 +
 +    if (n != 5) // only file.stream.channel specified
 +        m->ofile_idx = m->ostream_idx = -1;
 +
 +    /* check input */
 +    if (m->file_idx < 0 || m->file_idx >= nb_input_files) {
 +        av_log(NULL, AV_LOG_FATAL, "mapchan: invalid input file index: %d\n",
 +               m->file_idx);
 +        exit(1);
 +    }
 +    if (m->stream_idx < 0 ||
 +        m->stream_idx >= input_files[m->file_idx]->nb_streams) {
 +        av_log(NULL, AV_LOG_FATAL, "mapchan: invalid input file stream index #%d.%d\n",
 +               m->file_idx, m->stream_idx);
 +        exit(1);
 +    }
 +    st = input_files[m->file_idx]->ctx->streams[m->stream_idx];
 +    if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO) {
 +        av_log(NULL, AV_LOG_FATAL, "mapchan: stream #%d.%d is not an audio stream.\n",
 +               m->file_idx, m->stream_idx);
 +        exit(1);
 +    }
 +    if (m->channel_idx < 0 || m->channel_idx >= st->codec->channels) {
 +        av_log(NULL, AV_LOG_FATAL, "mapchan: invalid audio channel #%d.%d.%d\n",
 +               m->file_idx, m->stream_idx, m->channel_idx);
 +        exit(1);
 +    }
 +    return 0;
 +}
 +
  /**
   * Parse a metadata specifier passed as 'arg' parameter.
   * @param arg  metadata string to parse
@@@ -395,7 -307,7 +395,7 @@@ static void parse_meta_type(char *arg, 
  static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFormatContext *ic, OptionsContext *o)
  {
      AVDictionary **meta_in = NULL;
 -    AVDictionary **meta_out;
 +    AVDictionary **meta_out = NULL;
      int i, ret = 0;
      char type_in, type_out;
      const char *istream_spec = NULL, *ostream_spec = NULL;
      parse_meta_type(inspec,  &type_in,  &idx_in,  &istream_spec);
      parse_meta_type(outspec, &type_out, &idx_out, &ostream_spec);
  
 +    if (!ic) {
 +        if (type_out == 'g' || !*outspec)
 +            o->metadata_global_manual = 1;
 +        if (type_out == 's' || !*outspec)
 +            o->metadata_streams_manual = 1;
 +        if (type_out == 'c' || !*outspec)
 +            o->metadata_chapters_manual = 1;
 +        return 0;
 +    }
 +
      if (type_in == 'g' || type_out == 'g')
          o->metadata_global_manual = 1;
      if (type_in == 's' || type_out == 's')
      return 0;
  }
  
 +static int opt_recording_timestamp(void *optctx, const char *opt, const char *arg)
 +{
 +    OptionsContext *o = optctx;
 +    char buf[128];
 +    int64_t recording_timestamp = parse_time_or_die(opt, arg, 0) / 1E6;
 +    struct tm time = *gmtime((time_t*)&recording_timestamp);
 +    strftime(buf, sizeof(buf), "creation_time=%FT%T%z", &time);
 +    parse_option(o, "metadata", buf, options);
 +
 +    av_log(NULL, AV_LOG_WARNING, "%s is deprecated, set the 'creation_time' metadata "
 +                                 "tag instead.\n", opt);
 +    return 0;
 +}
 +
  static AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder)
  {
      const AVCodecDescriptor *desc;
@@@ -543,7 -431,6 +543,7 @@@ static AVCodec *choose_decoder(OptionsC
  static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
  {
      int i;
 +    char *next, *codec_tag = NULL;
  
      for (i = 0; i < ic->nb_streams; i++) {
          AVStream *st = ic->streams[i];
          ist->ts_scale = 1.0;
          MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st);
  
 +        MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, ic, st);
 +        if (codec_tag) {
 +            uint32_t tag = strtol(codec_tag, &next, 0);
 +            if (*next)
 +                tag = AV_RL32(codec_tag);
 +            st->codec->codec_tag = tag;
 +        }
 +
          ist->dec = choose_decoder(o, ic, st);
          ist->opts = filter_codec_opts(o->g->codec_opts, ist->st->codec->codec_id, ic, st, ist->dec);
  
 +        ist->reinit_filters = -1;
 +        MATCH_PER_STREAM_OPT(reinit_filters, i, ist->reinit_filters, ic, st);
 +
 +        ist->filter_in_rescale_delta_last = AV_NOPTS_VALUE;
 +
          switch (dec->codec_type) {
          case AVMEDIA_TYPE_VIDEO:
 +            if(!ist->dec)
 +                ist->dec = avcodec_find_decoder(dec->codec_id);
 +            if (dec->lowres) {
 +                dec->flags |= CODEC_FLAG_EMU_EDGE;
 +            }
 +
              ist->resample_height  = dec->height;
              ist->resample_width   = dec->width;
              ist->resample_pix_fmt = dec->pix_fmt;
                  exit(1);
              }
  
 +            ist->top_field_first = -1;
 +            MATCH_PER_STREAM_OPT(top_field_first, i, ist->top_field_first, ic, st);
 +
              break;
          case AVMEDIA_TYPE_AUDIO:
 +            ist->guess_layout_max = INT_MAX;
 +            MATCH_PER_STREAM_OPT(guess_layout_max, i, ist->guess_layout_max, ic, st);
              guess_input_channel_layout(ist);
  
              ist->resample_sample_fmt     = dec->sample_fmt;
              break;
          case AVMEDIA_TYPE_DATA:
          case AVMEDIA_TYPE_SUBTITLE:
 +            if(!ist->dec)
 +                ist->dec = avcodec_find_decoder(dec->codec_id);
 +            MATCH_PER_STREAM_OPT(fix_sub_duration, i, ist->fix_sub_duration, ic, st);
 +            break;
          case AVMEDIA_TYPE_ATTACHMENT:
          case AVMEDIA_TYPE_UNKNOWN:
              break;
  
  static void assert_file_overwrite(const char *filename)
  {
 -    if (!file_overwrite &&
 +    if ((!file_overwrite || no_file_overwrite) &&
          (strchr(filename, ':') == NULL || filename[1] == ':' ||
           av_strstart(filename, "file:", NULL))) {
          if (avio_check(filename, 0) == 0) {
 -            if (!using_stdin) {
 +            if (stdin_interaction && (!no_file_overwrite || file_overwrite)) {
                  fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
                  fflush(stderr);
 +                term_exit();
 +                signal(SIGINT, SIG_DFL);
                  if (!read_yesno()) {
 -                    fprintf(stderr, "Not overwriting - exiting\n");
 +                    av_log(NULL, AV_LOG_FATAL, "Not overwriting - exiting\n");
                      exit(1);
                  }
 +                term_init();
              }
              else {
 -                fprintf(stderr,"File '%s' already exists. Exiting.\n", filename);
 +                av_log(NULL, AV_LOG_FATAL, "File '%s' already exists. Exiting.\n", filename);
                  exit(1);
              }
          }
@@@ -697,9 -553,6 +697,9 @@@ static int open_input_file(OptionsConte
      uint8_t buf[128];
      AVDictionary **opts;
      int orig_nb_streams;                     // number of streams before avformat_find_stream_info
 +    char *   video_codec_name = NULL;
 +    char *   audio_codec_name = NULL;
 +    char *subtitle_codec_name = NULL;
  
      if (o->format) {
          if (!(file_iformat = av_find_input_format(o->format))) {
      if (!strcmp(filename, "-"))
          filename = "pipe:";
  
 -    using_stdin |= !strncmp(filename, "pipe:", 5) ||
 -                    !strcmp(filename, "/dev/stdin");
 +    stdin_interaction &= strncmp(filename, "pipe:", 5) &&
 +                         strcmp(filename, "/dev/stdin");
  
      /* get default parameters from command line */
      ic = avformat_alloc_context();
      if (o->nb_frame_pix_fmts)
          av_dict_set(&o->g->format_opts, "pixel_format", o->frame_pix_fmts[o->nb_frame_pix_fmts - 1].u.str, 0);
  
 +    MATCH_PER_TYPE_OPT(codec_names, str,    video_codec_name, ic, "v");
 +    MATCH_PER_TYPE_OPT(codec_names, str,    audio_codec_name, ic, "a");
 +    MATCH_PER_TYPE_OPT(codec_names, str, subtitle_codec_name, ic, "s");
 +
 +    ic->video_codec_id   = video_codec_name ?
 +        find_codec_or_die(video_codec_name   , AVMEDIA_TYPE_VIDEO   , 0)->id : AV_CODEC_ID_NONE;
 +    ic->audio_codec_id   = audio_codec_name ?
 +        find_codec_or_die(audio_codec_name   , AVMEDIA_TYPE_AUDIO   , 0)->id : AV_CODEC_ID_NONE;
 +    ic->subtitle_codec_id= subtitle_codec_name ?
 +        find_codec_or_die(subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, 0)->id : AV_CODEC_ID_NONE;
      ic->flags |= AVFMT_FLAG_NONBLOCK;
      ic->interrupt_callback = int_cb;
  
 -    /* open the input file with generic libav function */
 +    /* open the input file with generic avformat function */
      err = avformat_open_input(&ic, filename, file_iformat, &o->g->format_opts);
      if (err < 0) {
          print_error(filename, err);
  
      /* if seeking requested, we execute it */
      if (o->start_time != 0) {
 -        ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD);
 +        ret = avformat_seek_file(ic, -1, INT64_MIN, timestamp, timestamp, 0);
          if (ret < 0) {
              av_log(NULL, AV_LOG_WARNING, "%s: could not seek to position %0.3f\n",
                     filename, (double)timestamp / AV_TIME_BASE);
@@@ -900,7 -743,7 +900,7 @@@ static void choose_encoder(OptionsConte
      }
  }
  
 -static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, enum AVMediaType type)
 +static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, enum AVMediaType type, int source_index)
  {
      OutputStream *ost;
      AVStream *st = avformat_new_stream(oc, NULL);
                     preset, ost->file_index, ost->index);
              exit(1);
          }
+     } else {
+         ost->opts = filter_codec_opts(o->g->codec_opts, AV_CODEC_ID_NONE, oc, st, NULL);
      }
  
      avcodec_get_context_defaults3(st->codec, ost->enc);
      ost->max_frames = INT64_MAX;
      MATCH_PER_STREAM_OPT(max_frames, i64, ost->max_frames, oc, st);
  
 +    ost->copy_prior_start = -1;
 +    MATCH_PER_STREAM_OPT(copy_prior_start, i, ost->copy_prior_start, oc ,st);
 +
      MATCH_PER_STREAM_OPT(bitstream_filters, str, bsf, oc, st);
      while (bsf) {
          if (next = strchr(bsf, ','))
  
      av_opt_get_int(o->g->sws_opts, "sws_flags", 0, &ost->sws_flags);
  
 +    av_dict_copy(&ost->swr_opts, o->g->swr_opts, 0);
 +    if (ost->enc && av_get_exact_bits_per_sample(ost->enc->id) == 24)
 +        av_dict_set(&ost->swr_opts, "output_sample_bits", "24", 0);
 +
      av_dict_copy(&ost->resample_opts, o->g->resample_opts, 0);
  
 -    ost->pix_fmts[0] = ost->pix_fmts[1] = AV_PIX_FMT_NONE;
 +    ost->source_index = source_index;
 +    if (source_index >= 0) {
 +        ost->sync_ist = input_streams[source_index];
 +        input_streams[source_index]->discard = 0;
 +        input_streams[source_index]->st->discard = AVDISCARD_NONE;
 +    }
  
      return ost;
  }
@@@ -1037,32 -870,31 +1039,32 @@@ static void parse_matrix_coeffs(uint16_
      }
  }
  
 -static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
 +static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, int source_index)
  {
      AVStream *st;
      OutputStream *ost;
      AVCodecContext *video_enc;
 +    char *frame_rate = NULL;
  
 -    ost = new_output_stream(o, oc, AVMEDIA_TYPE_VIDEO);
 +    ost = new_output_stream(o, oc, AVMEDIA_TYPE_VIDEO, source_index);
      st  = ost->st;
      video_enc = st->codec;
  
 +    MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st);
 +    if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) {
 +        av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate);
 +        exit(1);
 +    }
 +
      if (!ost->stream_copy) {
          const char *p = NULL;
 -        char *frame_rate = NULL, *frame_size = NULL;
 +        char *frame_size = NULL;
          char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL;
          char *intra_matrix = NULL, *inter_matrix = NULL;
          const char *filters = "null";
          int do_pass = 0;
          int i;
  
 -        MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st);
 -        if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) {
 -            av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate);
 -            exit(1);
 -        }
 -
          MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st);
          if (frame_size && av_parse_video_size(&video_enc->width, &video_enc->height, frame_size) < 0) {
              av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size);
          }
  
          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);
 +        if (frame_aspect_ratio) {
 +            AVRational q;
 +            if (av_parse_ratio(&q, frame_aspect_ratio, 255, 0, NULL) < 0 ||
 +                q.num <= 0 || q.den <= 0) {
 +                av_log(NULL, AV_LOG_FATAL, "Invalid aspect ratio: %s\n", frame_aspect_ratio);
 +                exit(1);
 +            }
 +            ost->frame_aspect_ratio = av_q2d(q);
 +        }
  
 +        video_enc->bits_per_raw_sample = frame_bits_per_raw_sample;
          MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st);
 +        if (frame_pix_fmt && *frame_pix_fmt == '+') {
 +            ost->keep_pix_fmt = 1;
 +            if (!*++frame_pix_fmt)
 +                frame_pix_fmt = NULL;
 +        }
          if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == AV_PIX_FMT_NONE) {
              av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt);
              exit(1);
          }
          st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
  
 +        if (intra_only)
 +            video_enc->gop_size = 0;
          MATCH_PER_STREAM_OPT(intra_matrices, str, intra_matrix, oc, st);
          if (intra_matrix) {
              if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) {
                  av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n");
                  exit(1);
              }
 +            /* FIXME realloc failure */
              video_enc->rc_override =
                  av_realloc(video_enc->rc_override,
                             sizeof(RcOverride) * (i + 1));
          video_enc->rc_override_count = i;
          video_enc->intra_dc_precision = intra_dc_precision - 8;
  
 +        if (do_psnr)
 +            video_enc->flags|= CODEC_FLAG_PSNR;
 +
          /* two pass mode */
          MATCH_PER_STREAM_OPT(pass, i, do_pass, oc, st);
          if (do_pass) {
 -            if (do_pass == 1) {
 +            if (do_pass & 1) {
                  video_enc->flags |= CODEC_FLAG_PASS1;
 -            } else {
 +                av_dict_set(&ost->opts, "flags", "+pass1", AV_DICT_APPEND);
 +            }
 +            if (do_pass & 2) {
                  video_enc->flags |= CODEC_FLAG_PASS2;
 +                av_dict_set(&ost->opts, "flags", "+pass2", AV_DICT_APPEND);
              }
          }
  
      return ost;
  }
  
 -static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc)
 +static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, int source_index)
  {
 +    int n;
      AVStream *st;
      OutputStream *ost;
      AVCodecContext *audio_enc;
  
 -    ost = new_output_stream(o, oc, AVMEDIA_TYPE_AUDIO);
 +    ost = new_output_stream(o, oc, AVMEDIA_TYPE_AUDIO, source_index);
      st  = ost->st;
  
      audio_enc = st->codec;
          MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st);
  
          MATCH_PER_STREAM_OPT(filters, str, filters, oc, st);
 +
 +        av_assert1(filters);
          ost->avfilter = av_strdup(filters);
 +
 +        /* check for channel mapping for this audio stream */
 +        for (n = 0; n < o->nb_audio_channel_maps; n++) {
 +            AudioChannelMap *map = &o->audio_channel_maps[n];
 +            InputStream *ist = input_streams[ost->source_index];
 +            if ((map->channel_idx == -1 || (ist->file_index == map->file_idx && ist->st->index == map->stream_idx)) &&
 +                (map->ofile_idx   == -1 || ost->file_index == map->ofile_idx) &&
 +                (map->ostream_idx == -1 || ost->st->index  == map->ostream_idx)) {
 +                if (ost->audio_channels_mapped < FF_ARRAY_ELEMS(ost->audio_channels_map))
 +                    ost->audio_channels_map[ost->audio_channels_mapped++] = map->channel_idx;
 +                else
 +                    av_log(NULL, AV_LOG_FATAL, "Max channel mapping for output %d.%d reached\n",
 +                           ost->file_index, ost->st->index);
 +            }
 +        }
      }
  
      return ost;
  }
  
 -static OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc)
 +static OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc, int source_index)
  {
      OutputStream *ost;
  
 -    ost = new_output_stream(o, oc, AVMEDIA_TYPE_DATA);
 +    ost = new_output_stream(o, oc, AVMEDIA_TYPE_DATA, source_index);
      if (!ost->stream_copy) {
          av_log(NULL, AV_LOG_FATAL, "Data stream encoding not supported yet (only streamcopy)\n");
          exit(1);
      return ost;
  }
  
 -static OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *oc)
 +static OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *oc, int source_index)
  {
 -    OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT);
 +    OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT, source_index);
      ost->stream_copy = 1;
      return ost;
  }
  
 -static OutputStream *new_subtitle_stream(OptionsContext *o, AVFormatContext *oc)
 +static OutputStream *new_subtitle_stream(OptionsContext *o, AVFormatContext *oc, int source_index)
  {
      AVStream *st;
      OutputStream *ost;
      AVCodecContext *subtitle_enc;
  
 -    ost = new_output_stream(o, oc, AVMEDIA_TYPE_SUBTITLE);
 +    ost = new_output_stream(o, oc, AVMEDIA_TYPE_SUBTITLE, source_index);
      st  = ost->st;
      subtitle_enc = st->codec;
  
      subtitle_enc->codec_type = AVMEDIA_TYPE_SUBTITLE;
  
 +    MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc, st);
 +
 +    if (!ost->stream_copy) {
 +        char *frame_size = NULL;
 +
 +        MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st);
 +        if (frame_size && av_parse_video_size(&subtitle_enc->width, &subtitle_enc->height, frame_size) < 0) {
 +            av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size);
 +            exit(1);
 +        }
 +    }
 +
      return ost;
  }
  
@@@ -1295,7 -1075,7 +1297,7 @@@ static int opt_streamid(void *optctx, c
          exit(1);
      }
      *p++ = '\0';
 -    idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, INT_MAX);
 +    idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, MAX_STREAMS-1);
      o->streamid_map = grow_array(o->streamid_map, sizeof(*o->streamid_map), &o->nb_streamid_map, idx+1);
      o->streamid_map[idx] = parse_number_or_die(opt, p, OPT_INT, 0, INT_MAX);
      return 0;
@@@ -1308,7 -1088,7 +1310,7 @@@ static int copy_chapters(InputFile *ifi
      AVChapter **tmp;
      int i;
  
 -    tmp = av_realloc(os->chapters, sizeof(*os->chapters) * (is->nb_chapters + os->nb_chapters));
 +    tmp = av_realloc_f(os->chapters, is->nb_chapters + os->nb_chapters, sizeof(*os->chapters));
      if (!tmp)
          return AVERROR(ENOMEM);
      os->chapters = tmp;
      return 0;
  }
  
 +static int read_ffserver_streams(OptionsContext *o, AVFormatContext *s, const char *filename)
 +{
 +    int i, err;
 +    AVFormatContext *ic = avformat_alloc_context();
 +
 +    ic->interrupt_callback = int_cb;
 +    err = avformat_open_input(&ic, filename, NULL, NULL);
 +    if (err < 0)
 +        return err;
 +    /* copy stream format */
 +    for(i=0;i<ic->nb_streams;i++) {
 +        AVStream *st;
 +        OutputStream *ost;
 +        AVCodec *codec;
 +        AVCodecContext *avctx;
 +
 +        codec = avcodec_find_encoder(ic->streams[i]->codec->codec_id);
 +        ost   = new_output_stream(o, s, codec->type, -1);
 +        st    = ost->st;
 +        avctx = st->codec;
 +        ost->enc = codec;
 +
 +        // FIXME: a more elegant solution is needed
 +        memcpy(st, ic->streams[i], sizeof(AVStream));
 +        st->cur_dts = 0;
 +        st->info = av_malloc(sizeof(*st->info));
 +        memcpy(st->info, ic->streams[i]->info, sizeof(*st->info));
 +        st->codec= avctx;
 +        avcodec_copy_context(st->codec, ic->streams[i]->codec);
 +
 +        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && !ost->stream_copy)
 +            choose_sample_fmt(st, codec);
 +        else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && !ost->stream_copy)
 +            choose_pixel_fmt(st, codec, st->codec->pix_fmt);
 +    }
 +
 +    /* ffserver seeking with date=... needs a date reference */
 +    err = parse_option(o, "metadata", "creation_time=now", options);
 +
 +    avformat_close_input(&ic);
 +    return err;
 +}
 +
  static void init_output_filter(OutputFilter *ofilter, OptionsContext *o,
                                 AVFormatContext *oc)
  {
  
      switch (avfilter_pad_get_type(ofilter->out_tmp->filter_ctx->output_pads,
                                    ofilter->out_tmp->pad_idx)) {
 -    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_VIDEO: ost = new_video_stream(o, oc, -1); break;
 +    case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream(o, oc, -1); break;
      default:
          av_log(NULL, AV_LOG_FATAL, "Only video and audio filters are supported "
                 "currently.\n");
@@@ -1447,13 -1184,30 +1449,13 @@@ static int open_output_file(OptionsCont
      if (!strcmp(filename, "-"))
          filename = "pipe:";
  
 -    oc = avformat_alloc_context();
 +    err = avformat_alloc_output_context2(&oc, NULL, o->format, filename);
      if (!oc) {
 -        print_error(filename, AVERROR(ENOMEM));
 +        print_error(filename, err);
          exit(1);
      }
 -
 -    if (o->format) {
 -        file_oformat = av_guess_format(o->format, NULL, NULL);
 -        if (!file_oformat) {
 -            av_log(NULL, AV_LOG_FATAL, "Requested output format '%s' is not a suitable output format\n", o->format);
 -            exit(1);
 -        }
 -    } else {
 -        file_oformat = av_guess_format(NULL, filename, NULL);
 -        if (!file_oformat) {
 -            av_log(NULL, AV_LOG_FATAL, "Unable to find a suitable output format for '%s'\n",
 -                   filename);
 -            exit(1);
 -        }
 -    }
 -
 -    oc->oformat = file_oformat;
 +    file_oformat= oc->oformat;
      oc->interrupt_callback = int_cb;
 -    av_strlcpy(oc->filename, filename, sizeof(oc->filename));
  
      /* create streams for all unlabeled output pads */
      for (i = 0; i < nb_filtergraphs; i++) {
          }
      }
  
 -    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;\
 -            input_streams[index]->st->discard = AVDISCARD_NONE;\
 +    if (!strcmp(file_oformat->name, "ffm") &&
 +        av_strstart(filename, "http:", NULL)) {
 +        int j;
 +        /* special case for files sent to ffserver: we get the stream
 +           parameters from ffserver */
 +        int err = read_ffserver_streams(o, oc, filename);
 +        if (err < 0) {
 +            print_error(filename, err);
 +            exit(1);
 +        }
 +        for(j = nb_output_streams - oc->nb_streams; j < nb_output_streams; j++) {
 +            ost = output_streams[j];
 +            for (i = 0; i < nb_input_streams; i++) {
 +                ist = input_streams[i];
 +                if(ist->st->codec->codec_type == ost->st->codec->codec_type){
 +                    ost->sync_ist= ist;
 +                    ost->source_index= i;
 +                    if(ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) ost->avfilter = av_strdup("anull");
 +                    if(ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) ost->avfilter = av_strdup("null");
 +                    ist->discard = 0;
 +                    ist->st->discard = AVDISCARD_NONE;
 +                    break;
 +                }
 +            }
 +            if(!ost->sync_ist){
 +                av_log(NULL, AV_LOG_FATAL, "Missing %s stream which is required by this ffm\n", av_get_media_type_string(ost->st->codec->codec_type));
 +                exit(1);
 +            }
          }
 +    } else if (!o->nb_stream_maps) {
 +        char *subtitle_codec_name = NULL;
 +        /* pick the "best" stream of each type */
  
          /* video: highest resolution */
          if (!o->video_disable && oc->oformat->video_codec != AV_CODEC_ID_NONE) {
              int area = 0, idx = -1;
 +            int qcr = avformat_query_codec(oc->oformat, oc->oformat->video_codec, 0);
              for (i = 0; i < nb_input_streams; i++) {
 +                int new_area;
                  ist = input_streams[i];
 +                new_area = ist->st->codec->width * ist->st->codec->height;
 +                if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC))
 +                    new_area = 1;
                  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;
 +                    new_area > area) {
 +                    if((qcr==MKTAG('A', 'P', 'I', 'C')) && !(ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC))
 +                        continue;
 +                    area = new_area;
                      idx = i;
                  }
              }
 -            NEW_STREAM(video, idx);
 +            if (idx >= 0)
 +                new_video_stream(o, oc, idx);
          }
  
          /* audio: most channels */
                      idx = i;
                  }
              }
 -            NEW_STREAM(audio, idx);
 +            if (idx >= 0)
 +                new_audio_stream(o, oc, idx);
          }
  
          /* subtitles: pick first */
 -        if (!o->subtitle_disable && oc->oformat->subtitle_codec != AV_CODEC_ID_NONE) {
 +        MATCH_PER_TYPE_OPT(codec_names, str, subtitle_codec_name, oc, "s");
 +        if (!o->subtitle_disable && (oc->oformat->subtitle_codec != AV_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);
 +                    new_subtitle_stream(o, oc, i);
                      break;
                  }
          }
      } else {
          for (i = 0; i < o->nb_stream_maps; i++) {
              StreamMap *map = &o->stream_maps[i];
 +            int src_idx = input_files[map->file_index]->ist_index + map->stream_index;
  
              if (map->disabled)
                  continue;
  loop_end:
                  if (!ofilter) {
                      av_log(NULL, AV_LOG_FATAL, "Output with label '%s' does not exist "
 -                           "in any defined filter graph.\n", map->linklabel);
 +                           "in any defined filter graph, or was already used elsewhere.\n", map->linklabel);
                      exit(1);
                  }
                  init_output_filter(ofilter, o, oc);
              } else {
                  ist = input_streams[input_files[map->file_index]->ist_index + map->stream_index];
 +                if(o->subtitle_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE)
 +                    continue;
 +                if(o->   audio_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
 +                    continue;
 +                if(o->   video_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
 +                    continue;
 +                if(o->    data_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_DATA)
 +                    continue;
 +
                  switch (ist->st->codec->codec_type) {
 -                case AVMEDIA_TYPE_VIDEO:    ost = new_video_stream(o, oc);    break;
 -                case AVMEDIA_TYPE_AUDIO:    ost = new_audio_stream(o, oc);    break;
 -                case AVMEDIA_TYPE_SUBTITLE: ost = new_subtitle_stream(o, oc); break;
 -                case AVMEDIA_TYPE_DATA:     ost = new_data_stream(o, oc);     break;
 -                case AVMEDIA_TYPE_ATTACHMENT: ost = new_attachment_stream(o, oc); break;
 +                case AVMEDIA_TYPE_VIDEO:      ost = new_video_stream     (o, oc, src_idx); break;
 +                case AVMEDIA_TYPE_AUDIO:      ost = new_audio_stream     (o, oc, src_idx); break;
 +                case AVMEDIA_TYPE_SUBTITLE:   ost = new_subtitle_stream  (o, oc, src_idx); break;
 +                case AVMEDIA_TYPE_DATA:       ost = new_data_stream      (o, oc, src_idx); break;
 +                case AVMEDIA_TYPE_ATTACHMENT: ost = new_attachment_stream(o, oc, src_idx); break;
                  default:
                      av_log(NULL, AV_LOG_FATAL, "Cannot map stream #%d:%d - unsupported type.\n",
                             map->file_index, map->stream_index);
                      exit(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;
 -                ist->st->discard = AVDISCARD_NONE;
              }
          }
      }
          }
          avio_read(pb, attachment, len);
  
 -        ost = new_attachment_stream(o, oc);
 +        ost = new_attachment_stream(o, oc, -1);
          ost->stream_copy               = 0;
 -        ost->source_index              = -1;
          ost->attachment_filename       = o->attachments[i];
 +        ost->finished                  = 1;
          ost->st->codec->extradata      = attachment;
          ost->st->codec->extradata_size = len;
  
          avio_close(pb);
      }
  
 +    for (i = nb_output_streams - oc->nb_streams; i < nb_output_streams; i++) { //for all streams of this output file
 +        AVDictionaryEntry *e;
 +        ost = output_streams[i];
 +
 +        if ((ost->stream_copy || ost->attachment_filename)
 +            && (e = av_dict_get(o->g->codec_opts, "flags", NULL, AV_DICT_IGNORE_SUFFIX))
 +            && (!e->key[5] || check_stream_specifier(oc, ost->st, e->key+6)))
 +            if (av_opt_set(ost->st->codec, "flags", e->value, 0) < 0)
 +                exit(1);
 +    }
 +
 +    if (o->stop_time != INT64_MAX && o->recording_time != INT64_MAX) {
 +        o->stop_time = INT64_MAX;
 +        av_log(NULL, AV_LOG_WARNING, "-t and -to cannot be used together; using -t.\n");
 +    }
 +
 +    if (o->stop_time != INT64_MAX && o->recording_time == INT64_MAX) {
 +        if (o->stop_time <= o->start_time) {
 +            av_log(NULL, AV_LOG_WARNING, "-to value smaller than -ss; ignoring -to.\n");
 +            o->stop_time = INT64_MAX;
 +        } else {
 +            o->recording_time = o->stop_time - o->start_time;
 +        }
 +    }
 +
      GROW_ARRAY(output_files, nb_output_files);
      if (!(output_files[nb_output_files - 1] = av_mallocz(sizeof(*output_files[0]))))
          exit(1);
          av_dict_set(&output_files[nb_output_files - 1]->opts, "preload", buf, 0);
      }
      oc->max_delay = (int)(o->mux_max_delay * AV_TIME_BASE);
 -    oc->flags |= AVFMT_FLAG_NONBLOCK;
  
      /* copy metadata */
      for (i = 0; i < o->nb_metadata_map; i++) {
                        !o->metadata_chapters_manual);
  
      /* copy global metadata by default */
 -    if (!o->metadata_global_manual && nb_input_files)
 +    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);
 +        av_dict_set(&oc->metadata, "creation_time", NULL, 0);
 +    }
      if (!o->metadata_streams_manual)
          for (i = output_files[nb_output_files - 1]->ost_index; i < nb_output_streams; i++) {
              InputStream *ist;
          AVDictionary **m;
          char type, *val;
          const char *stream_spec;
 -        int index = 0, j, ret;
 +        int index = 0, j, ret = 0;
  
          val = strchr(o->metadata[i].u.str, '=');
          if (!val) {
@@@ -1863,23 -1553,22 +1865,23 @@@ static int opt_target(void *optctx, con
          opt_video_codec(o, "c:v", "mpeg1video");
          opt_audio_codec(o, "c:a", "mp2");
          parse_option(o, "f", "vcd", options);
 +        av_dict_set(&o->g->codec_opts, "b:v", arg, 0);
  
          parse_option(o, "s", norm == PAL ? "352x288" : "352x240", options);
          parse_option(o, "r", frame_rates[norm], options);
 -        opt_default(NULL, "g", norm == PAL ? "15" : "18");
 +        av_dict_set(&o->g->codec_opts, "g", norm == PAL ? "15" : "18", 0);
  
 -        opt_default(NULL, "b", "1150000");
 -        opt_default(NULL, "maxrate", "1150000");
 -        opt_default(NULL, "minrate", "1150000");
 -        opt_default(NULL, "bufsize", "327680"); // 40*1024*8;
 +        av_dict_set(&o->g->codec_opts, "b:v", "1150000", 0);
 +        av_dict_set(&o->g->codec_opts, "maxrate", "1150000", 0);
 +        av_dict_set(&o->g->codec_opts, "minrate", "1150000", 0);
 +        av_dict_set(&o->g->codec_opts, "bufsize", "327680", 0); // 40*1024*8;
  
 -        opt_default(NULL, "b:a", "224000");
 +        av_dict_set(&o->g->codec_opts, "b:a", "224000", 0);
          parse_option(o, "ar", "44100", options);
          parse_option(o, "ac", "2", options);
  
 -        opt_default(NULL, "packetsize", "2324");
 -        opt_default(NULL, "muxrate", "1411200"); // 2352 * 75 * 8;
 +        av_dict_set(&o->g->format_opts, "packetsize", "2324", 0);
 +        av_dict_set(&o->g->format_opts, "muxrate", "1411200", 0); // 2352 * 75 * 8;
  
          /* We have to offset the PTS, so that it is consistent with the SCR.
             SCR starts at 36000, but the first two packs contain only padding
  
          parse_option(o, "s", norm == PAL ? "480x576" : "480x480", options);
          parse_option(o, "r", frame_rates[norm], options);
 -        opt_default(NULL, "g", norm == PAL ? "15" : "18");
 -
 -        opt_default(NULL, "b", "2040000");
 -        opt_default(NULL, "maxrate", "2516000");
 -        opt_default(NULL, "minrate", "0"); // 1145000;
 -        opt_default(NULL, "bufsize", "1835008"); // 224*1024*8;
 -        opt_default(NULL, "flags", "+scan_offset");
 +        parse_option(o, "pix_fmt", "yuv420p", options);
 +        av_dict_set(&o->g->codec_opts, "g", norm == PAL ? "15" : "18", 0);
  
 +        av_dict_set(&o->g->codec_opts, "b:v", "2040000", 0);
 +        av_dict_set(&o->g->codec_opts, "maxrate", "2516000", 0);
 +        av_dict_set(&o->g->codec_opts, "minrate", "0", 0); // 1145000;
 +        av_dict_set(&o->g->codec_opts, "bufsize", "1835008", 0); // 224*1024*8;
 +        av_dict_set(&o->g->codec_opts, "scan_offset", "1", 0);
  
 -        opt_default(NULL, "b:a", "224000");
 +        av_dict_set(&o->g->codec_opts, "b:a", "224000", 0);
          parse_option(o, "ar", "44100", options);
  
 -        opt_default(NULL, "packetsize", "2324");
 +        av_dict_set(&o->g->format_opts, "packetsize", "2324", 0);
  
      } else if (!strcmp(arg, "dvd")) {
  
  
          parse_option(o, "s", norm == PAL ? "720x576" : "720x480", options);
          parse_option(o, "r", frame_rates[norm], options);
 -        opt_default(NULL, "g", norm == PAL ? "15" : "18");
 +        parse_option(o, "pix_fmt", "yuv420p", options);
 +        av_dict_set(&o->g->codec_opts, "g", norm == PAL ? "15" : "18", 0);
  
 -        opt_default(NULL, "b", "6000000");
 -        opt_default(NULL, "maxrate", "9000000");
 -        opt_default(NULL, "minrate", "0"); // 1500000;
 -        opt_default(NULL, "bufsize", "1835008"); // 224*1024*8;
 +        av_dict_set(&o->g->codec_opts, "b:v", "6000000", 0);
 +        av_dict_set(&o->g->codec_opts, "maxrate", "9000000", 0);
 +        av_dict_set(&o->g->codec_opts, "minrate", "0", 0); // 1500000;
 +        av_dict_set(&o->g->codec_opts, "bufsize", "1835008", 0); // 224*1024*8;
  
 -        opt_default(NULL, "packetsize", "2048");  // from www.mpucoder.com: DVD sectors contain 2048 bytes of data, this is also the size of one pack.
 -        opt_default(NULL, "muxrate", "10080000"); // from mplex project: data_rate = 1260000. mux_rate = data_rate * 8
 +        av_dict_set(&o->g->format_opts, "packetsize", "2048", 0);  // from www.mpucoder.com: DVD sectors contain 2048 bytes of data, this is also the size of one pack.
 +        av_dict_set(&o->g->format_opts, "muxrate", "10080000", 0); // from mplex project: data_rate = 1260000. mux_rate = data_rate * 8
  
 -        opt_default(NULL, "b:a", "448000");
 +        av_dict_set(&o->g->codec_opts, "b:a", "448000", 0);
          parse_option(o, "ar", "48000", options);
  
      } else if (!strncmp(arg, "dv", 2)) {
@@@ -1986,120 -1674,22 +1988,120 @@@ static int opt_data_frames(void *optctx
      return parse_option(o, "frames:d", arg, options);
  }
  
 -static int opt_video_tag(void *optctx, const char *opt, const char *arg)
 +static int opt_default_new(OptionsContext *o, const char *opt, const char *arg)
 +{
 +    int ret;
 +    AVDictionary *cbak = codec_opts;
 +    AVDictionary *fbak = format_opts;
 +    codec_opts = NULL;
 +    format_opts = NULL;
 +
 +    ret = opt_default(NULL, opt, arg);
 +
 +    av_dict_copy(&o->g->codec_opts , codec_opts, 0);
 +    av_dict_copy(&o->g->format_opts, format_opts, 0);
 +    av_dict_free(&codec_opts);
 +    av_dict_free(&format_opts);
 +    codec_opts = cbak;
 +    format_opts = fbak;
 +
 +    return ret;
 +}
 +
 +static int opt_preset(void *optctx, const char *opt, const char *arg)
  {
      OptionsContext *o = optctx;
 -    return parse_option(o, "tag:v", arg, options);
 +    FILE *f=NULL;
 +    char filename[1000], line[1000], tmp_line[1000];
 +    const char *codec_name = NULL;
 +
 +    tmp_line[0] = *opt;
 +    tmp_line[1] = 0;
 +    MATCH_PER_TYPE_OPT(codec_names, str, codec_name, NULL, tmp_line);
 +
 +    if (!(f = get_preset_file(filename, sizeof(filename), arg, *opt == 'f', codec_name))) {
 +        if(!strncmp(arg, "libx264-lossless", strlen("libx264-lossless"))){
 +            av_log(NULL, AV_LOG_FATAL, "Please use -preset <speed> -qp 0\n");
 +        }else
 +            av_log(NULL, AV_LOG_FATAL, "File for preset '%s' not found\n", arg);
 +        exit(1);
 +    }
 +
 +    while (fgets(line, sizeof(line), f)) {
 +        char *key = tmp_line, *value, *endptr;
 +
 +        if (strcspn(line, "#\n\r") == 0)
 +            continue;
 +        strcpy(tmp_line, line);
 +        if (!av_strtok(key,   "=",    &value) ||
 +            !av_strtok(value, "\r\n", &endptr)) {
 +            av_log(NULL, AV_LOG_FATAL, "%s: Invalid syntax: '%s'\n", filename, line);
 +            exit(1);
 +        }
 +        av_log(NULL, AV_LOG_DEBUG, "ffpreset[%s]: set '%s' = '%s'\n", filename, key, value);
 +
 +        if      (!strcmp(key, "acodec")) opt_audio_codec   (o, key, value);
 +        else if (!strcmp(key, "vcodec")) opt_video_codec   (o, key, value);
 +        else if (!strcmp(key, "scodec")) opt_subtitle_codec(o, key, value);
 +        else if (!strcmp(key, "dcodec")) opt_data_codec    (o, key, value);
 +        else if (opt_default_new(o, key, value) < 0) {
 +            av_log(NULL, AV_LOG_FATAL, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n",
 +                   filename, line, key, value);
 +            exit(1);
 +        }
 +    }
 +
 +    fclose(f);
 +
 +    return 0;
  }
  
 -static int opt_audio_tag(void *optctx, const char *opt, const char *arg)
 +static int opt_old2new(void *optctx, const char *opt, const char *arg)
  {
      OptionsContext *o = optctx;
 -    return parse_option(o, "tag:a", arg, options);
 +    char *s = av_asprintf("%s:%c", opt + 1, *opt);
 +    int ret = parse_option(o, s, arg, options);
 +    av_free(s);
 +    return ret;
  }
  
 -static int opt_subtitle_tag(void *optctx, const char *opt, const char *arg)
 +static int opt_bitrate(void *optctx, const char *opt, const char *arg)
  {
      OptionsContext *o = optctx;
 -    return parse_option(o, "tag:s", arg, options);
 +    if(!strcmp(opt, "b")){
 +        av_log(NULL, AV_LOG_WARNING, "Please use -b:a or -b:v, -b is ambiguous\n");
 +        av_dict_set(&o->g->codec_opts, "b:v", arg, 0);
 +        return 0;
 +    }
 +    av_dict_set(&o->g->codec_opts, opt, arg, 0);
 +    return 0;
 +}
 +
 +static int opt_qscale(void *optctx, const char *opt, const char *arg)
 +{
 +    OptionsContext *o = optctx;
 +    char *s;
 +    int ret;
 +    if(!strcmp(opt, "qscale")){
 +        av_log(NULL, AV_LOG_WARNING, "Please use -q:a or -q:v, -qscale is ambiguous\n");
 +        return parse_option(o, "q:v", arg, options);
 +    }
 +    s = av_asprintf("q%s", opt + 6);
 +    ret = parse_option(o, s, arg, options);
 +    av_free(s);
 +    return ret;
 +}
 +
 +static int opt_profile(void *optctx, const char *opt, const char *arg)
 +{
 +    OptionsContext *o = optctx;
 +    if(!strcmp(opt, "profile")){
 +        av_log(NULL, AV_LOG_WARNING, "Please use -profile:a or -profile:v, -profile is ambiguous\n");
 +        av_dict_set(&o->g->codec_opts, "profile:v", arg, 0);
 +        return 0;
 +    }
 +    av_dict_set(&o->g->codec_opts, opt, arg, 0);
 +    return 0;
  }
  
  static int opt_video_filters(void *optctx, const char *opt, const char *arg)
@@@ -2119,7 -1709,6 +2121,7 @@@ static int opt_vsync(void *optctx, cons
      if      (!av_strcasecmp(arg, "cfr"))         video_sync_method = VSYNC_CFR;
      else if (!av_strcasecmp(arg, "vfr"))         video_sync_method = VSYNC_VFR;
      else if (!av_strcasecmp(arg, "passthrough")) video_sync_method = VSYNC_PASSTHROUGH;
 +    else if (!av_strcasecmp(arg, "drop"))        video_sync_method = VSYNC_DROP;
  
      if (video_sync_method == VSYNC_AUTO)
          video_sync_method = parse_number_or_die("vsync", arg, OPT_INT, VSYNC_AUTO, VSYNC_VFR);
@@@ -2133,14 -1722,14 +2135,14 @@@ static int opt_deinterlace(void *optctx
      return 0;
  }
  
 -int opt_cpuflags(void *optctx, const char *opt, const char *arg)
 +static int opt_timecode(void *optctx, const char *opt, const char *arg)
  {
 -    int flags = av_parse_cpu_flags(arg);
 -
 -    if (flags < 0)
 -        return flags;
 -
 -    av_set_cpu_flags_mask(flags);
 +    OptionsContext *o = optctx;
 +    char *tcr = av_asprintf("timecode=%s", arg);
 +    int ret = parse_option(o, "metadata:g", tcr, options);
 +    if (ret >= 0)
 +        ret = av_dict_set(&o->g->codec_opts, "gop_timecode", arg, 0);
 +    av_free(tcr);
      return 0;
  }
  
@@@ -2159,7 -1748,7 +2161,7 @@@ static int opt_channel_layout(void *opt
          return AVERROR(EINVAL);
      }
      snprintf(layout_str, sizeof(layout_str), "%"PRIu64, layout);
 -    ret = opt_default(NULL, opt, layout_str);
 +    ret = opt_default_new(o, opt, layout_str);
      if (ret < 0)
          return ret;
  
@@@ -2257,16 -1846,14 +2259,16 @@@ void show_help_default(const char *opt
          show_help_children(avcodec_get_class(), flags);
          show_help_children(avformat_get_class(), flags);
          show_help_children(sws_get_class(), flags);
 +        show_help_children(swr_get_class(), AV_OPT_FLAG_AUDIO_PARAM);
 +        show_help_children(avfilter_get_class(), AV_OPT_FLAG_FILTERING_PARAM);
      }
  }
  
  void show_usage(void)
  {
 -    printf("Hyper fast Audio and Video encoder\n");
 -    printf("usage: %s [options] [[infile options] -i infile]... {[outfile options] outfile}...\n", program_name);
 -    printf("\n");
 +    av_log(NULL, AV_LOG_INFO, "Hyper fast Audio and Video encoder\n");
 +    av_log(NULL, AV_LOG_INFO, "usage: %s [options] [[infile options] -i infile]... {[outfile options] outfile}...\n", program_name);
 +    av_log(NULL, AV_LOG_INFO, "\n");
  }
  
  enum OptGroup {
@@@ -2288,7 -1875,7 +2290,7 @@@ static int open_files(OptionGroupList *
          OptionGroup *g = &l->groups[i];
          OptionsContext o;
  
 -        init_options(&o);
 +        init_options(&o, !strcmp(inout, "input"));
          o.g = g;
  
          ret = parse_optgroup(&o, g);
  
          av_log(NULL, AV_LOG_DEBUG, "Opening an %s file: %s.\n", inout, g->arg);
          ret = open_file(&o, g->arg);
 -        uninit_options(&o);
 +        uninit_options(&o, !strcmp(inout, "input"));
          if (ret < 0) {
              av_log(NULL, AV_LOG_ERROR, "Error opening %s file %s.\n",
                     inout, g->arg);
              return ret;
          }
 -        av_log(NULL, AV_LOG_DEBUG, "Successfully openened the file.\n");
 +        av_log(NULL, AV_LOG_DEBUG, "Successfully opened the file.\n");
      }
  
      return 0;
  }
  
 -int avconv_parse_options(int argc, char **argv)
 +int ffmpeg_parse_options(int argc, char **argv)
  {
      OptionParseContext octx;
      uint8_t error[128];
@@@ -2358,23 -1945,6 +2360,23 @@@ fail
      return ret;
  }
  
 +static int opt_progress(void *optctx, const char *opt, const char *arg)
 +{
 +    AVIOContext *avio = NULL;
 +    int ret;
 +
 +    if (!strcmp(arg, "-"))
 +        arg = "pipe:";
 +    ret = avio_open2(&avio, arg, AVIO_FLAG_WRITE, &int_cb, NULL);
 +    if (ret < 0) {
 +        av_log(NULL, AV_LOG_ERROR, "Failed to open progress URL \"%s\": %s\n",
 +               arg, av_err2str(ret));
 +        return ret;
 +    }
 +    progress_avio = avio;
 +    return 0;
 +}
 +
  #define OFFSET(x) offsetof(OptionsContext, x)
  const OptionDef options[] = {
      /* main options */
          "force format", "fmt" },
      { "y",              OPT_BOOL,                                    {              &file_overwrite },
          "overwrite output files" },
 +    { "n",              OPT_BOOL,                                    {              &no_file_overwrite },
 +        "do not overwrite output files" },
      { "c",              HAS_ARG | OPT_STRING | OPT_SPEC,             { .off       = OFFSET(codec_names) },
          "codec name", "codec" },
      { "codec",          HAS_ARG | OPT_STRING | OPT_SPEC,             { .off       = OFFSET(codec_names) },
      { "map",            HAS_ARG | OPT_EXPERT | OPT_PERFILE,          { .func_arg = opt_map },
          "set input stream mapping",
          "[-]input_file_id[:stream_specifier][,sync_file_id[:stream_specifier]]" },
 +    { "map_channel",    HAS_ARG | OPT_EXPERT | OPT_PERFILE,          { .func_arg = opt_map_channel },
 +        "map an audio channel from one stream to another", "file.stream.channel[:syncfile.syncstream]" },
      { "map_metadata",   HAS_ARG | OPT_STRING | OPT_SPEC,             { .off       = OFFSET(metadata_map) },
          "set metadata information of outfile from infile",
          "outfile[,metadata]:infile[,metadata]" },
      { "t",              HAS_ARG | OPT_TIME | OPT_OFFSET,             { .off = OFFSET(recording_time) },
          "record or transcode \"duration\" seconds of audio/video",
          "duration" },
 +    { "to",             HAS_ARG | OPT_TIME | OPT_OFFSET,             { .off = OFFSET(stop_time) },
 +        "record or transcode stop time", "time_stop" },
      { "fs",             HAS_ARG | OPT_INT64 | OPT_OFFSET,            { .off = OFFSET(limit_filesize) },
          "set the limit file size in bytes", "limit_size" },
      { "ss",             HAS_ARG | OPT_TIME | OPT_OFFSET,             { .off = OFFSET(start_time) },
          "set the input ts offset", "time_off" },
      { "itsscale",       HAS_ARG | OPT_DOUBLE | OPT_SPEC | OPT_EXPERT,{ .off = OFFSET(ts_scale) },
          "set the input ts scale", "scale" },
 +    { "timestamp",      HAS_ARG | OPT_PERFILE,                       { .func_arg = opt_recording_timestamp },
 +        "set the recording timestamp ('now' to set the current time)", "time" },
      { "metadata",       HAS_ARG | OPT_STRING | OPT_SPEC,             { .off = OFFSET(metadata) },
          "add metadata", "string=string" },
      { "dframes",        HAS_ARG | OPT_PERFILE | OPT_EXPERT,          { .func_arg = opt_data_frames },
          "set the number of data frames to record", "number" },
      { "benchmark",      OPT_BOOL | OPT_EXPERT,                       { &do_benchmark },
          "add timings for benchmarking" },
 +    { "benchmark_all",  OPT_BOOL | OPT_EXPERT,                       { &do_benchmark_all },
 +      "add timings for each task" },
 +    { "progress",       HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_progress },
 +      "write program-readable progress information", "url" },
 +    { "stdin",          OPT_BOOL | OPT_EXPERT,                       { &stdin_interaction },
 +      "enable or disable interaction on standard input" },
      { "timelimit",      HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_timelimit },
          "set max runtime in seconds", "limit" },
      { "dump",           OPT_BOOL | OPT_EXPERT,                       { &do_pkt_dump },
          "audio drift threshold", "threshold" },
      { "copyts",         OPT_BOOL | OPT_EXPERT,                       { &copy_ts },
          "copy timestamps" },
 -    { "copytb",         OPT_BOOL | OPT_EXPERT,                       { &copy_tb },
 -        "copy input stream time base when stream copying" },
 +    { "copytb",         HAS_ARG | OPT_INT | OPT_EXPERT,              { &copy_tb },
 +        "copy input stream time base when stream copying", "mode" },
      { "shortest",       OPT_BOOL | OPT_EXPERT | OPT_OFFSET,          { .off = OFFSET(shortest) },
          "finish encoding within shortest input" },
      { "dts_delta_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT,       { &dts_delta_threshold },
          "timestamp discontinuity delta threshold", "threshold" },
 +    { "dts_error_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT,       { &dts_error_threshold },
 +        "timestamp error delta threshold", "threshold" },
      { "xerror",         OPT_BOOL | OPT_EXPERT,                       { &exit_on_error },
          "exit on error", "error" },
      { "copyinkf",       OPT_BOOL | OPT_EXPERT | OPT_SPEC,            { .off = OFFSET(copy_initial_nonkeyframes) },
          "copy initial non-keyframes" },
 +    { "copypriorss",    OPT_INT | HAS_ARG | OPT_EXPERT | OPT_SPEC,   { .off = OFFSET(copy_prior_start) },
 +        "copy or discard frames before start time" },
      { "frames",         OPT_INT64 | HAS_ARG | OPT_SPEC,              { .off = OFFSET(max_frames) },
          "set the number of frames to record", "number" },
      { "tag",            OPT_STRING | HAS_ARG | OPT_SPEC | OPT_EXPERT,{ .off = OFFSET(codec_tags) },
          "force codec tag/fourcc", "fourcc/tag" },
      { "q",              HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC,{ .off = OFFSET(qscale) },
          "use fixed quality scale (VBR)", "q" },
 -    { "qscale",         HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC,{ .off = OFFSET(qscale) },
 +    { "qscale",         HAS_ARG | OPT_EXPERT | OPT_PERFILE,          { .func_arg = opt_qscale },
          "use fixed quality scale (VBR)", "q" },
 +    { "profile",        HAS_ARG | OPT_EXPERT | OPT_PERFILE,          { .func_arg = opt_profile },
 +        "set profile", "profile" },
      { "filter",         HAS_ARG | OPT_STRING | OPT_SPEC,             { .off = OFFSET(filters) },
 -        "set stream filterchain", "filter_list" },
 +        "set stream filtergraph", "filter_graph" },
 +    { "reinit_filter",  HAS_ARG | OPT_INT | OPT_SPEC,                { .off = OFFSET(reinit_filters) },
 +        "reinit filtergraph on input parameter changes", "" },
      { "filter_complex", HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_filter_complex },
          "create a complex filtergraph", "graph_description" },
      { "stats",          OPT_BOOL,                                    { &print_stats },
          "add an attachment to the output file", "filename" },
      { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC |OPT_EXPERT,{ .off = OFFSET(dump_attachment) },
          "extract an attachment into a file", "filename" },
 -    { "cpuflags",       HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_cpuflags },
 -        "set CPU flags mask", "mask" },
 +    { "debug_ts",       OPT_BOOL | OPT_EXPERT,                       { &debug_ts },
 +        "print timestamp debugging info" },
  
      /* video options */
      { "vframes",      OPT_VIDEO | HAS_ARG  | OPT_PERFILE,                        { .func_arg = opt_video_frames },
          "set the number of video frames to record", "number" },
      { "r",            OPT_VIDEO | HAS_ARG  | OPT_STRING | OPT_SPEC,              { .off = OFFSET(frame_rates) },
          "set frame rate (Hz value, fraction or abbreviation)", "rate" },
 -    { "s",            OPT_VIDEO | HAS_ARG  | OPT_STRING | OPT_SPEC,              { .off = OFFSET(frame_sizes) },
 +    { "s",            OPT_VIDEO | HAS_ARG | OPT_SUBTITLE | OPT_STRING | OPT_SPEC,{ .off = OFFSET(frame_sizes) },
          "set frame size (WxH or abbreviation)", "size" },
      { "aspect",       OPT_VIDEO | HAS_ARG  | OPT_STRING | OPT_SPEC,              { .off = OFFSET(frame_aspect_ratios) },
          "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" },
      { "pix_fmt",      OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_STRING | OPT_SPEC, { .off = OFFSET(frame_pix_fmts) },
          "set pixel format", "format" },
 +    { "bits_per_raw_sample", OPT_VIDEO | OPT_INT | HAS_ARG,                      { &frame_bits_per_raw_sample },
 +        "set the number of bits per raw sample", "number" },
 +    { "intra",        OPT_VIDEO | OPT_BOOL | OPT_EXPERT,                         { &intra_only },
 +        "deprecated use -g 1" },
      { "vn",           OPT_VIDEO | OPT_BOOL  | OPT_OFFSET,                        { .off = OFFSET(video_disable) },
          "disable video" },
      { "vdt",          OPT_VIDEO | OPT_INT | HAS_ARG | OPT_EXPERT ,               { &video_discard },
          "rate control override for specific intervals", "override" },
      { "vcodec",       OPT_VIDEO | HAS_ARG  | OPT_PERFILE,                        { .func_arg = opt_video_codec },
          "force video codec ('copy' to copy stream)", "codec" },
 +    { "sameq",        OPT_VIDEO | OPT_EXPERT ,                                   { .func_arg = opt_sameq },
 +        "Removed" },
 +    { "same_quant",   OPT_VIDEO | OPT_EXPERT ,                                   { .func_arg = opt_sameq },
 +        "Removed" },
 +    { "timecode",     OPT_VIDEO | HAS_ARG | OPT_PERFILE,                         { .func_arg = opt_timecode },
 +        "set initial TimeCode value.", "hh:mm:ss[:;.]ff" },
      { "pass",         OPT_VIDEO | HAS_ARG | OPT_SPEC | OPT_INT,                  { .off = OFFSET(pass) },
 -        "select the pass number (1 or 2)", "n" },
 +        "select the pass number (1 to 3)", "n" },
      { "passlogfile",  OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC,  { .off = OFFSET(passlogfiles) },
          "select two pass log file name prefix", "prefix" },
      { "deinterlace",  OPT_VIDEO | OPT_EXPERT ,                                   { .func_arg = opt_deinterlace },
          "this option is deprecated, use the yadif filter instead" },
 +    { "psnr",         OPT_VIDEO | OPT_BOOL | OPT_EXPERT,                         { &do_psnr },
 +        "calculate PSNR of compressed frames" },
      { "vstats",       OPT_VIDEO | OPT_EXPERT ,                                   { &opt_vstats },
          "dump video coding statistics to file" },
      { "vstats_file",  OPT_VIDEO | HAS_ARG | OPT_EXPERT ,                         { opt_vstats_file },
          "dump video coding statistics to file", "file" },
      { "vf",           OPT_VIDEO | HAS_ARG  | OPT_PERFILE,                        { .func_arg = opt_video_filters },
 -        "video filters", "filter list" },
 +        "set video filters", "filter_graph" },
      { "intra_matrix", OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_STRING | OPT_SPEC, { .off = OFFSET(intra_matrices) },
          "specify intra matrix coeffs", "matrix" },
      { "inter_matrix", OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_STRING | OPT_SPEC, { .off = OFFSET(inter_matrices) },
          "top=1/bottom=0/auto=-1 field first", "" },
      { "dc",           OPT_VIDEO | OPT_INT | HAS_ARG | OPT_EXPERT ,               { &intra_dc_precision },
          "intra_dc_precision", "precision" },
 -    { "vtag",         OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_PERFILE,           { .func_arg = opt_video_tag },
 +    { "vtag",         OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_PERFILE,           { .func_arg = opt_old2new },
          "force video tag/fourcc", "fourcc/tag" },
      { "qphist",       OPT_VIDEO | OPT_BOOL | OPT_EXPERT ,                        { &qp_hist },
          "show QP histogram" },
      { "streamid",     OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_PERFILE,            { .func_arg = opt_streamid },
          "set the value of an outfile streamid", "streamIndex:value" },
      { "force_key_frames", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT  | OPT_SPEC,
 -        { .off = OFFSET(forced_key_frames) }, "force key frames at specified timestamps", "timestamps" },
 +        { .off = OFFSET(forced_key_frames) },
 +        "force key frames at specified timestamps", "timestamps" },
 +    { "b",            OPT_VIDEO | HAS_ARG | OPT_PERFILE,                         { .func_arg = opt_bitrate },
 +        "video bitrate (please use -b:v)", "bitrate" },
  
      /* audio options */
      { "aframes",        OPT_AUDIO | HAS_ARG  | OPT_PERFILE,                        { .func_arg = opt_audio_frames },
          "disable audio" },
      { "acodec",         OPT_AUDIO | HAS_ARG  | OPT_PERFILE,                        { .func_arg = opt_audio_codec },
          "force audio codec ('copy' to copy stream)", "codec" },
 -    { "atag",           OPT_AUDIO | HAS_ARG  | OPT_EXPERT | OPT_PERFILE,           { .func_arg = opt_audio_tag },
 +    { "atag",           OPT_AUDIO | HAS_ARG  | OPT_EXPERT | OPT_PERFILE,           { .func_arg = opt_old2new },
          "force audio tag/fourcc", "fourcc/tag" },
      { "vol",            OPT_AUDIO | HAS_ARG  | OPT_INT,                            { &audio_volume },
          "change audio volume (256=normal)" , "volume" },
      { "channel_layout", OPT_AUDIO | HAS_ARG  | OPT_EXPERT | OPT_PERFILE,           { .func_arg = opt_channel_layout },
          "set channel layout", "layout" },
      { "af",             OPT_AUDIO | HAS_ARG  | OPT_PERFILE,                        { .func_arg = opt_audio_filters },
 -        "audio filters", "filter list" },
 +        "set audio filters", "filter_graph" },
 +    { "guess_layout_max", OPT_AUDIO | HAS_ARG | OPT_INT | OPT_SPEC | OPT_EXPERT,   { .off = OFFSET(guess_layout_max) },
 +      "set the maximum number of channels to try to guess the channel layout" },
  
      /* subtitle options */
      { "sn",     OPT_SUBTITLE | OPT_BOOL | OPT_OFFSET, { .off = OFFSET(subtitle_disable) },
          "disable subtitle" },
      { "scodec", OPT_SUBTITLE | HAS_ARG  | OPT_PERFILE, { .func_arg = opt_subtitle_codec },
          "force subtitle codec ('copy' to copy stream)", "codec" },
 -    { "stag",   OPT_SUBTITLE | HAS_ARG  | OPT_EXPERT  | OPT_PERFILE, { .func_arg = opt_subtitle_tag }
 +    { "stag",   OPT_SUBTITLE | HAS_ARG  | OPT_EXPERT  | OPT_PERFILE, { .func_arg = opt_old2new }
          , "force subtitle tag/fourcc", "fourcc/tag" },
 +    { "fix_sub_duration", OPT_BOOL | OPT_EXPERT | OPT_SUBTITLE | OPT_SPEC, { .off = OFFSET(fix_sub_duration) },
 +        "fix subtitles duration" },
  
      /* grab options */
 +    { "vc", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { .func_arg = opt_video_channel },
 +        "deprecated, use -channel", "channel" },
 +    { "tvstd", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { .func_arg = opt_video_standard },
 +        "deprecated, use -standard", "standard" },
      { "isync", OPT_BOOL | OPT_EXPERT, { &input_sync }, "this option is deprecated and does nothing", "" },
  
      /* muxer options */
  
      { "bsf", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_EXPERT, { .off = OFFSET(bitstream_filters) },
          "A comma-separated list of bitstream filters", "bitstream_filters" },
 -
 +    { "absf", HAS_ARG | OPT_AUDIO | OPT_EXPERT| OPT_PERFILE, { .func_arg = opt_old2new },
 +        "deprecated", "audio bitstream_filters" },
 +    { "vbsf", OPT_VIDEO | HAS_ARG | OPT_EXPERT| OPT_PERFILE, { .func_arg = opt_old2new },
 +        "deprecated", "video bitstream_filters" },
 +
 +    { "apre", HAS_ARG | OPT_AUDIO | OPT_EXPERT| OPT_PERFILE,    { .func_arg = opt_preset },
 +        "set the audio options to the indicated preset", "preset" },
 +    { "vpre", OPT_VIDEO | HAS_ARG | OPT_EXPERT| OPT_PERFILE,    { .func_arg = opt_preset },
 +        "set the video options to the indicated preset", "preset" },
 +    { "spre", HAS_ARG | OPT_SUBTITLE | OPT_EXPERT| OPT_PERFILE, { .func_arg = opt_preset },
 +        "set the subtitle options to the indicated preset", "preset" },
 +    { "fpre", HAS_ARG | OPT_EXPERT| OPT_PERFILE,                { .func_arg = opt_preset },
 +        "set options from indicated preset file", "filename" },
      /* data codec support */
      { "dcodec", HAS_ARG | OPT_DATA | OPT_PERFILE | OPT_EXPERT, { .func_arg = opt_data_codec },
          "force data codec ('copy' to copy stream)", "codec" },
 +    { "dn", OPT_BOOL | OPT_VIDEO | OPT_OFFSET, { .off = OFFSET(data_disable) },
 +        "disable data" },
  
      { NULL, },
  };