Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jan 2012 01:48:34 +0000 (02:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jan 2012 02:10:30 +0000 (03:10 +0100)
* qatar/master:
  avconv: make -frames work for all types of streams, not just video.
  bfi: K&R cosmetics
  bgmc: K&R cleanup
  rawdec: Set start_time to 0 for raw audio files.
  Detect 'yuv2' as rawvideo also in avi.
  rawdec: propagate pict_type information to the output frame
  rawdec: Support more QT 1bpp rawvideo files.
  avconv: free bitstream filters
  threads: limit the number of automatic threads to MAX_AUTO_THREADS
  avplay: K&R cleanup
  fate: use rgb24 as output format for dfa tests
  threads: set thread_count to 1 when thread support is disabled
  threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264

Conflicts:
ffplay.c
libavcodec/avcodec.h
libavcodec/pthread.c
libavcodec/version.h
tests/ref/fate/dfa1
tests/ref/fate/dfa10
tests/ref/fate/dfa11
tests/ref/fate/dfa2
tests/ref/fate/dfa3
tests/ref/fate/dfa4
tests/ref/fate/dfa5
tests/ref/fate/dfa6
tests/ref/fate/dfa7
tests/ref/fate/dfa8
tests/ref/fate/dfa9

Merged-by: Michael Niedermayer <michaelni@gmx.at>
21 files changed:
1  2 
avconv.c
ffmpeg.c
ffplay.c
libavcodec/avcodec.h
libavcodec/bfi.c
libavcodec/bgmc.c
libavcodec/libx264.c
libavcodec/pthread.c
libavcodec/utils.c
libavcodec/version.h
tests/ref/fate/dfa1
tests/ref/fate/dfa10
tests/ref/fate/dfa11
tests/ref/fate/dfa2
tests/ref/fate/dfa3
tests/ref/fate/dfa4
tests/ref/fate/dfa5
tests/ref/fate/dfa6
tests/ref/fate/dfa7
tests/ref/fate/dfa8
tests/ref/fate/dfa9

diff --cc avconv.c
+++ b/avconv.c
@@@ -1823,17 -1764,9 +1834,16 @@@ static void do_streamcopy(InputStream *
          opkt.data = pkt->data;
          opkt.size = pkt->size;
      }
 +    if (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->st->codec, ost->bitstream_filters);
+     write_frame(of->ctx, &opkt, ost);
      ost->st->codec->frame_number++;
-     ost->frame_number++;
      av_free_packet(&opkt);
  }
  
diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -810,17 -456,17 +810,26 @@@ void av_noreturn exit_program(int ret
          if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
              avio_close(s->pb);
          avformat_free_context(s);
 -        av_free(output_streams_for_file[i]);
 -        av_dict_free(&output_opts[i]);
 +        av_dict_free(&output_files[i].opts);
 +    }
++    for (i = 0; i < nb_output_streams; i++) {
++        AVBitStreamFilterContext *bsfc = output_streams[i].bitstream_filters;
++        while (bsfc) {
++            AVBitStreamFilterContext *next = bsfc->next;
++            av_bitstream_filter_close(bsfc);
++            bsfc = next;
++        }
++        output_streams[i].bitstream_filters = NULL;
+     }
 -    for(i=0;i<nb_input_files;i++) {
 -        av_close_input_file(input_files[i].ctx);
 +    for (i = 0; i < nb_input_files; i++) {
 +        avformat_close_input(&input_files[i].ctx);
      }
 -    for (i = 0; i < nb_input_streams; i++)
 +    for (i = 0; i < nb_input_streams; i++) {
 +        av_freep(&input_streams[i].decoded_frame);
 +        av_freep(&input_streams[i].filtered_frame);
          av_dict_free(&input_streams[i].opts);
 -
 -    av_free(intra_matrix);
 -    av_free(inter_matrix);
 +        free_buffer_pool(&input_streams[i]);
 +    }
  
      if (vstats_file)
          fclose(vstats_file);
@@@ -922,59 -612,129 +931,61 @@@ static void choose_sample_rate(AVStrea
  
  static void choose_pixel_fmt(AVStream *st, AVCodec *codec)
  {
 -    if(codec && codec->pix_fmts){
 -        const enum PixelFormat *p= codec->pix_fmts;
 -        if(st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL){
 -            if(st->codec->codec_id==CODEC_ID_MJPEG){
 -                p= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE};
 -            }else if(st->codec->codec_id==CODEC_ID_LJPEG){
 -                p= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ444P, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_BGRA, PIX_FMT_NONE};
 +    if (codec && codec->pix_fmts) {
 +        const enum PixelFormat *p = codec->pix_fmts;
 +        int has_alpha= av_pix_fmt_descriptors[st->codec->pix_fmt].nb_components % 2 == 0;
 +        enum PixelFormat best= PIX_FMT_NONE;
 +        if (st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) {
 +            if (st->codec->codec_id == CODEC_ID_MJPEG) {
 +                p = (const enum PixelFormat[]) { PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE };
 +            } else if (st->codec->codec_id == CODEC_ID_LJPEG) {
 +                p = (const enum PixelFormat[]) { PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ444P, PIX_FMT_YUV420P,
 +                                                 PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_BGRA, PIX_FMT_NONE };
              }
          }
 -        for(; *p!=-1; p++){
 -            if(*p == st->codec->pix_fmt)
 +        for (; *p != PIX_FMT_NONE; p++) {
 +            best= avcodec_find_best_pix_fmt2(best, *p, st->codec->pix_fmt, has_alpha, NULL);
 +            if (*p == st->codec->pix_fmt)
                  break;
          }
 -        if (*p == -1) {
 -            if(st->codec->pix_fmt != PIX_FMT_NONE)
 +        if (*p == PIX_FMT_NONE) {
 +            if (st->codec->pix_fmt != PIX_FMT_NONE)
                  av_log(NULL, AV_LOG_WARNING,
 -                        "Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n",
 -                        av_pix_fmt_descriptors[st->codec->pix_fmt].name,
 -                        codec->name,
 -                        av_pix_fmt_descriptors[codec->pix_fmts[0]].name);
 -            st->codec->pix_fmt = codec->pix_fmts[0];
 -        }
 -    }
 -}
 -
 -static OutputStream *new_output_stream(AVFormatContext *oc, int file_idx, AVCodec *codec)
 -{
 -    OutputStream *ost;
 -    AVStream *st = av_new_stream(oc, oc->nb_streams < nb_streamid_map ? streamid_map[oc->nb_streams] : 0);
 -    int idx      = oc->nb_streams - 1;
 -
 -    if (!st) {
 -        av_log(NULL, AV_LOG_ERROR, "Could not alloc stream.\n");
 -        exit_program(1);
 -    }
 -
 -    output_streams_for_file[file_idx] =
 -        grow_array(output_streams_for_file[file_idx],
 -                   sizeof(*output_streams_for_file[file_idx]),
 -                   &nb_output_streams_for_file[file_idx],
 -                   oc->nb_streams);
 -    ost = output_streams_for_file[file_idx][idx] =
 -        av_mallocz(sizeof(OutputStream));
 -    if (!ost) {
 -        fprintf(stderr, "Could not alloc output stream\n");
 -        exit_program(1);
 -    }
 -    ost->file_index = file_idx;
 -    ost->index = idx;
 -    ost->st    = st;
 -    ost->enc   = codec;
 -    if (codec)
 -        ost->opts  = filter_codec_opts(codec_opts, codec->id, oc, st);
 -
 -    avcodec_get_context_defaults3(st->codec, codec);
 -
 -    ost->sws_flags = av_get_int(sws_opts, "sws_flags", NULL);
 -    return ost;
 -}
 -
 -static int read_avserver_streams(AVFormatContext *s, const char *filename)
 -{
 -    int i, err;
 -    AVFormatContext *ic = NULL;
 -
 -    err = avformat_open_input(&ic, filename, NULL, NULL);
 -    if (err < 0)
 -        return err;
 -    /* copy stream format */
 -    for(i=0;i<ic->nb_streams;i++) {
 -        AVStream *st;
 -        OutputStream *ost;
 -        AVCodec *codec;
 -
 -        codec = avcodec_find_encoder(ic->streams[i]->codec->codec_id);
 -        ost   = new_output_stream(s, nb_output_files, codec);
 -        st    = ost->st;
 -
 -        // FIXME: a more elegant solution is needed
 -        memcpy(st, ic->streams[i], sizeof(AVStream));
 -        st->info = NULL;
 -        avcodec_copy_context(st->codec, ic->streams[i]->codec);
 -
 -        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
 -            if (audio_stream_copy) {
 -                st->stream_copy = 1;
 -            } else
 -                choose_sample_fmt(st, codec);
 -        } else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 -            if (video_stream_copy) {
 -                st->stream_copy = 1;
 -            } else
 -                choose_pixel_fmt(st, codec);
 +                       "Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n",
 +                       av_pix_fmt_descriptors[st->codec->pix_fmt].name,
 +                       codec->name,
 +                       av_pix_fmt_descriptors[best].name);
 +            st->codec->pix_fmt = best;
          }
      }
 -
 -    av_close_input_file(ic);
 -    return 0;
  }
  
 -static double
 -get_sync_ipts(const OutputStream *ost)
 +static double get_sync_ipts(const OutputStream *ost)
  {
      const InputStream *ist = ost->sync_ist;
 -    return (double)(ist->pts - start_time)/AV_TIME_BASE;
 +    OutputFile *of = &output_files[ost->file_index];
 +    return (double)(ist->pts - of->start_time) / AV_TIME_BASE;
  }
  
- static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx, AVBitStreamFilterContext *bsfc)
 -static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx, AVBitStreamFilterContext *bsfc){
++static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
 +{
++    AVBitStreamFilterContext *bsfc = ost->bitstream_filters;
++    AVCodecContext          *avctx = ost->st->codec;
      int ret;
  
 -    while(bsfc){
 -        AVPacket new_pkt= *pkt;
 -        int a= av_bitstream_filter_filter(bsfc, avctx, NULL,
 -                                          &new_pkt.data, &new_pkt.size,
 -                                          pkt->data, pkt->size,
 -                                          pkt->flags & AV_PKT_FLAG_KEY);
 -        if(a>0){
 +    while (bsfc) {
 +        AVPacket new_pkt = *pkt;
 +        int a = av_bitstream_filter_filter(bsfc, avctx, NULL,
 +                                           &new_pkt.data, &new_pkt.size,
 +                                           pkt->data, pkt->size,
 +                                           pkt->flags & AV_PKT_FLAG_KEY);
 +        if (a > 0) {
              av_free_packet(pkt);
 -            new_pkt.destruct= av_destruct_packet;
 -        } else if(a<0){
 -            fprintf(stderr, "%s failed for stream %d, codec %s",
 -                    bsfc->filter->name, pkt->stream_index,
 -                    avctx->codec ? avctx->codec->name : "copy");
 +            new_pkt.destruct = av_destruct_packet;
 +        } else if (a < 0) {
 +            av_log(NULL, AV_LOG_ERROR, "%s failed for stream %d, codec %s",
 +                   bsfc->filter->name, pkt->stream_index,
 +                   avctx->codec ? avctx->codec->name : "copy");
              print_error("", a);
              if (exit_on_error)
                  exit_program(1);
          print_error("av_interleaved_write_frame()", ret);
          exit_program(1);
      }
++    ost->frame_number++;
  }
  
 -#define MAX_AUDIO_PACKET_SIZE (128 * 1024)
 +static void generate_silence(uint8_t* buf, enum AVSampleFormat sample_fmt, size_t size)
 +{
 +    int fill_char = 0x00;
 +    if (sample_fmt == AV_SAMPLE_FMT_U8)
 +        fill_char = 0x80;
 +    memset(buf, fill_char, size);
 +}
  
 -static void do_audio_out(AVFormatContext *s,
 -                         OutputStream *ost,
 -                         InputStream *ist,
 -                         unsigned char *buf, int size)
 +static void do_audio_out(AVFormatContext *s, OutputStream *ost,
 +                         InputStream *ist, AVFrame *decoded_frame)
  {
      uint8_t *buftmp;
      int64_t audio_out_size, audio_buf_size;
@@@ -1182,13 -952,13 +1194,13 @@@ need_realloc
                  exit_program(1);
              }
              audio_size += ret;
 -            pkt.stream_index= ost->index;
 -            pkt.data= audio_out;
 -            pkt.size= ret;
 -            if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
 -                pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
 +            pkt.stream_index = ost->index;
 +            pkt.data = audio_out;
 +            pkt.size = ret;
 +            if (enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
 +                pkt.pts = av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
              pkt.flags |= AV_PKT_FLAG_KEY;
--            write_frame(s, &pkt, enc, ost->bitstream_filters);
++            write_frame(s, &pkt, ost);
  
              ost->sync_opts += enc->frame_size;
          }
              exit_program(1);
          }
          audio_size += ret;
 -        pkt.stream_index= ost->index;
 -        pkt.data= audio_out;
 -        pkt.size= ret;
 -        if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
 -            pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
 +        pkt.stream_index = ost->index;
 +        pkt.data = audio_out;
 +        pkt.size = ret;
 +        if (enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
 +            pkt.pts = av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
          pkt.flags |= AV_PKT_FLAG_KEY;
--        write_frame(s, &pkt, enc, ost->bitstream_filters);
++        write_frame(s, &pkt, ost);
      }
  }
  
@@@ -1325,7 -1098,7 +1337,7 @@@ static void do_subtitle_out(AVFormatCon
              else
                  pkt.pts += 90 * sub->end_display_time;
          }
--        write_frame(s, &pkt, ost->st->codec, ost->bitstream_filters);
++        write_frame(s, &pkt, ost);
      }
  }
  
@@@ -1384,94 -1191,30 +1396,94 @@@ static void do_video_resample(OutputStr
                  exit_program(1);
              }
          }
 -        sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
 -              0, ost->resample_height, final_picture->data, final_picture->linesize);
 +        sws_scale(ost->img_resample_ctx, in_picture->data, in_picture->linesize,
 +              0, ost->resample_height, (*out_picture)->data, (*out_picture)->linesize);
      }
  #endif
 +}
 +
 +
 +static void do_video_out(AVFormatContext *s,
 +                         OutputStream *ost,
 +                         InputStream *ist,
 +                         AVFrame *in_picture,
 +                         int *frame_size, float quality)
 +{
 +    int nb_frames, i, ret, format_video_sync;
 +    AVFrame *final_picture;
 +    AVCodecContext *enc;
 +    double sync_ipts;
 +    double duration = 0;
 +
 +    enc = ost->st->codec;
 +
 +    if (ist->st->start_time != AV_NOPTS_VALUE && ist->st->first_dts != AV_NOPTS_VALUE) {
 +        duration = FFMAX(av_q2d(ist->st->time_base), av_q2d(ist->st->codec->time_base));
 +        if(ist->st->avg_frame_rate.num)
 +            duration= FFMAX(duration, 1/av_q2d(ist->st->avg_frame_rate));
 +
 +        duration /= av_q2d(enc->time_base);
 +    }
 +
 +    sync_ipts = get_sync_ipts(ost) / av_q2d(enc->time_base);
 +
 +    /* by default, we output a single frame */
 +    nb_frames = 1;
 +
 +    *frame_size = 0;
 +
 +    format_video_sync = video_sync_method;
 +    if (format_video_sync < 0)
 +        format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? ((s->oformat->flags & AVFMT_NOTIMESTAMPS) ? 0 : 2) : 1;
 +
 +    if (format_video_sync) {
 +        double vdelta = sync_ipts - ost->sync_opts + duration;
 +        // FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
 +        if (vdelta < -1.1)
 +            nb_frames = 0;
 +        else if (format_video_sync == 2) {
 +            if (vdelta <= -0.6) {
 +                nb_frames = 0;
 +            } else if (vdelta > 0.6)
 +                ost->sync_opts = lrintf(sync_ipts);
 +        } else if (vdelta > 1.1)
 +            nb_frames = lrintf(vdelta);
 +//fprintf(stderr, "vdelta:%f, ost->sync_opts:%"PRId64", ost->sync_ipts:%f nb_frames:%d\n", vdelta, ost->sync_opts, get_sync_ipts(ost), nb_frames);
 +        if (nb_frames == 0) {
 +            ++nb_frames_drop;
 +            av_log(NULL, AV_LOG_VERBOSE, "*** drop!\n");
 +        } else if (nb_frames > 1) {
 +            nb_frames_dup += nb_frames - 1;
 +            av_log(NULL, AV_LOG_VERBOSE, "*** %d dup!\n", nb_frames - 1);
 +        }
 +    } else
 +        ost->sync_opts = lrintf(sync_ipts);
 +
 +    nb_frames = FFMIN(nb_frames, ost->max_frames - ost->frame_number);
 +    if (nb_frames <= 0)
 +        return;
 +
 +    do_video_resample(ost, ist, in_picture, &final_picture);
  
      /* duplicates frame if needed */
 -    for(i=0;i<nb_frames;i++) {
 +    for (i = 0; i < nb_frames; i++) {
          AVPacket pkt;
          av_init_packet(&pkt);
 -        pkt.stream_index= ost->index;
 +        pkt.stream_index = ost->index;
  
 -        if (s->oformat->flags & AVFMT_RAWPICTURE) {
 +        if (s->oformat->flags & AVFMT_RAWPICTURE &&
 +            enc->codec->id == CODEC_ID_RAWVIDEO) {
              /* raw pictures are written as AVPicture structure to
 -               avoid any copies. We support temorarily the older
 +               avoid any copies. We support temporarily the older
                 method. */
 -            AVFrame* old_frame = enc->coded_frame;
 -            enc->coded_frame = dec->coded_frame; //FIXME/XXX remove this hack
 -            pkt.data= (uint8_t *)final_picture;
 -            pkt.size=  sizeof(AVPicture);
 -            pkt.pts= av_rescale_q(ost->sync_opts, enc->time_base, ost->st->time_base);
 +            enc->coded_frame->interlaced_frame = in_picture->interlaced_frame;
 +            enc->coded_frame->top_field_first  = in_picture->top_field_first;
 +            pkt.data   = (uint8_t *)final_picture;
 +            pkt.size   =  sizeof(AVPicture);
 +            pkt.pts    = av_rescale_q(ost->sync_opts, enc->time_base, ost->st->time_base);
              pkt.flags |= AV_PKT_FLAG_KEY;
  
--            write_frame(s, &pkt, ost->st->codec, ost->bitstream_filters);
 -            enc->coded_frame = old_frame;
++            write_frame(s, &pkt, ost);
          } else {
              AVFrame big_picture;
  
     pkt.pts != AV_NOPTS_VALUE ? av_rescale(pkt.pts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1,
     pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1);*/
  
 -                if(enc->coded_frame->key_frame)
 +                if (enc->coded_frame->key_frame)
                      pkt.flags |= AV_PKT_FLAG_KEY;
--                write_frame(s, &pkt, ost->st->codec, ost->bitstream_filters);
++                write_frame(s, &pkt, ost);
                  *frame_size = ret;
                  video_size += ret;
 -                //fprintf(stderr,"\nFrame: %3d size: %5d type: %d",
 -                //        enc->frame_number-1, ret, enc->pict_type);
 +                // fprintf(stderr,"\nFrame: %3d size: %5d type: %d",
 +                //         enc->frame_number-1, ret, enc->pict_type);
                  /* if two pass, output log */
                  if (ost->logfile && enc->stats_out) {
                      fprintf(ost->logfile, "%s", enc->stats_out);
              }
          }
          ost->sync_opts++;
--        ost->frame_number++;
      }
  }
  
@@@ -1712,645 -1441,629 +1723,644 @@@ static void print_report(OutputFile *ou
      }
  }
  
 -static void generate_silence(uint8_t* buf, enum AVSampleFormat sample_fmt, size_t size)
 -{
 -    int fill_char = 0x00;
 -    if (sample_fmt == AV_SAMPLE_FMT_U8)
 -        fill_char = 0x80;
 -    memset(buf, fill_char, size);
 -}
 -
 -/* pkt = NULL means EOF (needed to flush decoder buffers) */
 -static int output_packet(InputStream *ist, int ist_index,
 -                         OutputStream **ost_table, int nb_ostreams,
 -                         const AVPacket *pkt)
 +static void flush_encoders(OutputStream *ost_table, int nb_ostreams)
  {
 -    AVFormatContext *os;
 -    OutputStream *ost;
 -    int ret, i;
 -    int got_output;
 -    AVFrame picture;
 -    void *buffer_to_free = NULL;
 -    static unsigned int samples_size= 0;
 -    AVSubtitle subtitle, *subtitle_to_free;
 -    int64_t pkt_pts = AV_NOPTS_VALUE;
 -#if CONFIG_AVFILTER
 -    int frame_available;
 -#endif
 -    float quality;
 -
 -    AVPacket avpkt;
 -    int bps = av_get_bytes_per_sample(ist->st->codec->sample_fmt);
 +    int i, ret;
  
 -    if(ist->next_pts == AV_NOPTS_VALUE)
 -        ist->next_pts= ist->pts;
 +    for (i = 0; i < nb_ostreams; i++) {
 +        OutputStream   *ost = &ost_table[i];
 +        AVCodecContext *enc = ost->st->codec;
 +        AVFormatContext *os = output_files[ost->file_index].ctx;
  
 -    if (pkt == NULL) {
 -        /* EOF handling */
 -        av_init_packet(&avpkt);
 -        avpkt.data = NULL;
 -        avpkt.size = 0;
 -        goto handle_eof;
 -    } else {
 -        avpkt = *pkt;
 -    }
 +        if (!ost->encoding_needed)
 +            continue;
  
 -    if(pkt->dts != AV_NOPTS_VALUE)
 -        ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
 -    if(pkt->pts != AV_NOPTS_VALUE)
 -        pkt_pts = av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q);
 +        if (ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO && enc->frame_size <= 1)
 +            continue;
 +        if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE) && enc->codec->id == CODEC_ID_RAWVIDEO)
 +            continue;
  
 -    //while we have more to decode or while the decoder did output something on EOF
 -    while (avpkt.size > 0 || (!pkt && got_output)) {
 -        uint8_t *data_buf, *decoded_data_buf;
 -        int data_size, decoded_data_size;
 -    handle_eof:
 -        ist->pts= ist->next_pts;
 +        for (;;) {
 +            AVPacket pkt;
 +            int fifo_bytes;
 +            av_init_packet(&pkt);
 +            pkt.stream_index = ost->index;
  
 -        if(avpkt.size && avpkt.size != pkt->size &&
 -           ((!ist->showed_multi_packet_warning && verbose>0) || verbose>1)){
 -            fprintf(stderr, "Multiple frames in a packet from stream %d\n", pkt->stream_index);
 -            ist->showed_multi_packet_warning=1;
 -        }
 +            switch (ost->st->codec->codec_type) {
 +            case AVMEDIA_TYPE_AUDIO:
 +                fifo_bytes = av_fifo_size(ost->fifo);
 +                ret = 0;
 +                /* encode any samples remaining in fifo */
 +                if (fifo_bytes > 0) {
 +                    int osize = av_get_bytes_per_sample(enc->sample_fmt);
 +                    int fs_tmp = enc->frame_size;
 +
 +                    av_fifo_generic_read(ost->fifo, audio_buf, fifo_bytes, NULL);
 +                    if (enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
 +                        enc->frame_size = fifo_bytes / (osize * enc->channels);
 +                    } else { /* pad */
 +                        int frame_bytes = enc->frame_size*osize*enc->channels;
 +                        if (allocated_audio_buf_size < frame_bytes)
 +                            exit_program(1);
 +                        generate_silence(audio_buf+fifo_bytes, enc->sample_fmt, frame_bytes - fifo_bytes);
 +                    }
  
 -        /* decode the packet if needed */
 -        decoded_data_buf = NULL; /* fail safe */
 -        decoded_data_size= 0;
 -        data_buf  = avpkt.data;
 -        data_size = avpkt.size;
 -        subtitle_to_free = NULL;
 -        if (ist->decoding_needed) {
 -            switch(ist->st->codec->codec_type) {
 -            case AVMEDIA_TYPE_AUDIO:{
 -                if(pkt && samples_size < FFMAX(pkt->size*sizeof(*samples), AVCODEC_MAX_AUDIO_FRAME_SIZE)) {
 -                    samples_size = FFMAX(pkt->size*sizeof(*samples), AVCODEC_MAX_AUDIO_FRAME_SIZE);
 -                    av_free(samples);
 -                    samples= av_malloc(samples_size);
 +                    ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, (short *)audio_buf);
 +                    pkt.duration = av_rescale((int64_t)enc->frame_size*ost->st->time_base.den,
 +                                              ost->st->time_base.num, enc->sample_rate);
 +                    enc->frame_size = fs_tmp;
                  }
 -                decoded_data_size= samples_size;
 -                    /* XXX: could avoid copy if PCM 16 bits with same
 -                       endianness as CPU */
 -                ret = avcodec_decode_audio3(ist->st->codec, samples, &decoded_data_size,
 -                                            &avpkt);
 -                if (ret < 0)
 -                    return ret;
 -                avpkt.data += ret;
 -                avpkt.size -= ret;
 -                data_size   = ret;
 -                got_output  = decoded_data_size > 0;
 -                /* Some bug in mpeg audio decoder gives */
 -                /* decoded_data_size < 0, it seems they are overflows */
 -                if (!got_output) {
 -                    /* no audio frame */
 -                    continue;
 +                if (ret <= 0) {
 +                    ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL);
                  }
 -                decoded_data_buf = (uint8_t *)samples;
 -                ist->next_pts += ((int64_t)AV_TIME_BASE/bps * decoded_data_size) /
 -                    (ist->st->codec->sample_rate * ist->st->codec->channels);
 -                break;}
 -            case AVMEDIA_TYPE_VIDEO:
 -                    decoded_data_size = (ist->st->codec->width * ist->st->codec->height * 3) / 2;
 -                    /* XXX: allocate picture correctly */
 -                    avcodec_get_frame_defaults(&picture);
 -                    avpkt.pts = pkt_pts;
 -                    avpkt.dts = ist->pts;
 -                    pkt_pts = AV_NOPTS_VALUE;
 -
 -                    ret = avcodec_decode_video2(ist->st->codec,
 -                                                &picture, &got_output, &avpkt);
 -                    quality = same_quality ? picture.quality : 0;
 -                    if (ret < 0)
 -                        return ret;
 -                    if (!got_output) {
 -                        /* no picture yet */
 -                        goto discard_packet;
 -                    }
 -                    ist->next_pts = ist->pts = guess_correct_pts(&ist->pts_ctx, picture.pkt_pts, picture.pkt_dts);
 -                    if (ist->st->codec->time_base.num != 0) {
 -                        int ticks= ist->st->parser ? ist->st->parser->repeat_pict+1 : ist->st->codec->ticks_per_frame;
 -                        ist->next_pts += ((int64_t)AV_TIME_BASE *
 -                                          ist->st->codec->time_base.num * ticks) /
 -                            ist->st->codec->time_base.den;
 -                    }
 -                    avpkt.size = 0;
 -                    buffer_to_free = NULL;
 -                    pre_process_video_frame(ist, (AVPicture *)&picture, &buffer_to_free);
 -                    break;
 -            case AVMEDIA_TYPE_SUBTITLE:
 -                ret = avcodec_decode_subtitle2(ist->st->codec,
 -                                               &subtitle, &got_output, &avpkt);
 -                if (ret < 0)
 -                    return ret;
 -                if (!got_output) {
 -                    goto discard_packet;
 +                if (ret < 0) {
 +                    av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
 +                    exit_program(1);
                  }
 -                subtitle_to_free = &subtitle;
 -                avpkt.size = 0;
 -                break;
 -            default:
 -                return -1;
 -            }
 -        } else {
 -            switch(ist->st->codec->codec_type) {
 -            case AVMEDIA_TYPE_AUDIO:
 -                ist->next_pts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) /
 -                    ist->st->codec->sample_rate;
 +                audio_size += ret;
 +                pkt.flags  |= AV_PKT_FLAG_KEY;
                  break;
              case AVMEDIA_TYPE_VIDEO:
 -                if (ist->st->codec->time_base.num != 0) {
 -                    int ticks= ist->st->parser ? ist->st->parser->repeat_pict+1 : ist->st->codec->ticks_per_frame;
 -                    ist->next_pts += ((int64_t)AV_TIME_BASE *
 -                                      ist->st->codec->time_base.num * ticks) /
 -                        ist->st->codec->time_base.den;
 +                ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL);
 +                if (ret < 0) {
 +                    av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n");
 +                    exit_program(1);
                  }
 -                break;
 -            }
 -            ret = avpkt.size;
 -            avpkt.size = 0;
 -        }
 -
 -#if CONFIG_AVFILTER
 -        if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 -            for (i = 0; i < nb_ostreams; i++) {
 -                ost = ost_table[i];
 -                if (ost->input_video_filter && ost->source_index == ist_index) {
 -                    AVRational sar;
 -                    if (ist->st->sample_aspect_ratio.num)
 -                        sar = ist->st->sample_aspect_ratio;
 -                    else
 -                        sar = ist->st->codec->sample_aspect_ratio;
 -                    // add it to be filtered
 -                    av_vsrc_buffer_add_frame(ost->input_video_filter, &picture,
 -                                             ist->pts,
 -                                             sar);
 +                video_size += ret;
 +                if (enc->coded_frame && enc->coded_frame->key_frame)
 +                    pkt.flags |= AV_PKT_FLAG_KEY;
 +                if (ost->logfile && enc->stats_out) {
 +                    fprintf(ost->logfile, "%s", enc->stats_out);
                  }
 +                break;
 +            default:
 +                ret = -1;
              }
 -        }
 -#endif
  
 -        // preprocess audio (volume)
 -        if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
 -            if (audio_volume != 256) {
 -                short *volp;
 -                volp = samples;
 -                for(i=0;i<(decoded_data_size / sizeof(short));i++) {
 -                    int v = ((*volp) * audio_volume + 128) >> 8;
 -                    if (v < -32768) v = -32768;
 -                    if (v >  32767) v = 32767;
 -                    *volp++ = v;
 -                }
 -            }
 +            if (ret <= 0)
 +                break;
 +            pkt.data = bit_buffer;
 +            pkt.size = ret;
 +            if (enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
 +                pkt.pts = av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
-             write_frame(os, &pkt, ost->st->codec, ost->bitstream_filters);
++            write_frame(os, &pkt, ost);
          }
 +    }
 +}
  
 -        /* frame rate emulation */
 -        if (rate_emu) {
 -            int64_t pts = av_rescale(ist->pts, 1000000, AV_TIME_BASE);
 -            int64_t now = av_gettime() - ist->start;
 -            if (pts > now)
 -                usleep(pts - now);
 -        }
 -        /* if output time reached then transcode raw format,
 -           encode packets and output them */
 -        if (start_time == 0 || ist->pts >= start_time)
 -            for(i=0;i<nb_ostreams;i++) {
 -                int frame_size;
 -
 -                ost = ost_table[i];
 -                if (ost->source_index == ist_index) {
 -#if CONFIG_AVFILTER
 -                frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO ||
 -                    !ost->output_video_filter || avfilter_poll_frame(ost->output_video_filter->inputs[0]);
 -                while (frame_available) {
 -                    AVRational ist_pts_tb;
 -                    if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ost->output_video_filter)
 -                        get_filtered_video_frame(ost->output_video_filter, &picture, &ost->picref, &ist_pts_tb);
 -                    if (ost->picref)
 -                        ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q);
 -#endif
 -                    os = output_files[ost->file_index];
 -
 -                    /* set the input output pts pairs */
 -                    //ost->sync_ipts = (double)(ist->pts + input_files[ist->file_index].ts_offset - start_time)/ AV_TIME_BASE;
 -
 -                    if (ost->encoding_needed) {
 -                        av_assert0(ist->decoding_needed);
 -                        switch(ost->st->codec->codec_type) {
 -                        case AVMEDIA_TYPE_AUDIO:
 -                            do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size);
 -                            break;
 -                        case AVMEDIA_TYPE_VIDEO:
 -#if CONFIG_AVFILTER
 -                            if (ost->picref->video && !ost->frame_aspect_ratio)
 -                                ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect;
 -#endif
 -                            do_video_out(os, ost, ist, &picture, &frame_size,
 -                                         same_quality ? quality : ost->st->codec->global_quality);
 -                            if (vstats_filename && frame_size)
 -                                do_video_stats(os, ost, frame_size);
 -                            break;
 -                        case AVMEDIA_TYPE_SUBTITLE:
 -                            do_subtitle_out(os, ost, ist, &subtitle,
 -                                            pkt->pts);
 -                            break;
 -                        default:
 -                            abort();
 -                        }
 -                    } else {
 -                        AVFrame avframe; //FIXME/XXX remove this
 -                        AVPacket opkt;
 -                        int64_t ost_tb_start_time= av_rescale_q(start_time, AV_TIME_BASE_Q, ost->st->time_base);
 +/*
 + * Check whether a packet from ist should be written into ost at this time
 + */
 +static int check_output_constraints(InputStream *ist, OutputStream *ost)
 +{
 +    OutputFile *of = &output_files[ost->file_index];
 +    int ist_index  = ist - input_streams;
  
 -                        av_init_packet(&opkt);
 +    if (ost->source_index != ist_index)
 +        return 0;
  
 -                        if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) && !copy_initial_nonkeyframes)
 -#if !CONFIG_AVFILTER
 -                            continue;
 -#else
 -                            goto cont;
 -#endif
 +    if (of->start_time && ist->pts < of->start_time)
 +        return 0;
  
 -                        /* no reencoding needed : output the packet directly */
 -                        /* force the input stream PTS */
 +    if (of->recording_time != INT64_MAX &&
 +        av_compare_ts(ist->pts, AV_TIME_BASE_Q, of->recording_time + of->start_time,
 +                      (AVRational){ 1, 1000000 }) >= 0) {
 +        ost->is_past_recording_time = 1;
 +        return 0;
 +    }
  
 -                        avcodec_get_frame_defaults(&avframe);
 -                        ost->st->codec->coded_frame= &avframe;
 -                        avframe.key_frame = pkt->flags & AV_PKT_FLAG_KEY;
 +    return 1;
 +}
  
 -                        if(ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
 -                            audio_size += data_size;
 -                        else if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 -                            video_size += data_size;
 -                            ost->sync_opts++;
 -                        }
 +static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *pkt)
 +{
 +    OutputFile *of = &output_files[ost->file_index];
 +    int64_t ost_tb_start_time = av_rescale_q(of->start_time, AV_TIME_BASE_Q, ost->st->time_base);
 +    AVPicture pict;
 +    AVPacket opkt;
  
 -                        opkt.stream_index= ost->index;
 -                        if(pkt->pts != AV_NOPTS_VALUE)
 -                            opkt.pts= av_rescale_q(pkt->pts, ist->st->time_base, ost->st->time_base) - ost_tb_start_time;
 -                        else
 -                            opkt.pts= AV_NOPTS_VALUE;
 -
 -                        if (pkt->dts == AV_NOPTS_VALUE)
 -                            opkt.dts = av_rescale_q(ist->pts, AV_TIME_BASE_Q, ost->st->time_base);
 -                        else
 -                            opkt.dts = av_rescale_q(pkt->dts, ist->st->time_base, ost->st->time_base);
 -                        opkt.dts -= ost_tb_start_time;
 -
 -                        opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->st->time_base);
 -                        opkt.flags= pkt->flags;
 -
 -                        //FIXME remove the following 2 lines they shall be replaced by the bitstream filters
 -                        if(   ost->st->codec->codec_id != CODEC_ID_H264
 -                           && ost->st->codec->codec_id != CODEC_ID_MPEG1VIDEO
 -                           && ost->st->codec->codec_id != CODEC_ID_MPEG2VIDEO
 -                           ) {
 -                            if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & AV_PKT_FLAG_KEY))
 -                                opkt.destruct= av_destruct_packet;
 -                        } else {
 -                            opkt.data = data_buf;
 -                            opkt.size = data_size;
 -                        }
 +    av_init_packet(&opkt);
  
 -                        write_frame(os, &opkt, ost->st->codec, ost->bitstream_filters);
 -                        ost->st->codec->frame_number++;
 -                        ost->frame_number++;
 -                        av_free_packet(&opkt);
 -                    }
 -#if CONFIG_AVFILTER
 -                    cont:
 -                    frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
 -                                       ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]);
 -                    if (ost->picref)
 -                        avfilter_unref_buffer(ost->picref);
 -                }
 -#endif
 -                }
 -            }
 +    if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) &&
 +        !ost->copy_initial_nonkeyframes)
 +        return;
  
 -        av_free(buffer_to_free);
 -        /* XXX: allocate the subtitles in the codec ? */
 -        if (subtitle_to_free) {
 -            avsubtitle_free(subtitle_to_free);
 -            subtitle_to_free = NULL;
 -        }
 +    /* force the input stream PTS */
 +    if (ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
 +        audio_size += pkt->size;
 +    else if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 +        video_size += pkt->size;
 +        ost->sync_opts++;
      }
 - discard_packet:
 -    if (pkt == NULL) {
 -        /* EOF handling */
  
 -        for(i=0;i<nb_ostreams;i++) {
 -            ost = ost_table[i];
 -            if (ost->source_index == ist_index) {
 -                AVCodecContext *enc= ost->st->codec;
 -                os = output_files[ost->file_index];
 -
 -                if(ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO && enc->frame_size <=1)
 -                    continue;
 -                if(ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE))
 -                    continue;
 -
 -                if (ost->encoding_needed) {
 -                    for(;;) {
 -                        AVPacket pkt;
 -                        int fifo_bytes;
 -                        av_init_packet(&pkt);
 -                        pkt.stream_index= ost->index;
 -
 -                        switch(ost->st->codec->codec_type) {
 -                        case AVMEDIA_TYPE_AUDIO:
 -                            fifo_bytes = av_fifo_size(ost->fifo);
 -                            ret = 0;
 -                            /* encode any samples remaining in fifo */
 -                            if (fifo_bytes > 0) {
 -                                int osize = av_get_bytes_per_sample(enc->sample_fmt);
 -                                int fs_tmp = enc->frame_size;
 -
 -                                av_fifo_generic_read(ost->fifo, audio_buf, fifo_bytes, NULL);
 -                                if (enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
 -                                    enc->frame_size = fifo_bytes / (osize * enc->channels);
 -                                } else { /* pad */
 -                                    int frame_bytes = enc->frame_size*osize*enc->channels;
 -                                    if (allocated_audio_buf_size < frame_bytes)
 -                                        exit_program(1);
 -                                    generate_silence(audio_buf+fifo_bytes, enc->sample_fmt, frame_bytes - fifo_bytes);
 -                                }
 -
 -                                ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, (short *)audio_buf);
 -                                pkt.duration = av_rescale((int64_t)enc->frame_size*ost->st->time_base.den,
 -                                                          ost->st->time_base.num, enc->sample_rate);
 -                                enc->frame_size = fs_tmp;
 -                            }
 -                            if(ret <= 0) {
 -                                ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL);
 -                            }
 -                            if (ret < 0) {
 -                                fprintf(stderr, "Audio encoding failed\n");
 -                                exit_program(1);
 -                            }
 -                            audio_size += ret;
 -                            pkt.flags |= AV_PKT_FLAG_KEY;
 -                            break;
 -                        case AVMEDIA_TYPE_VIDEO:
 -                            ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL);
 -                            if (ret < 0) {
 -                                fprintf(stderr, "Video encoding failed\n");
 -                                exit_program(1);
 -                            }
 -                            video_size += ret;
 -                            if(enc->coded_frame && enc->coded_frame->key_frame)
 -                                pkt.flags |= AV_PKT_FLAG_KEY;
 -                            if (ost->logfile && enc->stats_out) {
 -                                fprintf(ost->logfile, "%s", enc->stats_out);
 -                            }
 -                            break;
 -                        default:
 -                            ret=-1;
 -                        }
 +    opkt.stream_index = ost->index;
 +    if (pkt->pts != AV_NOPTS_VALUE)
 +        opkt.pts = av_rescale_q(pkt->pts, ist->st->time_base, ost->st->time_base) - ost_tb_start_time;
 +    else
 +        opkt.pts = AV_NOPTS_VALUE;
  
 -                        if(ret<=0)
 -                            break;
 -                        pkt.data= bit_buffer;
 -                        pkt.size= ret;
 -                        if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
 -                            pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
 -                        write_frame(os, &pkt, ost->st->codec, ost->bitstream_filters);
 -                    }
 -                }
 -            }
 -        }
 +    if (pkt->dts == AV_NOPTS_VALUE)
 +        opkt.dts = av_rescale_q(ist->pts, AV_TIME_BASE_Q, ost->st->time_base);
 +    else
 +        opkt.dts = av_rescale_q(pkt->dts, ist->st->time_base, ost->st->time_base);
 +    opkt.dts -= ost_tb_start_time;
 +
 +    opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->st->time_base);
 +    opkt.flags    = pkt->flags;
 +
 +    // FIXME remove the following 2 lines they shall be replaced by the bitstream filters
 +    if (  ost->st->codec->codec_id != CODEC_ID_H264
 +       && ost->st->codec->codec_id != CODEC_ID_MPEG1VIDEO
 +       && ost->st->codec->codec_id != CODEC_ID_MPEG2VIDEO
 +       ) {
 +        if (av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, pkt->data, pkt->size, pkt->flags & AV_PKT_FLAG_KEY))
 +            opkt.destruct = av_destruct_packet;
 +    } else {
 +        opkt.data = pkt->data;
 +        opkt.size = pkt->size;
 +    }
 +    if (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->st->codec, ost->bitstream_filters);
 -    return 0;
++    write_frame(of->ctx, &opkt, ost);
 +    ost->st->codec->frame_number++;
-     ost->frame_number++;
 +    av_free_packet(&opkt);
  }
  
 -static void print_sdp(AVFormatContext **avc, int n)
 +static void rate_emu_sleep(InputStream *ist)
  {
 -    char sdp[2048];
 -
 -    av_sdp_create(avc, n, sdp, sizeof(sdp));
 -    printf("SDP:\n%s\n", sdp);
 -    fflush(stdout);
 +    if (input_files[ist->file_index].rate_emu) {
 +        int64_t pts = av_rescale(ist->pts, 1000000, AV_TIME_BASE);
 +        int64_t now = av_gettime() - ist->start;
 +        if (pts > now)
 +            usleep(pts - now);
 +    }
  }
  
 -static int copy_chapters(int infile, int outfile)
 +static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
  {
 -    AVFormatContext *is = input_files[infile].ctx;
 -    AVFormatContext *os = output_files[outfile];
 -    int i;
 +    AVFrame *decoded_frame;
 +    AVCodecContext *avctx = ist->st->codec;
 +    int bps = av_get_bytes_per_sample(ist->st->codec->sample_fmt);
 +    int i, ret;
  
 -    for (i = 0; i < is->nb_chapters; i++) {
 -        AVChapter *in_ch = is->chapters[i], *out_ch;
 -        int64_t ts_off   = av_rescale_q(start_time - input_files[infile].ts_offset,
 -                                      AV_TIME_BASE_Q, in_ch->time_base);
 -        int64_t rt       = (recording_time == INT64_MAX) ? INT64_MAX :
 -                           av_rescale_q(recording_time, AV_TIME_BASE_Q, in_ch->time_base);
 +    if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
 +        return AVERROR(ENOMEM);
 +    else
 +        avcodec_get_frame_defaults(ist->decoded_frame);
 +    decoded_frame = ist->decoded_frame;
  
 +    ret = avcodec_decode_audio4(avctx, decoded_frame, got_output, pkt);
 +    if (ret < 0) {
 +        return ret;
 +    }
  
 -        if (in_ch->end < ts_off)
 -            continue;
 -        if (rt != INT64_MAX && in_ch->start > rt + ts_off)
 -            break;
 +    if (!*got_output) {
 +        /* no audio frame */
 +        return ret;
 +    }
  
 -        out_ch = av_mallocz(sizeof(AVChapter));
 -        if (!out_ch)
 -            return AVERROR(ENOMEM);
 +    /* 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_pts = decoded_frame->pts;
 +
 +    /* increment next_pts 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;
 +
 +    // preprocess audio (volume)
 +    if (audio_volume != 256) {
 +        int decoded_data_size = decoded_frame->nb_samples * avctx->channels * bps;
 +        void *samples = decoded_frame->data[0];
 +        switch (avctx->sample_fmt) {
 +        case AV_SAMPLE_FMT_U8:
 +        {
 +            uint8_t *volp = samples;
 +            for (i = 0; i < (decoded_data_size / sizeof(*volp)); i++) {
 +                int v = (((*volp - 128) * audio_volume + 128) >> 8) + 128;
 +                *volp++ = av_clip_uint8(v);
 +            }
 +            break;
 +        }
 +        case AV_SAMPLE_FMT_S16:
 +        {
 +            int16_t *volp = samples;
 +            for (i = 0; i < (decoded_data_size / sizeof(*volp)); i++) {
 +                int v = ((*volp) * audio_volume + 128) >> 8;
 +                *volp++ = av_clip_int16(v);
 +            }
 +            break;
 +        }
 +        case AV_SAMPLE_FMT_S32:
 +        {
 +            int32_t *volp = samples;
 +            for (i = 0; i < (decoded_data_size / sizeof(*volp)); i++) {
 +                int64_t v = (((int64_t)*volp * audio_volume + 128) >> 8);
 +                *volp++ = av_clipl_int32(v);
 +            }
 +            break;
 +        }
 +        case AV_SAMPLE_FMT_FLT:
 +        {
 +            float *volp = samples;
 +            float scale = audio_volume / 256.f;
 +            for (i = 0; i < (decoded_data_size / sizeof(*volp)); i++) {
 +                *volp++ *= scale;
 +            }
 +            break;
 +        }
 +        case AV_SAMPLE_FMT_DBL:
 +        {
 +            double *volp = samples;
 +            double scale = audio_volume / 256.;
 +            for (i = 0; i < (decoded_data_size / sizeof(*volp)); i++) {
 +                *volp++ *= scale;
 +            }
 +            break;
 +        }
 +        default:
 +            av_log(NULL, AV_LOG_FATAL,
 +                   "Audio volume adjustment on sample format %s is not supported.\n",
 +                   av_get_sample_fmt_name(ist->st->codec->sample_fmt));
 +            exit_program(1);
 +        }
 +    }
  
 -        out_ch->id        = in_ch->id;
 -        out_ch->time_base = in_ch->time_base;
 -        out_ch->start     = FFMAX(0,  in_ch->start - ts_off);
 -        out_ch->end       = FFMIN(rt, in_ch->end   - ts_off);
 +    rate_emu_sleep(ist);
  
 -        if (metadata_chapters_autocopy)
 -            av_dict_copy(&out_ch->metadata, in_ch->metadata, 0);
 +    for (i = 0; i < nb_output_streams; i++) {
 +        OutputStream *ost = &output_streams[i];
  
 -        os->nb_chapters++;
 -        os->chapters = av_realloc(os->chapters, sizeof(AVChapter)*os->nb_chapters);
 -        if (!os->chapters)
 -            return AVERROR(ENOMEM);
 -        os->chapters[os->nb_chapters - 1] = out_ch;
 +        if (!check_output_constraints(ist, ost) || !ost->encoding_needed)
 +            continue;
 +        do_audio_out(output_files[ost->file_index].ctx, ost, ist, decoded_frame);
      }
 -    return 0;
 +
 +    return ret;
  }
  
 -static void parse_forced_key_frames(char *kf, OutputStream *ost,
 -                                    AVCodecContext *avctx)
 +static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_t *pkt_pts, int64_t *pkt_dts)
  {
 -    char *p;
 -    int n = 1, i;
 -    int64_t t;
 +    AVFrame *decoded_frame, *filtered_frame = NULL;
 +    void *buffer_to_free = NULL;
 +    int i, ret = 0;
 +    float quality = 0;
 +#if CONFIG_AVFILTER
 +    int frame_available = 1;
 +#endif
 +    int duration=0;
 +    int64_t *best_effort_timestamp;
 +    AVRational *frame_sample_aspect;
  
 -    for (p = kf; *p; p++)
 -        if (*p == ',')
 -            n++;
 -    ost->forced_kf_count = n;
 -    ost->forced_kf_pts = av_malloc(sizeof(*ost->forced_kf_pts) * n);
 -    if (!ost->forced_kf_pts) {
 -        av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
 -        exit_program(1);
 -    }
 -    for (i = 0; i < n; i++) {
 -        p = i ? strchr(p, ',') + 1 : kf;
 -        t = parse_time_or_die("force_key_frames", p, 1);
 -        ost->forced_kf_pts[i] = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base);
 +    if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
 +        return AVERROR(ENOMEM);
 +    else
 +        avcodec_get_frame_defaults(ist->decoded_frame);
 +    decoded_frame = ist->decoded_frame;
 +    pkt->pts  = *pkt_pts;
 +    pkt->dts  = *pkt_dts;
 +    *pkt_pts  = AV_NOPTS_VALUE;
 +
 +    if (pkt->duration) {
 +        duration = 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;
 +        duration = ((int64_t)AV_TIME_BASE *
 +                          ist->st->codec->time_base.num * ticks) /
 +                          ist->st->codec->time_base.den;
      }
 -}
  
 -/*
 - * The following code is the main loop of the file converter
 - */
 -static int transcode(AVFormatContext **output_files,
 -                     int nb_output_files,
 -                     InputFile *input_files,
 -                     int nb_input_files,
 -                     StreamMap *stream_maps, int nb_stream_maps)
 +    if(*pkt_dts != AV_NOPTS_VALUE && duration) {
 +        *pkt_dts += duration;
 +    }else
 +        *pkt_dts = AV_NOPTS_VALUE;
 +
 +    ret = avcodec_decode_video2(ist->st->codec,
 +                                decoded_frame, got_output, pkt);
 +    if (ret < 0)
 +        return ret;
 +
 +    quality = same_quant ? decoded_frame->quality : 0;
 +    if (!*got_output) {
 +        /* no picture yet */
 +        return ret;
 +    }
 +
 +    best_effort_timestamp= av_opt_ptr(avcodec_get_frame_class(), decoded_frame, "best_effort_timestamp");
 +    if(*best_effort_timestamp != AV_NOPTS_VALUE)
 +        ist->next_pts = ist->pts = *best_effort_timestamp;
 +
 +    ist->next_pts += duration;
 +    pkt->size = 0;
 +
 +    pre_process_video_frame(ist, (AVPicture *)decoded_frame, &buffer_to_free);
 +
 +#if CONFIG_AVFILTER
 +    frame_sample_aspect= av_opt_ptr(avcodec_get_frame_class(), decoded_frame, "sample_aspect_ratio");
 +    for(i=0;i<nb_output_streams;i++) {
 +        OutputStream *ost = ost = &output_streams[i];
 +        if(check_output_constraints(ist, ost)){
 +            if (!frame_sample_aspect->num)
 +                *frame_sample_aspect = ist->st->sample_aspect_ratio;
 +            decoded_frame->pts = ist->pts;
 +            if (ist->dr1 && decoded_frame->type==FF_BUFFER_TYPE_USER) {
 +                FrameBuffer      *buf = decoded_frame->opaque;
 +                AVFilterBufferRef *fb = avfilter_get_video_buffer_ref_from_arrays(
 +                                            decoded_frame->data, decoded_frame->linesize,
 +                                            AV_PERM_READ | AV_PERM_PRESERVE,
 +                                            ist->st->codec->width, ist->st->codec->height,
 +                                            ist->st->codec->pix_fmt);
 +
 +                avfilter_copy_frame_props(fb, decoded_frame);
 +                fb->pts                 = ist->pts;
 +                fb->buf->priv           = buf;
 +                fb->buf->free           = filter_release_buffer;
 +
 +                buf->refcount++;
 +                av_buffersrc_buffer(ost->input_video_filter, fb);
 +            } else
 +            if((av_vsrc_buffer_add_frame(ost->input_video_filter, decoded_frame, AV_VSRC_BUF_FLAG_OVERWRITE)) < 0){
 +                av_log(0, AV_LOG_FATAL, "Failed to inject frame into filter network\n");
 +                exit_program(1);
 +            }
 +        }
 +    }
 +#endif
 +
 +    rate_emu_sleep(ist);
 +
 +    for (i = 0; i < nb_output_streams; i++) {
 +        OutputStream *ost = &output_streams[i];
 +        int frame_size;
 +
 +        if (!check_output_constraints(ist, ost) || !ost->encoding_needed)
 +            continue;
 +
 +#if CONFIG_AVFILTER
 +        if (ost->input_video_filter) {
 +            frame_available = av_buffersink_poll_frame(ost->output_video_filter);
 +        }
 +        while (frame_available) {
 +            if (ost->output_video_filter) {
 +                AVRational ist_pts_tb = ost->output_video_filter->inputs[0]->time_base;
 +                if (av_buffersink_get_buffer_ref(ost->output_video_filter, &ost->picref, 0) < 0){
 +                    av_log(0, AV_LOG_WARNING, "AV Filter told us it has a frame available but failed to output one\n");
 +                    goto cont;
 +                }
 +                if (!ist->filtered_frame && !(ist->filtered_frame = avcodec_alloc_frame())) {
 +                    av_free(buffer_to_free);
 +                    return AVERROR(ENOMEM);
 +                } else
 +                    avcodec_get_frame_defaults(ist->filtered_frame);
 +                filtered_frame = ist->filtered_frame;
 +                *filtered_frame= *decoded_frame; //for me_threshold
 +                if (ost->picref) {
 +                    avfilter_fill_frame_from_video_buffer_ref(filtered_frame, ost->picref);
 +                    ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q);
 +                }
 +            }
 +            if (ost->picref->video && !ost->frame_aspect_ratio)
 +                ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio;
 +#else
 +            filtered_frame = decoded_frame;
 +#endif
 +
 +            do_video_out(output_files[ost->file_index].ctx, ost, ist, filtered_frame, &frame_size,
 +                         same_quant ? quality : ost->st->codec->global_quality);
 +            if (vstats_filename && frame_size)
 +                do_video_stats(output_files[ost->file_index].ctx, ost, frame_size);
 +#if CONFIG_AVFILTER
 +            cont:
 +            frame_available = ost->output_video_filter && av_buffersink_poll_frame(ost->output_video_filter);
 +            avfilter_unref_buffer(ost->picref);
 +        }
 +#endif
 +    }
 +
 +    av_free(buffer_to_free);
 +    return ret;
 +}
 +
 +static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
  {
 -    int ret = 0, i, j, k, n, nb_ostreams = 0;
 -    AVFormatContext *is, *os;
 -    AVCodecContext *codec, *icodec;
 -    OutputStream *ost, **ost_table = NULL;
 -    InputStream *ist;
 -    char error[1024];
 -    int want_sdp = 1;
 -    uint8_t no_packet[MAX_FILES]={0};
 -    int no_packet_count=0;
 +    AVSubtitle subtitle;
 +    int i, ret = avcodec_decode_subtitle2(ist->st->codec,
 +                                          &subtitle, got_output, pkt);
 +    if (ret < 0)
 +        return ret;
 +    if (!*got_output)
 +        return ret;
  
 -    if (rate_emu)
 -        for (i = 0; i < nb_input_streams; i++)
 -            input_streams[i].start = av_gettime();
 +    rate_emu_sleep(ist);
  
 -    /* output stream init */
 -    nb_ostreams = 0;
 -    for(i=0;i<nb_output_files;i++) {
 -        os = output_files[i];
 -        if (!os->nb_streams && !(os->oformat->flags & AVFMT_NOSTREAMS)) {
 -            av_dump_format(output_files[i], i, output_files[i]->filename, 1);
 -            fprintf(stderr, "Output file #%d does not contain any stream\n", i);
 -            ret = AVERROR(EINVAL);
 -            goto fail;
 +    for (i = 0; i < nb_output_streams; i++) {
 +        OutputStream *ost = &output_streams[i];
 +
 +        if (!check_output_constraints(ist, ost) || !ost->encoding_needed)
 +            continue;
 +
 +        do_subtitle_out(output_files[ost->file_index].ctx, ost, ist, &subtitle, pkt->pts);
 +    }
 +
 +    avsubtitle_free(&subtitle);
 +    return ret;
 +}
 +
 +/* pkt = NULL means EOF (needed to flush decoder buffers) */
 +static int output_packet(InputStream *ist,
 +                         OutputStream *ost_table, int nb_ostreams,
 +                         const AVPacket *pkt)
 +{
 +    int ret = 0, i;
 +    int got_output;
 +    int64_t pkt_dts = AV_NOPTS_VALUE;
 +    int64_t pkt_pts = AV_NOPTS_VALUE;
 +
 +    AVPacket avpkt;
 +
 +    if (ist->next_pts == AV_NOPTS_VALUE)
 +        ist->next_pts = ist->pts;
 +
 +    if (pkt == NULL) {
 +        /* EOF handling */
 +        av_init_packet(&avpkt);
 +        avpkt.data = NULL;
 +        avpkt.size = 0;
 +        goto handle_eof;
 +    } else {
 +        avpkt = *pkt;
 +    }
 +
 +    if (pkt->dts != AV_NOPTS_VALUE) {
 +        if (ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || !ist->decoding_needed)
 +            ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
 +        pkt_dts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
 +    }
 +    if(pkt->pts != AV_NOPTS_VALUE)
 +        pkt_pts = av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q);
 +
 +    // while we have more to decode or while the decoder did output something on EOF
 +    while (ist->decoding_needed && (avpkt.size > 0 || (!pkt && got_output))) {
 +    handle_eof:
 +
 +        ist->pts = ist->next_pts;
 +
 +        if (avpkt.size && avpkt.size != pkt->size) {
 +            av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING,
 +                   "Multiple frames in a packet from stream %d\n", pkt->stream_index);
 +            ist->showed_multi_packet_warning = 1;
 +        }
 +
 +        switch (ist->st->codec->codec_type) {
 +        case AVMEDIA_TYPE_AUDIO:
 +            ret = transcode_audio    (ist, &avpkt, &got_output);
 +            break;
 +        case AVMEDIA_TYPE_VIDEO:
 +            ret = transcode_video    (ist, &avpkt, &got_output, &pkt_pts, &pkt_dts);
 +            break;
 +        case AVMEDIA_TYPE_SUBTITLE:
 +            ret = transcode_subtitles(ist, &avpkt, &got_output);
 +            break;
 +        default:
 +            return -1;
 +        }
 +
 +        if (ret < 0)
 +            return ret;
 +
 +        avpkt.dts=
 +        avpkt.pts= AV_NOPTS_VALUE;
 +
 +        // touch data and size only if not EOF
 +        if (pkt) {
 +            if(ist->st->codec->codec_type != AVMEDIA_TYPE_AUDIO)
 +                ret = avpkt.size;
 +            avpkt.data += ret;
 +            avpkt.size -= ret;
 +        }
 +        if (!got_output) {
 +            continue;
          }
 -        nb_ostreams += os->nb_streams;
      }
 -    if (nb_stream_maps > 0 && nb_stream_maps != nb_ostreams) {
 -        fprintf(stderr, "Number of stream maps must match number of output streams\n");
 -        ret = AVERROR(EINVAL);
 -        goto fail;
 +
 +    /* handle stream copy */
 +    if (!ist->decoding_needed) {
 +        rate_emu_sleep(ist);
 +        ist->pts = ist->next_pts;
 +        switch (ist->st->codec->codec_type) {
 +        case AVMEDIA_TYPE_AUDIO:
 +            ist->next_pts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) /
 +                             ist->st->codec->sample_rate;
 +            break;
 +        case AVMEDIA_TYPE_VIDEO:
 +            if (pkt->duration) {
 +                ist->next_pts += 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_pts += ((int64_t)AV_TIME_BASE *
 +                                  ist->st->codec->time_base.num * ticks) /
 +                                  ist->st->codec->time_base.den;
 +            }
 +            break;
 +        }
      }
 +    for (i = 0; pkt && i < nb_ostreams; i++) {
 +        OutputStream *ost = &ost_table[i];
  
 -    /* Sanity check the mapping args -- do the input files & streams exist? */
 -    for(i=0;i<nb_stream_maps;i++) {
 -        int fi = stream_maps[i].file_index;
 -        int si = stream_maps[i].stream_index;
 +        if (!check_output_constraints(ist, ost) || ost->encoding_needed)
 +            continue;
  
 -        if (fi < 0 || fi > nb_input_files - 1 ||
 -            si < 0 || si > input_files[fi].nb_streams - 1) {
 -            fprintf(stderr,"Could not find input stream #%d.%d\n", fi, si);
 -            ret = AVERROR(EINVAL);
 -            goto fail;
 +        do_streamcopy(ist, ost, pkt);
 +    }
 +
 +    return 0;
 +}
 +
 +static void print_sdp(OutputFile *output_files, int n)
 +{
 +    char sdp[2048];
 +    int i;
 +    AVFormatContext **avc = av_malloc(sizeof(*avc) * n);
 +
 +    if (!avc)
 +        exit_program(1);
 +    for (i = 0; i < n; i++)
 +        avc[i] = output_files[i].ctx;
 +
 +    av_sdp_create(avc, n, sdp, sizeof(sdp));
 +    printf("SDP:\n%s\n", sdp);
 +    fflush(stdout);
 +    av_freep(&avc);
 +}
 +
 +static int init_input_stream(int ist_index, OutputStream *output_streams, int nb_output_streams,
 +                             char *error, int error_len)
 +{
 +    InputStream *ist = &input_streams[ist_index];
 +    if (ist->decoding_needed) {
 +        AVCodec *codec = ist->dec;
 +        if (!codec) {
 +            snprintf(error, error_len, "Decoder (codec %s) not found for input stream #%d:%d",
 +                    avcodec_get_name(ist->st->codec->codec_id), ist->file_index, ist->st->index);
 +            return AVERROR(EINVAL);
          }
 -        fi = stream_maps[i].sync_file_index;
 -        si = stream_maps[i].sync_stream_index;
 -        if (fi < 0 || fi > nb_input_files - 1 ||
 -            si < 0 || si > input_files[fi].nb_streams - 1) {
 -            fprintf(stderr,"Could not find sync stream #%d.%d\n", fi, si);
 -            ret = AVERROR(EINVAL);
 -            goto fail;
 +
 +        ist->dr1 = codec->capabilities & CODEC_CAP_DR1;
 +        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;
 +        }
 +
 +        if (avcodec_open2(ist->st->codec, codec, &ist->opts) < 0) {
 +            snprintf(error, error_len, "Error while opening decoder for input stream #%d:%d",
 +                    ist->file_index, ist->st->index);
 +            return AVERROR(EINVAL);
          }
 +        assert_codec_experimental(ist->st->codec, 0);
 +        assert_avoptions(ist->opts);
      }
  
 -    ost_table = av_mallocz(sizeof(OutputStream *) * nb_ostreams);
 -    if (!ost_table)
 -        goto fail;
 -    n = 0;
 -    for(k=0;k<nb_output_files;k++) {
 -        os = output_files[k];
 -        for(i=0;i<os->nb_streams;i++,n++) {
 -            int found;
 -            ost = ost_table[n] = output_streams_for_file[k][i];
 -            if (nb_stream_maps > 0) {
 -                ost->source_index = input_files[stream_maps[n].file_index].ist_index +
 -                    stream_maps[n].stream_index;
 -
 -                /* Sanity check that the stream types match */
 -                if (input_streams[ost->source_index].st->codec->codec_type != ost->st->codec->codec_type) {
 -                    int i= ost->file_index;
 -                    av_dump_format(output_files[i], i, output_files[i]->filename, 1);
 -                    fprintf(stderr, "Codec type mismatch for mapping #%d.%d -> #%d.%d\n",
 -                        stream_maps[n].file_index, stream_maps[n].stream_index,
 -                        ost->file_index, ost->index);
 -                    exit_program(1);
 -                }
 +    ist->pts = ist->st->avg_frame_rate.num ? - ist->st->codec->has_b_frames * AV_TIME_BASE / av_q2d(ist->st->avg_frame_rate) : 0;
 +    ist->next_pts = AV_NOPTS_VALUE;
 +    ist->is_start = 1;
  
 -            } else {
 -                int best_nb_frames=-1;
 -                /* get corresponding input stream index : we select the first one with the right type */
 -                found = 0;
 -                for (j = 0; j < nb_input_streams; j++) {
 -                    int skip=0;
 -                    ist = &input_streams[j];
 -                    if(opt_programid){
 -                        int pi,si;
 -                        AVFormatContext *f = input_files[ist->file_index].ctx;
 -                        skip=1;
 -                        for(pi=0; pi<f->nb_programs; pi++){
 -                            AVProgram *p= f->programs[pi];
 -                            if(p->id == opt_programid)
 -                                for(si=0; si<p->nb_stream_indexes; si++){
 -                                    if(f->streams[ p->stream_index[si] ] == ist->st)
 -                                        skip=0;
 -                                }
 -                        }
 -                    }
 -                    if (ist->discard && ist->st->discard != AVDISCARD_ALL && !skip &&
 -                        ist->st->codec->codec_type == ost->st->codec->codec_type) {
 -                        if(best_nb_frames < ist->st->codec_info_nb_frames){
 -                            best_nb_frames= ist->st->codec_info_nb_frames;
 -                            ost->source_index = j;
 -                            found = 1;
 -                        }
 -                    }
 -                }
 +    return 0;
 +}
  
 -                if (!found) {
 -                    if(! opt_programid) {
 -                        /* try again and reuse existing stream */
 -                        for (j = 0; j < nb_input_streams; j++) {
 -                            ist = &input_streams[j];
 -                            if (   ist->st->codec->codec_type == ost->st->codec->codec_type
 -                                && ist->st->discard != AVDISCARD_ALL) {
 -                                ost->source_index = j;
 -                                found = 1;
 -                            }
 -                        }
 -                    }
 -                    if (!found) {
 -                        int i= ost->file_index;
 -                        av_dump_format(output_files[i], i, output_files[i]->filename, 1);
 -                        fprintf(stderr, "Could not find input stream matching output stream #%d.%d\n",
 -                                ost->file_index, ost->index);
 -                        exit_program(1);
 -                    }
 -                }
 -            }
 -            ist = &input_streams[ost->source_index];
 -            ist->discard = 0;
 -            ost->sync_ist = (nb_stream_maps > 0) ?
 -                &input_streams[input_files[stream_maps[n].sync_file_index].ist_index +
 -                         stream_maps[n].sync_stream_index] : ist;
 +static int transcode_init(OutputFile *output_files, int nb_output_files,
 +                          InputFile  *input_files,  int nb_input_files)
 +{
 +    int ret = 0, i, j, k;
 +    AVFormatContext *oc;
 +    AVCodecContext *codec, *icodec;
 +    OutputStream *ost;
 +    InputStream *ist;
 +    char error[1024];
 +    int want_sdp = 1;
 +
 +    /* init framerate emulation */
 +    for (i = 0; i < nb_input_files; i++) {
 +        InputFile *ifile = &input_files[i];
 +        if (ifile->rate_emu)
 +            for (j = 0; j < ifile->nb_streams; j++)
 +                input_streams[j + ifile->ist_index].start = av_gettime();
 +    }
 +
 +    /* output stream init */
 +    for (i = 0; i < nb_output_files; i++) {
 +        oc = output_files[i].ctx;
 +        if (!oc->nb_streams && !(oc->oformat->flags & AVFMT_NOSTREAMS)) {
 +            av_dump_format(oc, i, oc->filename, 1);
 +            av_log(NULL, AV_LOG_ERROR, "Output file #%d does not contain any stream\n", i);
 +            return AVERROR(EINVAL);
          }
      }
  
diff --cc ffplay.c
index c55b008,0000000..4bb1e05
mode 100644,000000..100644
--- /dev/null
+++ b/ffplay.c
@@@ -1,3229 -1,0 +1,3229 @@@
- #define SAMPLE_ARRAY_SIZE (2*65536)
 +/*
 + * Copyright (c) 2003 Fabrice Bellard
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
 + *
 + * FFmpeg is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with FFmpeg; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 + */
 +
 +/**
 + * @file
 + * simple media player based on the FFmpeg libraries
 + */
 +
 +#include "config.h"
 +#include <inttypes.h>
 +#include <math.h>
 +#include <limits.h>
 +#include "libavutil/avstring.h"
 +#include "libavutil/colorspace.h"
 +#include "libavutil/mathematics.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/imgutils.h"
 +#include "libavutil/dict.h"
 +#include "libavutil/parseutils.h"
 +#include "libavutil/samplefmt.h"
 +#include "libavutil/avassert.h"
 +#include "libavformat/avformat.h"
 +#include "libavdevice/avdevice.h"
 +#include "libswscale/swscale.h"
 +#include "libavcodec/audioconvert.h"
 +#include "libavutil/opt.h"
 +#include "libavcodec/avfft.h"
 +#include "libswresample/swresample.h"
 +
 +#if CONFIG_AVFILTER
 +# include "libavfilter/avcodec.h"
 +# include "libavfilter/avfilter.h"
 +# include "libavfilter/avfiltergraph.h"
 +# include "libavfilter/buffersink.h"
 +#endif
 +
 +#include <SDL.h>
 +#include <SDL_thread.h>
 +
 +#include "cmdutils.h"
 +
 +#include <unistd.h>
 +#include <assert.h>
 +
 +const char program_name[] = "ffplay";
 +const int program_birth_year = 2003;
 +
 +#define MAX_QUEUE_SIZE (15 * 1024 * 1024)
 +#define MIN_AUDIOQ_SIZE (20 * 16 * 1024)
 +#define MIN_FRAMES 5
 +
 +/* SDL audio buffer size, in samples. Should be small to have precise
 +   A/V sync as SDL does not have hardware buffer fullness info. */
 +#define SDL_AUDIO_BUFFER_SIZE 1024
 +
 +/* no AV sync correction is done if below the AV sync threshold */
 +#define AV_SYNC_THRESHOLD 0.01
 +/* no AV correction is done if too big error */
 +#define AV_NOSYNC_THRESHOLD 10.0
 +
 +/* maximum audio speed change to get correct sync */
 +#define SAMPLE_CORRECTION_PERCENT_MAX 10
 +
 +/* we use about AUDIO_DIFF_AVG_NB A-V differences to make the average */
 +#define AUDIO_DIFF_AVG_NB   20
 +
 +/* NOTE: the size must be big enough to compensate the hardware audio buffersize size */
-     double pts;                                  ///<presentation time stamp for this picture
-     double duration;                             ///<expected duration of the frame
-     int64_t pos;                                 ///<byte position in file
++#define SAMPLE_ARRAY_SIZE (2 * 65536)
 +
 +static int sws_flags = SWS_BICUBIC;
 +
 +typedef struct PacketQueue {
 +    AVPacketList *first_pkt, *last_pkt;
 +    int nb_packets;
 +    int size;
 +    int abort_request;
 +    SDL_mutex *mutex;
 +    SDL_cond *cond;
 +} PacketQueue;
 +
 +#define VIDEO_PICTURE_QUEUE_SIZE 2
 +#define SUBPICTURE_QUEUE_SIZE 4
 +
 +typedef struct VideoPicture {
-     double video_clock;                          ///<pts of last decoded frame / predicted pts of next decoded frame
++    double pts;                                  ///< presentation time stamp for this picture
++    double duration;                             ///< expected duration of the frame
++    int64_t pos;                                 ///< byte position in file
 +    int skip;
 +    SDL_Overlay *bmp;
 +    int width, height; /* source height & width */
 +    int allocated;
 +    int reallocate;
 +    enum PixelFormat pix_fmt;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterBufferRef *picref;
 +#endif
 +} VideoPicture;
 +
 +typedef struct SubPicture {
 +    double pts; /* presentation time stamp for this picture */
 +    AVSubtitle sub;
 +} SubPicture;
 +
 +enum {
 +    AV_SYNC_AUDIO_MASTER, /* default choice */
 +    AV_SYNC_VIDEO_MASTER,
 +    AV_SYNC_EXTERNAL_CLOCK, /* synchronize to an external clock */
 +};
 +
 +typedef struct VideoState {
 +    SDL_Thread *read_tid;
 +    SDL_Thread *video_tid;
 +    SDL_Thread *refresh_tid;
 +    AVInputFormat *iformat;
 +    int no_background;
 +    int abort_request;
 +    int paused;
 +    int last_paused;
 +    int seek_req;
 +    int seek_flags;
 +    int64_t seek_pos;
 +    int64_t seek_rel;
 +    int read_pause_return;
 +    AVFormatContext *ic;
 +
 +    int audio_stream;
 +
 +    int av_sync_type;
 +    double external_clock; /* external clock base */
 +    int64_t external_clock_time;
 +
 +    double audio_clock;
 +    double audio_diff_cum; /* used for AV difference average computation */
 +    double audio_diff_avg_coef;
 +    double audio_diff_threshold;
 +    int audio_diff_avg_count;
 +    AVStream *audio_st;
 +    PacketQueue audioq;
 +    int audio_hw_buf_size;
 +    DECLARE_ALIGNED(16,uint8_t,audio_buf2)[AVCODEC_MAX_AUDIO_FRAME_SIZE * 4];
 +    uint8_t silence_buf[SDL_AUDIO_BUFFER_SIZE];
 +    uint8_t *audio_buf;
 +    uint8_t *audio_buf1;
 +    unsigned int audio_buf_size; /* in bytes */
 +    int audio_buf_index; /* in bytes */
 +    int audio_write_buf_size;
 +    AVPacket audio_pkt_temp;
 +    AVPacket audio_pkt;
 +    enum AVSampleFormat audio_src_fmt;
 +    enum AVSampleFormat audio_tgt_fmt;
 +    int audio_src_channels;
 +    int audio_tgt_channels;
 +    int64_t audio_src_channel_layout;
 +    int64_t audio_tgt_channel_layout;
 +    int audio_src_freq;
 +    int audio_tgt_freq;
 +    struct SwrContext *swr_ctx;
 +    double audio_current_pts;
 +    double audio_current_pts_drift;
 +    int frame_drops_early;
 +    int frame_drops_late;
 +    AVFrame *frame;
 +
 +    enum ShowMode {
 +        SHOW_MODE_NONE = -1, SHOW_MODE_VIDEO = 0, SHOW_MODE_WAVES, SHOW_MODE_RDFT, SHOW_MODE_NB
 +    } show_mode;
 +    int16_t sample_array[SAMPLE_ARRAY_SIZE];
 +    int sample_array_index;
 +    int last_i_start;
 +    RDFTContext *rdft;
 +    int rdft_bits;
 +    FFTSample *rdft_data;
 +    int xpos;
 +
 +    SDL_Thread *subtitle_tid;
 +    int subtitle_stream;
 +    int subtitle_stream_changed;
 +    AVStream *subtitle_st;
 +    PacketQueue subtitleq;
 +    SubPicture subpq[SUBPICTURE_QUEUE_SIZE];
 +    int subpq_size, subpq_rindex, subpq_windex;
 +    SDL_mutex *subpq_mutex;
 +    SDL_cond *subpq_cond;
 +
 +    double frame_timer;
 +    double frame_last_pts;
 +    double frame_last_duration;
 +    double frame_last_dropped_pts;
 +    double frame_last_returned_time;
 +    double frame_last_filter_delay;
 +    int64_t frame_last_dropped_pos;
-     double video_current_pts;                    ///<current displayed pts (different from video_clock if frame fifos are used)
-     double video_current_pts_drift;              ///<video_current_pts - time (av_gettime) at which we updated video_current_pts - used to have running video pts
-     int64_t video_current_pos;                   ///<current displayed file pos
++    double video_clock;                          ///< pts of last decoded frame / predicted pts of next decoded frame
 +    int video_stream;
 +    AVStream *video_st;
 +    PacketQueue videoq;
-     AVFilterContext *out_video_filter;          ///<the last filter in the video chain
++    double video_current_pts;                    ///< current displayed pts (different from video_clock if frame fifos are used)
++    double video_current_pts_drift;              ///< video_current_pts - time (av_gettime) at which we updated video_current_pts - used to have running video pts
++    int64_t video_current_pos;                   ///< current displayed file pos
 +    VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE];
 +    int pictq_size, pictq_rindex, pictq_windex;
 +    SDL_mutex *pictq_mutex;
 +    SDL_cond *pictq_cond;
 +#if !CONFIG_AVFILTER
 +    struct SwsContext *img_convert_ctx;
 +#endif
 +
 +    char filename[1024];
 +    int width, height, xleft, ytop;
 +    int step;
 +
 +#if CONFIG_AVFILTER
- static int screen_width = 0;
++    AVFilterContext *out_video_filter;          ///< the last filter in the video chain
 +#endif
 +
 +    int refresh;
 +} VideoState;
 +
 +static int opt_help(const char *opt, const char *arg);
 +
 +/* options specified by the user */
 +static AVInputFormat *file_iformat;
 +static const char *input_filename;
 +static const char *window_title;
 +static int fs_screen_width;
 +static int fs_screen_height;
- static int wanted_stream[AVMEDIA_TYPE_NB]={
-     [AVMEDIA_TYPE_AUDIO]=-1,
-     [AVMEDIA_TYPE_VIDEO]=-1,
-     [AVMEDIA_TYPE_SUBTITLE]=-1,
++static int screen_width  = 0;
 +static int screen_height = 0;
 +static int audio_disable;
 +static int video_disable;
- static int seek_by_bytes=-1;
++static int wanted_stream[AVMEDIA_TYPE_NB] = {
++    [AVMEDIA_TYPE_AUDIO]    = -1,
++    [AVMEDIA_TYPE_VIDEO]    = -1,
++    [AVMEDIA_TYPE_SUBTITLE] = -1,
 +};
- static enum AVDiscard skip_frame= AVDISCARD_DEFAULT;
- static enum AVDiscard skip_idct= AVDISCARD_DEFAULT;
- static enum AVDiscard skip_loop_filter= AVDISCARD_DEFAULT;
++static int seek_by_bytes = -1;
 +static int display_disable;
 +static int show_status = 1;
 +static int av_sync_type = AV_SYNC_AUDIO_MASTER;
 +static int64_t start_time = AV_NOPTS_VALUE;
 +static int64_t duration = AV_NOPTS_VALUE;
 +static int workaround_bugs = 1;
 +static int fast = 0;
 +static int genpts = 0;
 +static int lowres = 0;
 +static int idct = FF_IDCT_AUTO;
- static int decoder_reorder_pts= -1;
++static enum AVDiscard skip_frame       = AVDISCARD_DEFAULT;
++static enum AVDiscard skip_idct        = AVDISCARD_DEFAULT;
++static enum AVDiscard skip_loop_filter = AVDISCARD_DEFAULT;
 +static int error_recognition = FF_ER_CAREFUL;
 +static int error_concealment = 3;
- static int loop=1;
- static int framedrop=-1;
++static int decoder_reorder_pts = -1;
 +static int autoexit;
 +static int exit_on_keydown;
 +static int exit_on_mousedown;
- static int rdftspeed=20;
++static int loop = 1;
++static int framedrop = -1;
 +static enum ShowMode show_mode = SHOW_MODE_NONE;
 +static const char *audio_codec_name;
 +static const char *subtitle_codec_name;
 +static const char *video_codec_name;
-     if (pkt!=&flush_pkt && av_dup_packet(pkt) < 0)
++static int rdftspeed = 20;
 +#if CONFIG_AVFILTER
 +static char *vfilters = NULL;
 +#endif
 +
 +/* current context */
 +static int is_full_screen;
 +static int64_t audio_callback_time;
 +
 +static AVPacket flush_pkt;
 +
 +#define FF_ALLOC_EVENT   (SDL_USEREVENT)
 +#define FF_REFRESH_EVENT (SDL_USEREVENT + 1)
 +#define FF_QUIT_EVENT    (SDL_USEREVENT + 2)
 +
 +static SDL_Surface *screen;
 +
 +void av_noreturn exit_program(int ret)
 +{
 +    exit(ret);
 +}
 +
 +static int packet_queue_put(PacketQueue *q, AVPacket *pkt)
 +{
 +    AVPacketList *pkt1;
 +
 +    /* duplicate the packet */
-     for(pkt = q->first_pkt; pkt != NULL; pkt = pkt1) {
++    if (pkt != &flush_pkt && av_dup_packet(pkt) < 0)
 +        return -1;
 +
 +    pkt1 = av_malloc(sizeof(AVPacketList));
 +    if (!pkt1)
 +        return -1;
 +    pkt1->pkt = *pkt;
 +    pkt1->next = NULL;
 +
 +
 +    SDL_LockMutex(q->mutex);
 +
 +    if (!q->last_pkt)
 +
 +        q->first_pkt = pkt1;
 +    else
 +        q->last_pkt->next = pkt1;
 +    q->last_pkt = pkt1;
 +    q->nb_packets++;
 +    q->size += pkt1->pkt.size + sizeof(*pkt1);
 +    /* XXX: should duplicate packet data in DV case */
 +    SDL_CondSignal(q->cond);
 +
 +    SDL_UnlockMutex(q->mutex);
 +    return 0;
 +}
 +
 +/* packet queue handling */
 +static void packet_queue_init(PacketQueue *q)
 +{
 +    memset(q, 0, sizeof(PacketQueue));
 +    q->mutex = SDL_CreateMutex();
 +    q->cond = SDL_CreateCond();
 +    packet_queue_put(q, &flush_pkt);
 +}
 +
 +static void packet_queue_flush(PacketQueue *q)
 +{
 +    AVPacketList *pkt, *pkt1;
 +
 +    SDL_LockMutex(q->mutex);
-     for(;;) {
++    for (pkt = q->first_pkt; pkt != NULL; pkt = pkt1) {
 +        pkt1 = pkt->next;
 +        av_free_packet(&pkt->pkt);
 +        av_freep(&pkt);
 +    }
 +    q->last_pkt = NULL;
 +    q->first_pkt = NULL;
 +    q->nb_packets = 0;
 +    q->size = 0;
 +    SDL_UnlockMutex(q->mutex);
 +}
 +
 +static void packet_queue_end(PacketQueue *q)
 +{
 +    packet_queue_flush(q);
 +    SDL_DestroyMutex(q->mutex);
 +    SDL_DestroyCond(q->cond);
 +}
 +
 +static void packet_queue_abort(PacketQueue *q)
 +{
 +    SDL_LockMutex(q->mutex);
 +
 +    q->abort_request = 1;
 +
 +    SDL_CondSignal(q->cond);
 +
 +    SDL_UnlockMutex(q->mutex);
 +}
 +
 +/* return < 0 if aborted, 0 if no packet and > 0 if packet.  */
 +static int packet_queue_get(PacketQueue *q, AVPacket *pkt, int block)
 +{
 +    AVPacketList *pkt1;
 +    int ret;
 +
 +    SDL_LockMutex(q->mutex);
 +
-     cb = dst->data[1] + (dsty >> 1) * dst->linesize[1];
-     cr = dst->data[2] + (dsty >> 1) * dst->linesize[2];
++    for (;;) {
 +        if (q->abort_request) {
 +            ret = -1;
 +            break;
 +        }
 +
 +        pkt1 = q->first_pkt;
 +        if (pkt1) {
 +            q->first_pkt = pkt1->next;
 +            if (!q->first_pkt)
 +                q->last_pkt = NULL;
 +            q->nb_packets--;
 +            q->size -= pkt1->pkt.size + sizeof(*pkt1);
 +            *pkt = pkt1->pkt;
 +            av_free(pkt1);
 +            ret = 1;
 +            break;
 +        } else if (!block) {
 +            ret = 0;
 +            break;
 +        } else {
 +            SDL_CondWait(q->cond, q->mutex);
 +        }
 +    }
 +    SDL_UnlockMutex(q->mutex);
 +    return ret;
 +}
 +
 +static inline void fill_rectangle(SDL_Surface *screen,
 +                                  int x, int y, int w, int h, int color)
 +{
 +    SDL_Rect rect;
 +    rect.x = x;
 +    rect.y = y;
 +    rect.w = w;
 +    rect.h = h;
 +    SDL_FillRect(screen, &rect, color);
 +}
 +
 +#define ALPHA_BLEND(a, oldp, newp, s)\
 +((((oldp << s) * (255 - (a))) + (newp * (a))) / (255 << s))
 +
 +#define RGBA_IN(r, g, b, a, s)\
 +{\
 +    unsigned int v = ((const uint32_t *)(s))[0];\
 +    a = (v >> 24) & 0xff;\
 +    r = (v >> 16) & 0xff;\
 +    g = (v >> 8) & 0xff;\
 +    b = v & 0xff;\
 +}
 +
 +#define YUVA_IN(y, u, v, a, s, pal)\
 +{\
 +    unsigned int val = ((const uint32_t *)(pal))[*(const uint8_t*)(s)];\
 +    a = (val >> 24) & 0xff;\
 +    y = (val >> 16) & 0xff;\
 +    u = (val >> 8) & 0xff;\
 +    v = val & 0xff;\
 +}
 +
 +#define YUVA_OUT(d, y, u, v, a)\
 +{\
 +    ((uint32_t *)(d))[0] = (a << 24) | (y << 16) | (u << 8) | v;\
 +}
 +
 +
 +#define BPP 1
 +
 +static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, int imgh)
 +{
 +    int wrap, wrap3, width2, skip2;
 +    int y, u, v, a, u1, v1, a1, w, h;
 +    uint8_t *lum, *cb, *cr;
 +    const uint8_t *p;
 +    const uint32_t *pal;
 +    int dstx, dsty, dstw, dsth;
 +
 +    dstw = av_clip(rect->w, 0, imgw);
 +    dsth = av_clip(rect->h, 0, imgh);
 +    dstx = av_clip(rect->x, 0, imgw - dstw);
 +    dsty = av_clip(rect->y, 0, imgh - dsth);
 +    lum = dst->data[0] + dsty * dst->linesize[0];
-         for(w = dstw - (dstx & 1); w >= 2; w -= 2) {
++    cb  = dst->data[1] + (dsty >> 1) * dst->linesize[1];
++    cr  = dst->data[2] + (dsty >> 1) * dst->linesize[2];
 +
 +    width2 = ((dstw + 1) >> 1) + (dstx & ~dstw & 1);
 +    skip2 = dstx >> 1;
 +    wrap = dst->linesize[0];
 +    wrap3 = rect->pict.linesize[0];
 +    p = rect->pict.data[0];
 +    pal = (const uint32_t *)rect->pict.data[1];  /* Now in YCrCb! */
 +
 +    if (dsty & 1) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            cb++;
 +            cr++;
 +            lum++;
 +            p += BPP;
 +        }
-     for(h = dsth - (dsty & 1); h >= 2; h -= 2) {
++        for (w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += 2 * BPP;
 +            lum += 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            p++;
 +            lum++;
 +        }
 +        p += wrap3 - dstw * BPP;
 +        lum += wrap - dstw - dstx;
 +        cb += dst->linesize[1] - width2 - skip2;
 +        cr += dst->linesize[2] - width2 - skip2;
 +    }
-         for(w = dstw - (dstx & 1); w >= 2; w -= 2) {
++    for (h = dsth - (dsty & 1); h >= 2; h -= 2) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += -wrap3 + BPP;
 +            lum += -wrap + 1;
 +        }
-         for(w = dstw - (dstx & 1); w >= 2; w -= 2) {
++        for (w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 2);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 2);
 +
 +            cb++;
 +            cr++;
 +            p += -wrap3 + 2 * BPP;
 +            lum += -wrap + 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += -wrap3 + BPP;
 +            lum += -wrap + 1;
 +        }
 +        p += wrap3 + (wrap3 - dstw * BPP);
 +        lum += wrap + (wrap - dstw - dstx);
 +        cb += dst->linesize[1] - width2 - skip2;
 +        cr += dst->linesize[2] - width2 - skip2;
 +    }
 +    /* handle odd height */
 +    if (h) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            cb++;
 +            cr++;
 +            lum++;
 +            p += BPP;
 +        }
-     for(rdft_bits=1; (1<<rdft_bits)<2*s->height; rdft_bits++)
++        for (w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v, 1);
 +            cb++;
 +            cr++;
 +            p += 2 * BPP;
 +            lum += 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +        }
 +    }
 +}
 +
 +static void free_subpicture(SubPicture *sp)
 +{
 +    avsubtitle_free(&sp->sub);
 +}
 +
 +static void video_image_display(VideoState *is)
 +{
 +    VideoPicture *vp;
 +    SubPicture *sp;
 +    AVPicture pict;
 +    float aspect_ratio;
 +    int width, height, x, y;
 +    SDL_Rect rect;
 +    int i;
 +
 +    vp = &is->pictq[is->pictq_rindex];
 +    if (vp->bmp) {
 +#if CONFIG_AVFILTER
 +         if (vp->picref->video->sample_aspect_ratio.num == 0)
 +             aspect_ratio = 0;
 +         else
 +             aspect_ratio = av_q2d(vp->picref->video->sample_aspect_ratio);
 +#else
 +
 +        /* XXX: use variable in the frame */
 +        if (is->video_st->sample_aspect_ratio.num)
 +            aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio);
 +        else if (is->video_st->codec->sample_aspect_ratio.num)
 +            aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio);
 +        else
 +            aspect_ratio = 0;
 +#endif
 +        if (aspect_ratio <= 0.0)
 +            aspect_ratio = 1.0;
 +        aspect_ratio *= (float)vp->width / (float)vp->height;
 +
 +        if (is->subtitle_st) {
 +            if (is->subpq_size > 0) {
 +                sp = &is->subpq[is->subpq_rindex];
 +
 +                if (vp->pts >= sp->pts + ((float) sp->sub.start_display_time / 1000)) {
 +                    SDL_LockYUVOverlay (vp->bmp);
 +
 +                    pict.data[0] = vp->bmp->pixels[0];
 +                    pict.data[1] = vp->bmp->pixels[2];
 +                    pict.data[2] = vp->bmp->pixels[1];
 +
 +                    pict.linesize[0] = vp->bmp->pitches[0];
 +                    pict.linesize[1] = vp->bmp->pitches[2];
 +                    pict.linesize[2] = vp->bmp->pitches[1];
 +
 +                    for (i = 0; i < sp->sub.num_rects; i++)
 +                        blend_subrect(&pict, sp->sub.rects[i],
 +                                      vp->bmp->w, vp->bmp->h);
 +
 +                    SDL_UnlockYUVOverlay (vp->bmp);
 +                }
 +            }
 +        }
 +
 +
 +        /* XXX: we suppose the screen has a 1.0 pixel ratio */
 +        height = is->height;
 +        width = ((int)rint(height * aspect_ratio)) & ~1;
 +        if (width > is->width) {
 +            width = is->width;
 +            height = ((int)rint(width / aspect_ratio)) & ~1;
 +        }
 +        x = (is->width - width) / 2;
 +        y = (is->height - height) / 2;
 +        is->no_background = 0;
 +        rect.x = is->xleft + x;
 +        rect.y = is->ytop  + y;
 +        rect.w = FFMAX(width,  1);
 +        rect.h = FFMAX(height, 1);
 +        SDL_DisplayYUVOverlay(vp->bmp, &rect);
 +    }
 +}
 +
 +static inline int compute_mod(int a, int b)
 +{
 +    return a < 0 ? a%b + b : a%b;
 +}
 +
 +static void video_audio_display(VideoState *s)
 +{
 +    int i, i_start, x, y1, y, ys, delay, n, nb_display_channels;
 +    int ch, channels, h, h2, bgcolor, fgcolor;
 +    int16_t time_diff;
 +    int rdft_bits, nb_freq;
 +
-     nb_freq= 1<<(rdft_bits-1);
++    for (rdft_bits = 1; (1 << rdft_bits) < 2 * s->height; rdft_bits++)
 +        ;
-         delay += 2*data_used;
++    nb_freq = 1 << (rdft_bits - 1);
 +
 +    /* compute display index : center on currently output samples */
 +    channels = s->audio_tgt_channels;
 +    nb_display_channels = channels;
 +    if (!s->paused) {
 +        int data_used= s->show_mode == SHOW_MODE_WAVES ? s->width : (2*nb_freq);
 +        n = 2 * channels;
 +        delay = s->audio_write_buf_size;
 +        delay /= n;
 +
 +        /* to be more precise, we take into account the time spent since
 +           the last buffer computation */
 +        if (audio_callback_time) {
 +            time_diff = av_gettime() - audio_callback_time;
 +            delay -= (time_diff * s->audio_tgt_freq) / 1000000;
 +        }
 +
-             h= INT_MIN;
-             for(i=0; i<1000; i+=channels){
-                 int idx= (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE;
-                 int a= s->sample_array[idx];
-                 int b= s->sample_array[(idx + 4*channels)%SAMPLE_ARRAY_SIZE];
-                 int c= s->sample_array[(idx + 5*channels)%SAMPLE_ARRAY_SIZE];
-                 int d= s->sample_array[(idx + 9*channels)%SAMPLE_ARRAY_SIZE];
-                 int score= a-d;
-                 if(h<score && (b^c)<0){
-                     h= score;
-                     i_start= idx;
++        delay += 2 * data_used;
 +        if (delay < data_used)
 +            delay = data_used;
 +
 +        i_start= x = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE);
 +        if (s->show_mode == SHOW_MODE_WAVES) {
-         for(ch = 0;ch < nb_display_channels; ch++) {
++            h = INT_MIN;
++            for (i = 0; i < 1000; i += channels) {
++                int idx = (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE;
++                int a = s->sample_array[idx];
++                int b = s->sample_array[(idx + 4 * channels) % SAMPLE_ARRAY_SIZE];
++                int c = s->sample_array[(idx + 5 * channels) % SAMPLE_ARRAY_SIZE];
++                int d = s->sample_array[(idx + 9 * channels) % SAMPLE_ARRAY_SIZE];
++                int score = a - d;
++                if (h < score && (b ^ c) < 0) {
++                    h = score;
++                    i_start = idx;
 +                }
 +            }
 +        }
 +
 +        s->last_i_start = i_start;
 +    } else {
 +        i_start = s->last_i_start;
 +    }
 +
 +    bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +    if (s->show_mode == SHOW_MODE_WAVES) {
 +        fill_rectangle(screen,
 +                       s->xleft, s->ytop, s->width, s->height,
 +                       bgcolor);
 +
 +        fgcolor = SDL_MapRGB(screen->format, 0xff, 0xff, 0xff);
 +
 +        /* total height for one channel */
 +        h = s->height / nb_display_channels;
 +        /* graph height / 2 */
 +        h2 = (h * 9) / 20;
-             for(x = 0; x < s->width; x++) {
++        for (ch = 0; ch < nb_display_channels; ch++) {
 +            i = i_start + ch;
 +            y1 = s->ytop + ch * h + (h / 2); /* position of center line */
-         for(ch = 1;ch < nb_display_channels; ch++) {
++            for (x = 0; x < s->width; x++) {
 +                y = (s->sample_array[i] * h2) >> 15;
 +                if (y < 0) {
 +                    y = -y;
 +                    ys = y1 - y;
 +                } else {
 +                    ys = y1;
 +                }
 +                fill_rectangle(screen,
 +                               s->xleft + x, ys, 1, y,
 +                               fgcolor);
 +                i += channels;
 +                if (i >= SAMPLE_ARRAY_SIZE)
 +                    i -= SAMPLE_ARRAY_SIZE;
 +            }
 +        }
 +
 +        fgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0xff);
 +
-     }else{
++        for (ch = 1; ch < nb_display_channels; ch++) {
 +            y = s->ytop + ch * h;
 +            fill_rectangle(screen,
 +                           s->xleft, y, s->width, 1,
 +                           fgcolor);
 +        }
 +        SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height);
-         if(rdft_bits != s->rdft_bits){
++    } else {
 +        nb_display_channels= FFMIN(nb_display_channels, 2);
-             s->rdft_bits= rdft_bits;
-             s->rdft_data= av_malloc(4*nb_freq*sizeof(*s->rdft_data));
++        if (rdft_bits != s->rdft_bits) {
 +            av_rdft_end(s->rdft);
 +            av_free(s->rdft_data);
 +            s->rdft = av_rdft_init(rdft_bits, DFT_R2C);
-             for(ch = 0;ch < nb_display_channels; ch++) {
-                 data[ch] = s->rdft_data + 2*nb_freq*ch;
++            s->rdft_bits = rdft_bits;
++            s->rdft_data = av_malloc(4 * nb_freq * sizeof(*s->rdft_data));
 +        }
 +        {
 +            FFTSample *data[2];
-                 for(x = 0; x < 2*nb_freq; x++) {
-                     double w= (x-nb_freq)*(1.0/nb_freq);
-                     data[ch][x]= s->sample_array[i]*(1.0-w*w);
++            for (ch = 0; ch < nb_display_channels; ch++) {
++                data[ch] = s->rdft_data + 2 * nb_freq * ch;
 +                i = i_start + ch;
-             //least efficient way to do this, we should of course directly access it but its more than fast enough
-             for(y=0; y<s->height; y++){
-                 double w= 1/sqrt(nb_freq);
-                 int a= sqrt(w*sqrt(data[0][2*y+0]*data[0][2*y+0] + data[0][2*y+1]*data[0][2*y+1]));
-                 int b= (nb_display_channels == 2 ) ? sqrt(w*sqrt(data[1][2*y+0]*data[1][2*y+0]
-                        + data[1][2*y+1]*data[1][2*y+1])) : a;
-                 a= FFMIN(a,255);
-                 b= FFMIN(b,255);
-                 fgcolor = SDL_MapRGB(screen->format, a, b, (a+b)/2);
++                for (x = 0; x < 2 * nb_freq; x++) {
++                    double w = (x-nb_freq) * (1.0 / nb_freq);
++                    data[ch][x] = s->sample_array[i] * (1.0 - w * w);
 +                    i += channels;
 +                    if (i >= SAMPLE_ARRAY_SIZE)
 +                        i -= SAMPLE_ARRAY_SIZE;
 +                }
 +                av_rdft_calc(s->rdft, data[ch]);
 +            }
-         if(s->xpos >= s->width)
++            // least efficient way to do this, we should of course directly access it but its more than fast enough
++            for (y = 0; y < s->height; y++) {
++                double w = 1 / sqrt(nb_freq);
++                int a = sqrt(w * sqrt(data[0][2 * y + 0] * data[0][2 * y + 0] + data[0][2 * y + 1] * data[0][2 * y + 1]));
++                int b = (nb_display_channels == 2 ) ? sqrt(w * sqrt(data[1][2 * y + 0] * data[1][2 * y + 0]
++                       + data[1][2 * y + 1] * data[1][2 * y + 1])) : a;
++                a = FFMIN(a, 255);
++                b = FFMIN(b, 255);
++                fgcolor = SDL_MapRGB(screen->format, a, b, (a + b) / 2);
 +
 +                fill_rectangle(screen,
 +                            s->xpos, s->height-y, 1, 1,
 +                            fgcolor);
 +            }
 +        }
 +        SDL_UpdateRect(screen, s->xpos, s->ytop, 1, s->height);
 +        s->xpos++;
-     for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
++        if (s->xpos >= s->width)
 +            s->xpos= s->xleft;
 +    }
 +}
 +
 +static void stream_close(VideoState *is)
 +{
 +    VideoPicture *vp;
 +    int i;
 +    /* XXX: use a special url_shutdown call to abort parse cleanly */
 +    is->abort_request = 1;
 +    SDL_WaitThread(is->read_tid, NULL);
 +    SDL_WaitThread(is->refresh_tid, NULL);
 +
 +    /* free all pictures */
- static int video_open(VideoState *is, int force_set_video_mode){
-     int flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL;
++    for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +        vp = &is->pictq[i];
 +#if CONFIG_AVFILTER
 +        if (vp->picref) {
 +            avfilter_unref_buffer(vp->picref);
 +            vp->picref = NULL;
 +        }
 +#endif
 +        if (vp->bmp) {
 +            SDL_FreeYUVOverlay(vp->bmp);
 +            vp->bmp = NULL;
 +        }
 +    }
 +    SDL_DestroyMutex(is->pictq_mutex);
 +    SDL_DestroyCond(is->pictq_cond);
 +    SDL_DestroyMutex(is->subpq_mutex);
 +    SDL_DestroyCond(is->subpq_cond);
 +#if !CONFIG_AVFILTER
 +    if (is->img_convert_ctx)
 +        sws_freeContext(is->img_convert_ctx);
 +#endif
 +    av_free(is);
 +}
 +
 +static void do_exit(VideoState *is)
 +{
 +    if (is) {
 +        stream_close(is);
 +    }
 +    av_lockmgr_register(NULL);
 +    uninit_opts();
 +#if CONFIG_AVFILTER
 +    avfilter_uninit();
 +#endif
 +    avformat_network_deinit();
 +    if (show_status)
 +        printf("\n");
 +    SDL_Quit();
 +    av_log(NULL, AV_LOG_QUIET, "%s", "");
 +    exit(0);
 +}
 +
-     if(is_full_screen) flags |= SDL_FULLSCREEN;
-     else               flags |= SDL_RESIZABLE;
++static int video_open(VideoState *is, int force_set_video_mode)
++{
++    int flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL;
 +    int w,h;
 +
-     } else if(!is_full_screen && screen_width){
++    if (is_full_screen) flags |= SDL_FULLSCREEN;
++    else                flags |= SDL_RESIZABLE;
 +
 +    if (is_full_screen && fs_screen_width) {
 +        w = fs_screen_width;
 +        h = fs_screen_height;
-     }else if (is->out_video_filter && is->out_video_filter->inputs[0]){
++    } else if (!is_full_screen && screen_width) {
 +        w = screen_width;
 +        h = screen_height;
 +#if CONFIG_AVFILTER
-     }else if (is->video_st && is->video_st->codec->width){
++    } else if (is->out_video_filter && is->out_video_filter->inputs[0]) {
 +        w = is->out_video_filter->inputs[0]->w;
 +        h = is->out_video_filter->inputs[0]->h;
 +#else
-     if(screen && is->width == screen->w && screen->w == w
++    } else if (is->video_st && is->video_st->codec->width) {
 +        w = is->video_st->codec->width;
 +        h = is->video_st->codec->height;
 +#endif
 +    } else {
 +        w = 640;
 +        h = 480;
 +    }
-     is->width = screen->w;
++    if (screen && is->width == screen->w && screen->w == w
 +       && is->height== screen->h && screen->h == h && !force_set_video_mode)
 +        return 0;
 +    screen = SDL_SetVideoMode(w, h, 0, flags);
 +    if (!screen) {
 +        fprintf(stderr, "SDL: could not set video mode - exiting\n");
 +        do_exit(is);
 +    }
 +    if (!window_title)
 +        window_title = input_filename;
 +    SDL_WM_SetCaption(window_title, window_title);
 +
-     if(!screen)
++    is->width  = screen->w;
 +    is->height = screen->h;
 +
 +    return 0;
 +}
 +
 +/* display the current picture, if any */
 +static void video_display(VideoState *is)
 +{
-     while(!is->abort_request){
++    if (!screen)
 +        video_open(is, 0);
 +    if (is->audio_st && is->show_mode != SHOW_MODE_VIDEO)
 +        video_audio_display(is);
 +    else if (is->video_st)
 +        video_image_display(is);
 +}
 +
 +static int refresh_thread(void *opaque)
 +{
 +    VideoState *is= opaque;
-         if(!is->refresh){
-             is->refresh=1;
++    while (!is->abort_request) {
 +        SDL_Event event;
 +        event.type = FF_REFRESH_EVENT;
 +        event.user.data1 = opaque;
-         if(is->read_pause_return != AVERROR(ENOSYS)){
++        if (!is->refresh) {
++            is->refresh = 1;
 +            SDL_PushEvent(&event);
 +        }
 +        //FIXME ideally we should wait the correct time but SDLs event passing is so slow it would be silly
 +        usleep(is->audio_st && is->show_mode != SHOW_MODE_VIDEO ? rdftspeed*1000 : 5000);
 +    }
 +    return 0;
 +}
 +
 +/* get the current audio clock value */
 +static double get_audio_clock(VideoState *is)
 +{
 +    if (is->paused) {
 +        return is->audio_current_pts;
 +    } else {
 +        return is->audio_current_pts_drift + av_gettime() / 1000000.0;
 +    }
 +}
 +
 +/* get the current video clock value */
 +static double get_video_clock(VideoState *is)
 +{
 +    if (is->paused) {
 +        return is->video_current_pts;
 +    } else {
 +        return is->video_current_pts_drift + av_gettime() / 1000000.0;
 +    }
 +}
 +
 +/* get the current external clock value */
 +static double get_external_clock(VideoState *is)
 +{
 +    int64_t ti;
 +    ti = av_gettime();
 +    return is->external_clock + ((ti - is->external_clock_time) * 1e-6);
 +}
 +
 +/* get the current master clock value */
 +static double get_master_clock(VideoState *is)
 +{
 +    double val;
 +
 +    if (is->av_sync_type == AV_SYNC_VIDEO_MASTER) {
 +        if (is->video_st)
 +            val = get_video_clock(is);
 +        else
 +            val = get_audio_clock(is);
 +    } else if (is->av_sync_type == AV_SYNC_AUDIO_MASTER) {
 +        if (is->audio_st)
 +            val = get_audio_clock(is);
 +        else
 +            val = get_video_clock(is);
 +    } else {
 +        val = get_external_clock(is);
 +    }
 +    return val;
 +}
 +
 +/* seek in the stream */
 +static void stream_seek(VideoState *is, int64_t pos, int64_t rel, int seek_by_bytes)
 +{
 +    if (!is->seek_req) {
 +        is->seek_pos = pos;
 +        is->seek_rel = rel;
 +        is->seek_flags &= ~AVSEEK_FLAG_BYTE;
 +        if (seek_by_bytes)
 +            is->seek_flags |= AVSEEK_FLAG_BYTE;
 +        is->seek_req = 1;
 +    }
 +}
 +
 +/* pause or resume the video */
 +static void stream_toggle_pause(VideoState *is)
 +{
 +    if (is->paused) {
 +        is->frame_timer += av_gettime() / 1000000.0 + is->video_current_pts_drift - is->video_current_pts;
-             //nothing to do, no picture to display in the que
++        if (is->read_pause_return != AVERROR(ENOSYS)) {
 +            is->video_current_pts = is->video_current_pts_drift + av_gettime() / 1000000.0;
 +        }
 +        is->video_current_pts_drift = is->video_current_pts - av_gettime() / 1000000.0;
 +    }
 +    is->paused = !is->paused;
 +}
 +
 +static double compute_target_delay(double delay, VideoState *is)
 +{
 +    double sync_threshold, diff;
 +
 +    /* update delay to follow master synchronisation source */
 +    if (((is->av_sync_type == AV_SYNC_AUDIO_MASTER && is->audio_st) ||
 +         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
 +        /* if video is slave, we try to correct big delays by
 +           duplicating or deleting a frame */
 +        diff = get_video_clock(is) - get_master_clock(is);
 +
 +        /* skip or repeat frame. We take into account the
 +           delay to compute the threshold. I still don't know
 +           if it is the best guess */
 +        sync_threshold = FFMAX(AV_SYNC_THRESHOLD, delay);
 +        if (fabs(diff) < AV_NOSYNC_THRESHOLD) {
 +            if (diff <= -sync_threshold)
 +                delay = 0;
 +            else if (diff >= sync_threshold)
 +                delay = 2 * delay;
 +        }
 +    }
 +
 +    av_dlog(NULL, "video: delay=%0.3f A-V=%f\n",
 +            delay, -diff);
 +
 +    return delay;
 +}
 +
 +static void pictq_next_picture(VideoState *is) {
 +    /* update queue size and signal for next picture */
 +    if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE)
 +        is->pictq_rindex = 0;
 +
 +    SDL_LockMutex(is->pictq_mutex);
 +    is->pictq_size--;
 +    SDL_CondSignal(is->pictq_cond);
 +    SDL_UnlockMutex(is->pictq_mutex);
 +}
 +
 +static void update_video_pts(VideoState *is, double pts, int64_t pos) {
 +    double time = av_gettime() / 1000000.0;
 +    /* update current video pts */
 +    is->video_current_pts = pts;
 +    is->video_current_pts_drift = is->video_current_pts - time;
 +    is->video_current_pos = pos;
 +    is->frame_last_pts = pts;
 +}
 +
 +/* called to display each frame */
 +static void video_refresh(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +    double time;
 +
 +    SubPicture *sp, *sp2;
 +
 +    if (is->video_st) {
 +retry:
 +        if (is->pictq_size == 0) {
 +            SDL_LockMutex(is->pictq_mutex);
 +            if (is->frame_last_dropped_pts != AV_NOPTS_VALUE && is->frame_last_dropped_pts > is->frame_last_pts) {
 +                update_video_pts(is, is->frame_last_dropped_pts, is->frame_last_dropped_pos);
 +                is->frame_last_dropped_pts = AV_NOPTS_VALUE;
 +            }
 +            SDL_UnlockMutex(is->pictq_mutex);
-             if(time < is->frame_timer + delay)
++            // nothing to do, no picture to display in the que
 +        } else {
 +            double last_duration, duration, delay;
 +            /* dequeue the picture */
 +            vp = &is->pictq[is->pictq_rindex];
 +
 +            if (vp->skip) {
 +                pictq_next_picture(is);
 +                goto retry;
 +            }
 +
 +            /* compute nominal last_duration */
 +            last_duration = vp->pts - is->frame_last_pts;
 +            if (last_duration > 0 && last_duration < 10.0) {
 +                /* if duration of the last frame was sane, update last_duration in video state */
 +                is->frame_last_duration = last_duration;
 +            }
 +            delay = compute_target_delay(is->frame_last_duration, is);
 +
 +            time= av_gettime()/1000000.0;
-             if(is->pictq_size > 1) {
-                  VideoPicture *nextvp= &is->pictq[(is->pictq_rindex+1)%VIDEO_PICTURE_QUEUE_SIZE];
-                  duration = nextvp->pts - vp->pts; // More accurate this way, 1/time_base is often not reflecting FPS
++            if (time < is->frame_timer + delay)
 +                return;
 +
 +            if (delay > 0)
 +                is->frame_timer += delay * FFMAX(1, floor((time-is->frame_timer) / delay));
 +
 +            SDL_LockMutex(is->pictq_mutex);
 +            update_video_pts(is, vp->pts, vp->pos);
 +            SDL_UnlockMutex(is->pictq_mutex);
 +
-                  duration = vp->duration;
++            if (is->pictq_size > 1) {
++                VideoPicture *nextvp = &is->pictq[(is->pictq_rindex + 1) % VIDEO_PICTURE_QUEUE_SIZE];
++                duration = nextvp->pts - vp->pts; // More accurate this way, 1/time_base is often not reflecting FPS
 +            } else {
-             if(is->subtitle_st) {
++                duration = vp->duration;
 +            }
 +
 +            if((framedrop>0 || (framedrop && is->audio_st)) && time > is->frame_timer + duration){
 +                if(is->pictq_size > 1){
 +                    is->frame_drops_late++;
 +                    pictq_next_picture(is);
 +                    goto retry;
 +                }
 +            }
 +
-         if(vp->picref)
++            if (is->subtitle_st) {
 +                if (is->subtitle_stream_changed) {
 +                    SDL_LockMutex(is->subpq_mutex);
 +
 +                    while (is->subpq_size) {
 +                        free_subpicture(&is->subpq[is->subpq_rindex]);
 +
 +                        /* update queue size and signal for next picture */
 +                        if (++is->subpq_rindex == SUBPICTURE_QUEUE_SIZE)
 +                            is->subpq_rindex = 0;
 +
 +                        is->subpq_size--;
 +                    }
 +                    is->subtitle_stream_changed = 0;
 +
 +                    SDL_CondSignal(is->subpq_cond);
 +                    SDL_UnlockMutex(is->subpq_mutex);
 +                } else {
 +                    if (is->subpq_size > 0) {
 +                        sp = &is->subpq[is->subpq_rindex];
 +
 +                        if (is->subpq_size > 1)
 +                            sp2 = &is->subpq[(is->subpq_rindex + 1) % SUBPICTURE_QUEUE_SIZE];
 +                        else
 +                            sp2 = NULL;
 +
 +                        if ((is->video_current_pts > (sp->pts + ((float) sp->sub.end_display_time / 1000)))
 +                                || (sp2 && is->video_current_pts > (sp2->pts + ((float) sp2->sub.start_display_time / 1000))))
 +                        {
 +                            free_subpicture(sp);
 +
 +                            /* update queue size and signal for next picture */
 +                            if (++is->subpq_rindex == SUBPICTURE_QUEUE_SIZE)
 +                                is->subpq_rindex = 0;
 +
 +                            SDL_LockMutex(is->subpq_mutex);
 +                            is->subpq_size--;
 +                            SDL_CondSignal(is->subpq_cond);
 +                            SDL_UnlockMutex(is->subpq_mutex);
 +                        }
 +                    }
 +                }
 +            }
 +
 +            /* display picture */
 +            if (!display_disable)
 +                video_display(is);
 +
 +            pictq_next_picture(is);
 +        }
 +    } else if (is->audio_st) {
 +        /* draw the next audio frame */
 +
 +        /* if only audio stream, then display the audio bars (better
 +           than nothing, just to test the implementation */
 +
 +        /* display picture */
 +        if (!display_disable)
 +            video_display(is);
 +    }
 +    if (show_status) {
 +        static int64_t last_time;
 +        int64_t cur_time;
 +        int aqsize, vqsize, sqsize;
 +        double av_diff;
 +
 +        cur_time = av_gettime();
 +        if (!last_time || (cur_time - last_time) >= 30000) {
 +            aqsize = 0;
 +            vqsize = 0;
 +            sqsize = 0;
 +            if (is->audio_st)
 +                aqsize = is->audioq.size;
 +            if (is->video_st)
 +                vqsize = is->videoq.size;
 +            if (is->subtitle_st)
 +                sqsize = is->subtitleq.size;
 +            av_diff = 0;
 +            if (is->audio_st && is->video_st)
 +                av_diff = get_audio_clock(is) - get_video_clock(is);
 +            printf("%7.2f A-V:%7.3f fd=%4d aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64"   \r",
 +                   get_master_clock(is),
 +                   av_diff,
 +                   is->frame_drops_early + is->frame_drops_late,
 +                   aqsize / 1024,
 +                   vqsize / 1024,
 +                   sqsize,
 +                   is->video_st ? is->video_st->codec->pts_correction_num_faulty_dts : 0,
 +                   is->video_st ? is->video_st->codec->pts_correction_num_faulty_pts : 0);
 +            fflush(stdout);
 +            last_time = cur_time;
 +        }
 +    }
 +}
 +
 +/* allocate a picture (needs to do that in main thread to avoid
 +   potential locking problems */
 +static void alloc_picture(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +
 +    vp = &is->pictq[is->pictq_windex];
 +
 +    if (vp->bmp)
 +        SDL_FreeYUVOverlay(vp->bmp);
 +
 +#if CONFIG_AVFILTER
 +    if (vp->picref)
 +        avfilter_unref_buffer(vp->picref);
 +    vp->picref = NULL;
 +
 +    vp->width   = is->out_video_filter->inputs[0]->w;
 +    vp->height  = is->out_video_filter->inputs[0]->h;
 +    vp->pix_fmt = is->out_video_filter->inputs[0]->format;
 +#else
 +    vp->width   = is->video_st->codec->width;
 +    vp->height  = is->video_st->codec->height;
 +    vp->pix_fmt = is->video_st->codec->pix_fmt;
 +#endif
 +
 +    vp->bmp = SDL_CreateYUVOverlay(vp->width, vp->height,
 +                                   SDL_YV12_OVERLAY,
 +                                   screen);
 +    if (!vp->bmp || vp->bmp->pitches[0] < vp->width) {
 +        /* SDL allocates a buffer smaller than requested if the video
 +         * overlay hardware is unable to support the requested size. */
 +        fprintf(stderr, "Error: the video system does not support an image\n"
 +                        "size of %dx%d pixels. Try using -lowres or -vf \"scale=w:h\"\n"
 +                        "to reduce the image size.\n", vp->width, vp->height );
 +        do_exit(is);
 +    }
 +
 +    SDL_LockMutex(is->pictq_mutex);
 +    vp->allocated = 1;
 +    SDL_CondSignal(is->pictq_cond);
 +    SDL_UnlockMutex(is->pictq_mutex);
 +}
 +
 +static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_t pos)
 +{
 +    VideoPicture *vp;
 +    double frame_delay, pts = pts1;
 +
 +    /* compute the exact PTS for the picture if it is omitted in the stream
 +     * pts1 is the dts of the pkt / pts of the frame */
 +    if (pts != 0) {
 +        /* update video clock with pts, if present */
 +        is->video_clock = pts;
 +    } else {
 +        pts = is->video_clock;
 +    }
 +    /* update video clock for next frame */
 +    frame_delay = av_q2d(is->video_st->codec->time_base);
 +    /* for MPEG2, the frame can be repeated, so we update the
 +       clock accordingly */
 +    frame_delay += src_frame->repeat_pict * (frame_delay * 0.5);
 +    is->video_clock += frame_delay;
 +
 +#if defined(DEBUG_SYNC) && 0
 +    printf("frame_type=%c clock=%0.3f pts=%0.3f\n",
 +           av_get_picture_type_char(src_frame->pict_type), pts, pts1);
 +#endif
 +
 +    /* wait until we have space to put a new picture */
 +    SDL_LockMutex(is->pictq_mutex);
 +
 +    while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE &&
 +           !is->videoq.abort_request) {
 +        SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +    }
 +    SDL_UnlockMutex(is->pictq_mutex);
 +
 +    if (is->videoq.abort_request)
 +        return -1;
 +
 +    vp = &is->pictq[is->pictq_windex];
 +
 +    vp->duration = frame_delay;
 +
 +    /* alloc or resize hardware picture buffer */
 +    if (!vp->bmp || vp->reallocate ||
 +#if CONFIG_AVFILTER
 +        vp->width  != is->out_video_filter->inputs[0]->w ||
 +        vp->height != is->out_video_filter->inputs[0]->h) {
 +#else
 +        vp->width != is->video_st->codec->width ||
 +        vp->height != is->video_st->codec->height) {
 +#endif
 +        SDL_Event event;
 +
 +        vp->allocated  = 0;
 +        vp->reallocate = 0;
 +
 +        /* the allocation must be done in the main thread to avoid
 +           locking problems */
 +        event.type = FF_ALLOC_EVENT;
 +        event.user.data1 = is;
 +        SDL_PushEvent(&event);
 +
 +        /* wait until the picture is allocated */
 +        SDL_LockMutex(is->pictq_mutex);
 +        while (!vp->allocated && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        /* if the queue is aborted, we have to pop the pending ALLOC event or wait for the allocation to complete */
 +        if (is->videoq.abort_request && SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_EVENTMASK(FF_ALLOC_EVENT)) != 1) {
 +            while (!vp->allocated) {
 +                SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +            }
 +        }
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        if (is->videoq.abort_request)
 +            return -1;
 +    }
 +
 +    /* if the frame is not skipped, then display it */
 +    if (vp->bmp) {
 +        AVPicture pict;
 +#if CONFIG_AVFILTER
-         memset(&pict,0,sizeof(AVPicture));
++        if (vp->picref)
 +            avfilter_unref_buffer(vp->picref);
 +        vp->picref = src_frame->opaque;
 +#endif
 +
 +        /* get a pointer on the bitmap */
 +        SDL_LockYUVOverlay (vp->bmp);
 +
-         //FIXME use direct rendering
++        memset(&pict, 0, sizeof(AVPicture));
 +        pict.data[0] = vp->bmp->pixels[0];
 +        pict.data[1] = vp->bmp->pixels[2];
 +        pict.data[2] = vp->bmp->pixels[1];
 +
 +        pict.linesize[0] = vp->bmp->pitches[0];
 +        pict.linesize[1] = vp->bmp->pitches[2];
 +        pict.linesize[2] = vp->bmp->pitches[1];
 +
 +#if CONFIG_AVFILTER
-         //Make sure there are no long delay timers (ideally we should just flush the que but thats harder)
++        // FIXME use direct rendering
 +        av_picture_copy(&pict, (AVPicture *)src_frame,
 +                        vp->pix_fmt, vp->width, vp->height);
 +#else
 +        sws_flags = av_get_int(sws_opts, "sws_flags", NULL);
 +        is->img_convert_ctx = sws_getCachedContext(is->img_convert_ctx,
 +            vp->width, vp->height, vp->pix_fmt, vp->width, vp->height,
 +            PIX_FMT_YUV420P, sws_flags, NULL, NULL, NULL);
 +        if (is->img_convert_ctx == NULL) {
 +            fprintf(stderr, "Cannot initialize the conversion context\n");
 +            exit(1);
 +        }
 +        sws_scale(is->img_convert_ctx, src_frame->data, src_frame->linesize,
 +                  0, vp->height, pict.data, pict.linesize);
 +#endif
 +        /* update the bitmap content */
 +        SDL_UnlockYUVOverlay(vp->bmp);
 +
 +        vp->pts = pts;
 +        vp->pos = pos;
 +        vp->skip = 0;
 +
 +        /* now we can update the picture count */
 +        if (++is->pictq_windex == VIDEO_PICTURE_QUEUE_SIZE)
 +            is->pictq_windex = 0;
 +        SDL_LockMutex(is->pictq_mutex);
 +        is->pictq_size++;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +    }
 +    return 0;
 +}
 +
 +static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacket *pkt)
 +{
 +    int got_picture, i;
 +
 +    if (packet_queue_get(&is->videoq, pkt, 1) < 0)
 +        return -1;
 +
 +    if (pkt->data == flush_pkt.data) {
 +        avcodec_flush_buffers(is->video_st->codec);
 +
 +        SDL_LockMutex(is->pictq_mutex);
-     if(pic->buffer_hints & FF_BUFFER_HINTS_VALID) {
-         if(pic->buffer_hints & FF_BUFFER_HINTS_READABLE) perms |= AV_PERM_READ;
-         if(pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) perms |= AV_PERM_PRESERVE;
-         if(pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) perms |= AV_PERM_REUSE2;
++        // Make sure there are no long delay timers (ideally we should just flush the que but thats harder)
 +        for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +            is->pictq[i].skip = 1;
 +        }
 +        while (is->pictq_size && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        is->video_current_pos = -1;
 +        is->frame_last_pts = AV_NOPTS_VALUE;
 +        is->frame_last_duration = 0;
 +        is->frame_timer = (double)av_gettime() / 1000000.0;
 +        is->frame_last_dropped_pts = AV_NOPTS_VALUE;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        return 0;
 +    }
 +
 +    avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt);
 +
 +    if (got_picture) {
 +        int ret = 1;
 +
 +        if (decoder_reorder_pts == -1) {
 +            *pts = *(int64_t*)av_opt_ptr(avcodec_get_frame_class(), frame, "best_effort_timestamp");
 +        } else if (decoder_reorder_pts) {
 +            *pts = frame->pkt_pts;
 +        } else {
 +            *pts = frame->pkt_dts;
 +        }
 +
 +        if (*pts == AV_NOPTS_VALUE) {
 +            *pts = 0;
 +        }
 +
 +        if (((is->av_sync_type == AV_SYNC_AUDIO_MASTER && is->audio_st) || is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK) &&
 +             (framedrop>0 || (framedrop && is->audio_st))) {
 +            SDL_LockMutex(is->pictq_mutex);
 +            if (is->frame_last_pts != AV_NOPTS_VALUE && *pts) {
 +                double clockdiff = get_video_clock(is) - get_master_clock(is);
 +                double dpts = av_q2d(is->video_st->time_base) * *pts;
 +                double ptsdiff = dpts - is->frame_last_pts;
 +                if (fabs(clockdiff) < AV_NOSYNC_THRESHOLD &&
 +                     ptsdiff > 0 && ptsdiff < AV_NOSYNC_THRESHOLD &&
 +                     clockdiff + ptsdiff - is->frame_last_filter_delay < 0) {
 +                    is->frame_last_dropped_pos = pkt->pos;
 +                    is->frame_last_dropped_pts = dpts;
 +                    is->frame_drops_early++;
 +                    ret = 0;
 +                }
 +            }
 +            SDL_UnlockMutex(is->pictq_mutex);
 +        }
 +
 +        if (ret)
 +            is->frame_last_returned_time = av_gettime() / 1000000.0;
 +
 +        return ret;
 +    }
 +    return 0;
 +}
 +
 +#if CONFIG_AVFILTER
 +typedef struct {
 +    VideoState *is;
 +    AVFrame *frame;
 +    int use_dr1;
 +} FilterPriv;
 +
 +static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    AVFilterContext *ctx = codec->opaque;
 +    AVFilterBufferRef  *ref;
 +    int perms = AV_PERM_WRITE;
 +    int i, w, h, stride[4];
 +    unsigned edge;
 +    int pixel_size;
 +
 +    av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE);
 +
 +    if (codec->codec->capabilities & CODEC_CAP_NEG_LINESIZES)
 +        perms |= AV_PERM_NEG_LINESIZES;
 +
-     if(pic->reference) perms |= AV_PERM_READ | AV_PERM_PRESERVE;
++    if (pic->buffer_hints & FF_BUFFER_HINTS_VALID) {
++        if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE) perms |= AV_PERM_READ;
++        if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) perms |= AV_PERM_PRESERVE;
++        if (pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) perms |= AV_PERM_REUSE2;
 +    }
-     if(!(ref = avfilter_get_video_buffer(ctx->outputs[0], perms, w, h)))
++    if (pic->reference) perms |= AV_PERM_READ | AV_PERM_PRESERVE;
 +
 +    w = codec->width;
 +    h = codec->height;
 +
 +    if(av_image_check_size(w, h, 0, codec))
 +        return -1;
 +
 +    avcodec_align_dimensions2(codec, &w, &h, stride);
 +    edge = codec->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width();
 +    w += edge << 1;
 +    h += edge << 1;
 +    if (codec->pix_fmt != ctx->outputs[0]->format) {
 +        av_log(codec, AV_LOG_ERROR, "Pixel format mismatches %d %d\n", codec->pix_fmt, ctx->outputs[0]->format);
 +        return -1;
 +    }
-     pixel_size = av_pix_fmt_descriptors[ref->format].comp[0].step_minus1+1;
++    if (!(ref = avfilter_get_video_buffer(ctx->outputs[0], perms, w, h)))
 +        return -1;
 +
-     for(i = 0; i < 4; i ++) {
++    pixel_size = av_pix_fmt_descriptors[ref->format].comp[0].step_minus1 + 1;
 +    ref->video->w = codec->width;
 +    ref->video->h = codec->height;
-     if(codec->pkt) pic->pkt_pts = codec->pkt->pts;
-     else           pic->pkt_pts = AV_NOPTS_VALUE;
++    for (i = 0; i < 4; i ++) {
 +        unsigned hshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_w : 0;
 +        unsigned vshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_h : 0;
 +
 +        if (ref->data[i]) {
 +            ref->data[i]    += ((edge * pixel_size) >> hshift) + ((edge * ref->linesize[i]) >> vshift);
 +        }
 +        pic->data[i]     = ref->data[i];
 +        pic->linesize[i] = ref->linesize[i];
 +    }
 +    pic->opaque = ref;
 +    pic->type   = FF_BUFFER_TYPE_USER;
 +    pic->reordered_opaque = codec->reordered_opaque;
-     if(codec->pkt) pic->pkt_pts = codec->pkt->pts;
-     else           pic->pkt_pts = AV_NOPTS_VALUE;
++    if (codec->pkt) pic->pkt_pts = codec->pkt->pts;
++    else            pic->pkt_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +static void input_release_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    memset(pic->data, 0, sizeof(pic->data));
 +    avfilter_unref_buffer(pic->opaque);
 +}
 +
 +static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    AVFilterBufferRef *ref = pic->opaque;
 +
 +    if (pic->data[0] == NULL) {
 +        pic->buffer_hints |= FF_BUFFER_HINTS_READABLE;
 +        return codec->get_buffer(codec, pic);
 +    }
 +
 +    if ((codec->width != ref->video->w) || (codec->height != ref->video->h) ||
 +        (codec->pix_fmt != ref->format)) {
 +        av_log(codec, AV_LOG_ERROR, "Picture properties changed.\n");
 +        return -1;
 +    }
 +
 +    pic->reordered_opaque = codec->reordered_opaque;
-     if(!opaque) return -1;
++    if (codec->pkt) pic->pkt_pts = codec->pkt->pts;
++    else            pic->pkt_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +static int input_init(AVFilterContext *ctx, const char *args, void *opaque)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    AVCodecContext *codec;
-     if((codec->codec->capabilities & CODEC_CAP_DR1)
-     ) {
++    if (!opaque) return -1;
 +
 +    priv->is = opaque;
 +    codec    = priv->is->video_st->codec;
 +    codec->opaque = ctx;
-     if(priv->use_dr1 && priv->frame->opaque) {
++    if (codec->codec->capabilities & CODEC_CAP_DR1) {
 +        av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE);
 +        priv->use_dr1 = 1;
 +        codec->get_buffer     = input_get_buffer;
 +        codec->release_buffer = input_release_buffer;
 +        codec->reget_buffer   = input_reget_buffer;
 +        codec->thread_safe_callbacks = 1;
 +    }
 +
 +    priv->frame = avcodec_alloc_frame();
 +
 +    return 0;
 +}
 +
 +static void input_uninit(AVFilterContext *ctx)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    av_free(priv->frame);
 +}
 +
 +static int input_request_frame(AVFilterLink *link)
 +{
 +    FilterPriv *priv = link->src->priv;
 +    AVFilterBufferRef *picref;
 +    int64_t pts = 0;
 +    AVPacket pkt;
 +    int ret;
 +
 +    while (!(ret = get_video_frame(priv->is, priv->frame, &pts, &pkt)))
 +        av_free_packet(&pkt);
 +    if (ret < 0)
 +        return -1;
 +
-     if(vfilters) {
++    if (priv->use_dr1 && priv->frame->opaque) {
 +        picref = avfilter_ref_buffer(priv->frame->opaque, ~0);
 +    } else {
 +        picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h);
 +        av_image_copy(picref->data, picref->linesize,
 +                      priv->frame->data, priv->frame->linesize,
 +                      picref->format, link->w, link->h);
 +    }
 +    av_free_packet(&pkt);
 +
 +    avfilter_copy_frame_props(picref, priv->frame);
 +    picref->pts = pts;
 +
 +    avfilter_start_frame(link, picref);
 +    avfilter_draw_slice(link, 0, link->h, 1);
 +    avfilter_end_frame(link);
 +
 +    return 0;
 +}
 +
 +static int input_query_formats(AVFilterContext *ctx)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    enum PixelFormat pix_fmts[] = {
 +        priv->is->video_st->codec->pix_fmt, PIX_FMT_NONE
 +    };
 +
 +    avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts));
 +    return 0;
 +}
 +
 +static int input_config_props(AVFilterLink *link)
 +{
 +    FilterPriv *priv  = link->src->priv;
 +    AVStream *s = priv->is->video_st;
 +
 +    link->w = s->codec->width;
 +    link->h = s->codec->height;
 +    link->sample_aspect_ratio = s->sample_aspect_ratio.num ?
 +        s->sample_aspect_ratio : s->codec->sample_aspect_ratio;
 +    link->time_base = s->time_base;
 +
 +    return 0;
 +}
 +
 +static AVFilter input_filter =
 +{
 +    .name      = "ffplay_input",
 +
 +    .priv_size = sizeof(FilterPriv),
 +
 +    .init      = input_init,
 +    .uninit    = input_uninit,
 +
 +    .query_formats = input_query_formats,
 +
 +    .inputs    = (AVFilterPad[]) {{ .name = NULL }},
 +    .outputs   = (AVFilterPad[]) {{ .name = "default",
 +                                    .type = AVMEDIA_TYPE_VIDEO,
 +                                    .request_frame = input_request_frame,
 +                                    .config_props  = input_config_props, },
 +                                  { .name = NULL }},
 +};
 +
 +static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const char *vfilters)
 +{
 +    char sws_flags_str[128];
 +    int ret;
 +    enum PixelFormat pix_fmts[] = { PIX_FMT_YUV420P, PIX_FMT_NONE };
 +    AVBufferSinkParams *buffersink_params = av_buffersink_params_alloc();
 +    AVFilterContext *filt_src = NULL, *filt_out = NULL;
 +    snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags);
 +    graph->scale_sws_opts = av_strdup(sws_flags_str);
 +
 +    if ((ret = avfilter_graph_create_filter(&filt_src, &input_filter, "src",
 +                                            NULL, is, graph)) < 0)
 +        return ret;
 +#if FF_API_OLD_VSINK_API
 +    ret = avfilter_graph_create_filter(&filt_out, avfilter_get_by_name("buffersink"), "out",
 +                                       NULL, pix_fmts, graph);
 +#else
 +    buffersink_params->pixel_fmts = pix_fmts;
 +    ret = avfilter_graph_create_filter(&filt_out, avfilter_get_by_name("buffersink"), "out",
 +                                       NULL, buffersink_params, graph);
 +#endif
 +    av_freep(&buffersink_params);
 +    if (ret < 0)
 +        return ret;
 +
-     AVFrame *frame= avcodec_alloc_frame();
++    if (vfilters) {
 +        AVFilterInOut *outputs = avfilter_inout_alloc();
 +        AVFilterInOut *inputs  = avfilter_inout_alloc();
 +
 +        outputs->name    = av_strdup("in");
 +        outputs->filter_ctx = filt_src;
 +        outputs->pad_idx = 0;
 +        outputs->next    = NULL;
 +
 +        inputs->name    = av_strdup("out");
 +        inputs->filter_ctx = filt_out;
 +        inputs->pad_idx = 0;
 +        inputs->next    = NULL;
 +
 +        if ((ret = avfilter_graph_parse(graph, vfilters, &inputs, &outputs, NULL)) < 0)
 +            return ret;
 +    } else {
 +        if ((ret = avfilter_link(filt_src, 0, filt_out, 0)) < 0)
 +            return ret;
 +    }
 +
 +    if ((ret = avfilter_graph_config(graph, NULL)) < 0)
 +        return ret;
 +
 +    is->out_video_filter = filt_out;
 +
 +    return ret;
 +}
 +
 +#endif  /* CONFIG_AVFILTER */
 +
 +static int video_thread(void *arg)
 +{
 +    VideoState *is = arg;
-     for(;;) {
++    AVFrame *frame = avcodec_alloc_frame();
 +    int64_t pts_int = AV_NOPTS_VALUE, pos = -1;
 +    double pts;
 +    int ret;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterGraph *graph = avfilter_graph_alloc();
 +    AVFilterContext *filt_out = NULL;
 +    int last_w = is->video_st->codec->width;
 +    int last_h = is->video_st->codec->height;
 +
 +    if ((ret = configure_video_filters(graph, is, vfilters)) < 0)
 +        goto the_end;
 +    filt_out = is->out_video_filter;
 +#endif
 +
-         if (ret < 0) goto the_end;
++    for (;;) {
 +#if !CONFIG_AVFILTER
 +        AVPacket pkt;
 +#else
 +        AVFilterBufferRef *picref;
 +        AVRational tb = filt_out->inputs[0]->time_base;
 +#endif
 +        while (is->paused && !is->videoq.abort_request)
 +            SDL_Delay(10);
 +#if CONFIG_AVFILTER
 +        if (   last_w != is->video_st->codec->width
 +            || last_h != is->video_st->codec->height) {
 +            av_log(NULL, AV_LOG_INFO, "Frame changed from size:%dx%d to size:%dx%d\n",
 +                   last_w, last_h, is->video_st->codec->width, is->video_st->codec->height);
 +            avfilter_graph_free(&graph);
 +            graph = avfilter_graph_alloc();
 +            if ((ret = configure_video_filters(graph, is, vfilters)) < 0)
 +                goto the_end;
 +            filt_out = is->out_video_filter;
 +            last_w = is->video_st->codec->width;
 +            last_h = is->video_st->codec->height;
 +        }
 +        ret = av_buffersink_get_buffer_ref(filt_out, &picref, 0);
 +        if (picref) {
 +            avfilter_fill_frame_from_video_buffer_ref(frame, picref);
 +            pts_int = picref->pts;
 +            pos     = picref->pos;
 +            frame->opaque = picref;
 +        }
 +
 +        if (av_cmp_q(tb, is->video_st->time_base)) {
 +            av_unused int64_t pts1 = pts_int;
 +            pts_int = av_rescale_q(pts_int, tb, is->video_st->time_base);
 +            av_dlog(NULL, "video_thread(): "
 +                    "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n",
 +                    tb.num, tb.den, pts1,
 +                    is->video_st->time_base.num, is->video_st->time_base.den, pts_int);
 +        }
 +#else
 +        ret = get_video_frame(is, frame, &pts_int, &pkt);
 +        pos = pkt.pos;
 +        av_free_packet(&pkt);
 +#endif
 +
-         pts = pts_int*av_q2d(is->video_st->time_base);
++        if (ret < 0)
++            goto the_end;
 +
 +        is->frame_last_filter_delay = av_gettime() / 1000000.0 - is->frame_last_returned_time;
 +        if (fabs(is->frame_last_filter_delay) > AV_NOSYNC_THRESHOLD / 10.0)
 +            is->frame_last_filter_delay = 0;
 +
 +#if CONFIG_AVFILTER
 +        if (!picref)
 +            continue;
 +#endif
 +
-     for(;;) {
++        pts = pts_int * av_q2d(is->video_st->time_base);
 +
 +        ret = queue_picture(is, frame, pts, pos);
 +
 +        if (ret < 0)
 +            goto the_end;
 +
 +        if (is->step)
 +            stream_toggle_pause(is);
 +    }
 + the_end:
 +#if CONFIG_AVFILTER
 +    avfilter_graph_free(&graph);
 +#endif
 +    av_free(frame);
 +    return 0;
 +}
 +
 +static int subtitle_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    SubPicture *sp;
 +    AVPacket pkt1, *pkt = &pkt1;
 +    int got_subtitle;
 +    double pts;
 +    int i, j;
 +    int r, g, b, y, u, v, a;
 +
-         if(pkt->data == flush_pkt.data){
++    for (;;) {
 +        while (is->paused && !is->subtitleq.abort_request) {
 +            SDL_Delay(10);
 +        }
 +        if (packet_queue_get(&is->subtitleq, pkt, 1) < 0)
 +            break;
 +
-             pts = av_q2d(is->subtitle_st->time_base)*pkt->pts;
++        if (pkt->data == flush_pkt.data) {
 +            avcodec_flush_buffers(is->subtitle_st->codec);
 +            continue;
 +        }
 +        SDL_LockMutex(is->subpq_mutex);
 +        while (is->subpq_size >= SUBPICTURE_QUEUE_SIZE &&
 +               !is->subtitleq.abort_request) {
 +            SDL_CondWait(is->subpq_cond, is->subpq_mutex);
 +        }
 +        SDL_UnlockMutex(is->subpq_mutex);
 +
 +        if (is->subtitleq.abort_request)
 +            return 0;
 +
 +        sp = &is->subpq[is->subpq_windex];
 +
 +       /* NOTE: ipts is the PTS of the _first_ picture beginning in
 +           this packet, if any */
 +        pts = 0;
 +        if (pkt->pts != AV_NOPTS_VALUE)
-             is->audio_diff_cum = 0;
++            pts = av_q2d(is->subtitle_st->time_base) * pkt->pts;
 +
 +        avcodec_decode_subtitle2(is->subtitle_st->codec, &sp->sub,
 +                                 &got_subtitle, pkt);
 +
 +        if (got_subtitle && sp->sub.format == 0) {
 +            sp->pts = pts;
 +
 +            for (i = 0; i < sp->sub.num_rects; i++)
 +            {
 +                for (j = 0; j < sp->sub.rects[i]->nb_colors; j++)
 +                {
 +                    RGBA_IN(r, g, b, a, (uint32_t*)sp->sub.rects[i]->pict.data[1] + j);
 +                    y = RGB_TO_Y_CCIR(r, g, b);
 +                    u = RGB_TO_U_CCIR(r, g, b, 0);
 +                    v = RGB_TO_V_CCIR(r, g, b, 0);
 +                    YUVA_OUT((uint32_t*)sp->sub.rects[i]->pict.data[1] + j, y, u, v, a);
 +                }
 +            }
 +
 +            /* now we can update the picture count */
 +            if (++is->subpq_windex == SUBPICTURE_QUEUE_SIZE)
 +                is->subpq_windex = 0;
 +            SDL_LockMutex(is->subpq_mutex);
 +            is->subpq_size++;
 +            SDL_UnlockMutex(is->subpq_mutex);
 +        }
 +        av_free_packet(pkt);
 +    }
 +    return 0;
 +}
 +
 +/* copy samples for viewing in editor window */
 +static void update_sample_display(VideoState *is, short *samples, int samples_size)
 +{
 +    int size, len;
 +
 +    size = samples_size / sizeof(short);
 +    while (size > 0) {
 +        len = SAMPLE_ARRAY_SIZE - is->sample_array_index;
 +        if (len > size)
 +            len = size;
 +        memcpy(is->sample_array + is->sample_array_index, samples, len * sizeof(short));
 +        samples += len;
 +        is->sample_array_index += len;
 +        if (is->sample_array_index >= SAMPLE_ARRAY_SIZE)
 +            is->sample_array_index = 0;
 +        size -= len;
 +    }
 +}
 +
 +/* return the new audio buffer size (samples can be added or deleted
 +   to get better sync if video or external master clock) */
 +static int synchronize_audio(VideoState *is, short *samples,
 +                             int samples_size1, double pts)
 +{
 +    int n, samples_size;
 +    double ref_clock;
 +
 +    n = av_get_bytes_per_sample(is->audio_tgt_fmt) * is->audio_tgt_channels;
 +    samples_size = samples_size1;
 +
 +    /* if not master, then we try to remove or add samples to correct the clock */
 +    if (((is->av_sync_type == AV_SYNC_VIDEO_MASTER && is->video_st) ||
 +         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
 +        double diff, avg_diff;
 +        int wanted_size, min_size, max_size, nb_samples;
 +
 +        ref_clock = get_master_clock(is);
 +        diff = get_audio_clock(is) - ref_clock;
 +
 +        if (diff < AV_NOSYNC_THRESHOLD) {
 +            is->audio_diff_cum = diff + is->audio_diff_avg_coef * is->audio_diff_cum;
 +            if (is->audio_diff_avg_count < AUDIO_DIFF_AVG_NB) {
 +                /* not enough measures to have a correct estimate */
 +                is->audio_diff_avg_count++;
 +            } else {
 +                /* estimate the A-V difference */
 +                avg_diff = is->audio_diff_cum * (1.0 - is->audio_diff_avg_coef);
 +
 +                if (fabs(avg_diff) >= is->audio_diff_threshold) {
 +                    wanted_size = samples_size + ((int)(diff * is->audio_tgt_freq) * n);
 +                    nb_samples = samples_size / n;
 +
 +                    min_size = ((nb_samples * (100 - SAMPLE_CORRECTION_PERCENT_MAX)) / 100) * n;
 +                    max_size = ((nb_samples * (100 + SAMPLE_CORRECTION_PERCENT_MAX)) / 100) * n;
 +                    if (wanted_size < min_size)
 +                        wanted_size = min_size;
 +                    else if (wanted_size > FFMIN3(max_size, samples_size, sizeof(is->audio_buf2)))
 +                        wanted_size = FFMIN3(max_size, samples_size, sizeof(is->audio_buf2));
 +
 +                    /* add or remove samples to correction the synchro */
 +                    if (wanted_size < samples_size) {
 +                        /* remove samples */
 +                        samples_size = wanted_size;
 +                    } else if (wanted_size > samples_size) {
 +                        uint8_t *samples_end, *q;
 +                        int nb;
 +
 +                        /* add samples */
 +                        nb = (samples_size - wanted_size);
 +                        samples_end = (uint8_t *)samples + samples_size - n;
 +                        q = samples_end + n;
 +                        while (nb > 0) {
 +                            memcpy(q, samples_end, n);
 +                            q += n;
 +                            nb -= n;
 +                        }
 +                        samples_size = wanted_size;
 +                    }
 +                }
 +                av_dlog(NULL, "diff=%f adiff=%f sample_diff=%d apts=%0.3f vpts=%0.3f %f\n",
 +                        diff, avg_diff, samples_size - samples_size1,
 +                        is->audio_clock, is->video_clock, is->audio_diff_threshold);
 +            }
 +        } else {
 +            /* too big difference : may be initial PTS errors, so
 +               reset A-V filter */
 +            is->audio_diff_avg_count = 0;
-     AVCodecContext *dec= is->audio_st->codec;
++            is->audio_diff_cum       = 0;
 +        }
 +    }
 +
 +    return samples_size;
 +}
 +
 +/* decode one audio frame and returns its uncompressed size */
 +static int audio_decode_frame(VideoState *is, double *pts_ptr)
 +{
 +    AVPacket *pkt_temp = &is->audio_pkt_temp;
 +    AVPacket *pkt = &is->audio_pkt;
-     for(;;) {
++    AVCodecContext *dec = is->audio_st->codec;
 +    int len1, len2, data_size, resampled_data_size;
 +    int64_t dec_channel_layout;
 +    int got_frame;
 +    double pts;
 +    int new_packet = 0;
 +    int flush_complete = 0;
 +
-     avctx->workaround_bugs = workaround_bugs;
-     avctx->lowres = lowres;
++    for (;;) {
 +        /* NOTE: the audio packet can contain several frames */
 +        while (pkt_temp->size > 0 || (!pkt_temp->data && new_packet)) {
 +            if (!is->frame) {
 +                if (!(is->frame = avcodec_alloc_frame()))
 +                    return AVERROR(ENOMEM);
 +            } else
 +                avcodec_get_frame_defaults(is->frame);
 +
 +            if (flush_complete)
 +                break;
 +            new_packet = 0;
 +            len1 = avcodec_decode_audio4(dec, is->frame, &got_frame, pkt_temp);
 +            if (len1 < 0) {
 +                /* if error, we skip the frame */
 +                pkt_temp->size = 0;
 +                break;
 +            }
 +
 +            pkt_temp->data += len1;
 +            pkt_temp->size -= len1;
 +
 +            if (!got_frame) {
 +                /* stop sending empty packets if the decoder is finished */
 +                if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY)
 +                    flush_complete = 1;
 +                continue;
 +            }
 +            data_size = av_samples_get_buffer_size(NULL, dec->channels,
 +                                                   is->frame->nb_samples,
 +                                                   dec->sample_fmt, 1);
 +
 +            dec_channel_layout = (dec->channel_layout && dec->channels == av_get_channel_layout_nb_channels(dec->channel_layout)) ? dec->channel_layout : av_get_default_channel_layout(dec->channels);
 +
 +            if (dec->sample_fmt != is->audio_src_fmt || dec_channel_layout != is->audio_src_channel_layout || dec->sample_rate != is->audio_src_freq) {
 +                if (is->swr_ctx)
 +                    swr_free(&is->swr_ctx);
 +                is->swr_ctx = swr_alloc_set_opts(NULL,
 +                                                 is->audio_tgt_channel_layout, is->audio_tgt_fmt, is->audio_tgt_freq,
 +                                                 dec_channel_layout,           dec->sample_fmt,   dec->sample_rate,
 +                                                 0, NULL);
 +                if (!is->swr_ctx || swr_init(is->swr_ctx) < 0) {
 +                    fprintf(stderr, "Cannot create sample rate converter for conversion of %d Hz %s %d channels to %d Hz %s %d channels!\n",
 +                        dec->sample_rate,
 +                        av_get_sample_fmt_name(dec->sample_fmt),
 +                        dec->channels,
 +                        is->audio_tgt_freq,
 +                        av_get_sample_fmt_name(is->audio_tgt_fmt),
 +                        is->audio_tgt_channels);
 +                    break;
 +                }
 +                is->audio_src_channel_layout = dec_channel_layout;
 +                is->audio_src_channels = dec->channels;
 +                is->audio_src_freq = dec->sample_rate;
 +                is->audio_src_fmt = dec->sample_fmt;
 +            }
 +
 +            resampled_data_size = data_size;
 +            if (is->swr_ctx) {
 +                const uint8_t *in[] = { is->frame->data[0] };
 +                uint8_t *out[] = {is->audio_buf2};
 +                len2 = swr_convert(is->swr_ctx, out, sizeof(is->audio_buf2) / is->audio_tgt_channels / av_get_bytes_per_sample(is->audio_tgt_fmt),
 +                                                in, data_size / dec->channels / av_get_bytes_per_sample(dec->sample_fmt));
 +                if (len2 < 0) {
 +                    fprintf(stderr, "audio_resample() failed\n");
 +                    break;
 +                }
 +                if (len2 == sizeof(is->audio_buf2) / is->audio_tgt_channels / av_get_bytes_per_sample(is->audio_tgt_fmt)) {
 +                    fprintf(stderr, "warning: audio buffer is probably too small\n");
 +                    swr_init(is->swr_ctx);
 +                }
 +                is->audio_buf = is->audio_buf2;
 +                resampled_data_size = len2 * is->audio_tgt_channels * av_get_bytes_per_sample(is->audio_tgt_fmt);
 +            } else {
 +                is->audio_buf = is->frame->data[0];
 +            }
 +
 +            /* if no pts, then compute it */
 +            pts = is->audio_clock;
 +            *pts_ptr = pts;
 +            is->audio_clock += (double)data_size / (dec->channels * dec->sample_rate * av_get_bytes_per_sample(dec->sample_fmt));
 +#ifdef DEBUG
 +            {
 +                static double last_clock;
 +                printf("audio: delay=%0.3f clock=%0.3f pts=%0.3f\n",
 +                       is->audio_clock - last_clock,
 +                       is->audio_clock, pts);
 +                last_clock = is->audio_clock;
 +            }
 +#endif
 +            return resampled_data_size;
 +        }
 +
 +        /* free the current packet */
 +        if (pkt->data)
 +            av_free_packet(pkt);
 +        memset(pkt_temp, 0, sizeof(*pkt_temp));
 +
 +        if (is->paused || is->audioq.abort_request) {
 +            return -1;
 +        }
 +
 +        /* read next packet */
 +        if ((new_packet = packet_queue_get(&is->audioq, pkt, 1)) < 0)
 +            return -1;
 +
 +        if (pkt->data == flush_pkt.data)
 +            avcodec_flush_buffers(dec);
 +
 +        *pkt_temp = *pkt;
 +
 +        /* if update the audio clock with the pts */
 +        if (pkt->pts != AV_NOPTS_VALUE) {
 +            is->audio_clock = av_q2d(is->audio_st->time_base)*pkt->pts;
 +        }
 +    }
 +}
 +
 +/* prepare a new audio buffer */
 +static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
 +{
 +    VideoState *is = opaque;
 +    int audio_size, len1;
 +    int bytes_per_sec;
 +    double pts;
 +
 +    audio_callback_time = av_gettime();
 +
 +    while (len > 0) {
 +        if (is->audio_buf_index >= is->audio_buf_size) {
 +           audio_size = audio_decode_frame(is, &pts);
 +           if (audio_size < 0) {
 +                /* if error, just output silence */
 +               is->audio_buf      = is->silence_buf;
 +               is->audio_buf_size = sizeof(is->silence_buf);
 +           } else {
 +               if (is->show_mode != SHOW_MODE_VIDEO)
 +                   update_sample_display(is, (int16_t *)is->audio_buf, audio_size);
 +               audio_size = synchronize_audio(is, (int16_t *)is->audio_buf, audio_size,
 +                                              pts);
 +               is->audio_buf_size = audio_size;
 +           }
 +           is->audio_buf_index = 0;
 +        }
 +        len1 = is->audio_buf_size - is->audio_buf_index;
 +        if (len1 > len)
 +            len1 = len;
 +        memcpy(stream, (uint8_t *)is->audio_buf + is->audio_buf_index, len1);
 +        len -= len1;
 +        stream += len1;
 +        is->audio_buf_index += len1;
 +    }
 +    bytes_per_sec = is->audio_tgt_freq * is->audio_tgt_channels * av_get_bytes_per_sample(is->audio_tgt_fmt);
 +    is->audio_write_buf_size = is->audio_buf_size - is->audio_buf_index;
 +    /* Let's assume the audio driver that is used by SDL has two periods. */
 +    is->audio_current_pts = is->audio_clock - (double)(2 * is->audio_hw_buf_size + is->audio_write_buf_size) / bytes_per_sec;
 +    is->audio_current_pts_drift = is->audio_current_pts - audio_callback_time / 1000000.0;
 +}
 +
 +/* open a given stream. Return 0 if OK */
 +static int stream_component_open(VideoState *is, int stream_index)
 +{
 +    AVFormatContext *ic = is->ic;
 +    AVCodecContext *avctx;
 +    AVCodec *codec;
 +    SDL_AudioSpec wanted_spec, spec;
 +    AVDictionary *opts;
 +    AVDictionaryEntry *t = NULL;
 +    int64_t wanted_channel_layout = 0;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return -1;
 +    avctx = ic->streams[stream_index]->codec;
 +
 +    codec = avcodec_find_decoder(avctx->codec_id);
 +    opts = filter_codec_opts(codec_opts, codec, ic, ic->streams[stream_index]);
 +
 +    switch(avctx->codec_type){
 +        case AVMEDIA_TYPE_AUDIO   : if(audio_codec_name   ) codec= avcodec_find_decoder_by_name(   audio_codec_name); break;
 +        case AVMEDIA_TYPE_SUBTITLE: if(subtitle_codec_name) codec= avcodec_find_decoder_by_name(subtitle_codec_name); break;
 +        case AVMEDIA_TYPE_VIDEO   : if(video_codec_name   ) codec= avcodec_find_decoder_by_name(   video_codec_name); break;
 +    }
 +    if (!codec)
 +        return -1;
 +
-     if(avctx->lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE;
-     avctx->idct_algo= idct;
-     if(fast) avctx->flags2 |= CODEC_FLAG2_FAST;
-     avctx->skip_frame= skip_frame;
-     avctx->skip_idct= skip_idct;
-     avctx->skip_loop_filter= skip_loop_filter;
-     avctx->error_recognition= error_recognition;
-     avctx->error_concealment= error_concealment;
++    avctx->workaround_bugs   = workaround_bugs;
++    avctx->lowres            = lowres;
 +    if(avctx->lowres > codec->max_lowres){
 +        av_log(avctx, AV_LOG_WARNING, "The maximum value for lowres supported by the decoder is %d\n",
 +                codec->max_lowres);
 +        avctx->lowres= codec->max_lowres;
 +    }
-     switch(avctx->codec_type) {
++    avctx->idct_algo         = idct;
++    avctx->skip_frame        = skip_frame;
++    avctx->skip_idct         = skip_idct;
++    avctx->skip_loop_filter  = skip_loop_filter;
++    avctx->error_recognition = error_recognition;
++    avctx->error_concealment = error_concealment;
 +
++    if(avctx->lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE;
++    if (fast)   avctx->flags2 |= CODEC_FLAG2_FAST;
 +    if(codec->capabilities & CODEC_CAP_DR1)
 +        avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        wanted_channel_layout = (avctx->channel_layout && avctx->channels == av_get_channel_layout_nb_channels(avctx->channels)) ? avctx->channel_layout : av_get_default_channel_layout(avctx->channels);
 +        wanted_channel_layout &= ~AV_CH_LAYOUT_STEREO_DOWNMIX;
 +        wanted_spec.channels = av_get_channel_layout_nb_channels(wanted_channel_layout);
 +        wanted_spec.freq = avctx->sample_rate;
 +        if (wanted_spec.freq <= 0 || wanted_spec.channels <= 0) {
 +            fprintf(stderr, "Invalid sample rate or channel count!\n");
 +            return -1;
 +        }
 +    }
 +
 +    if (!codec ||
 +        avcodec_open2(avctx, codec, &opts) < 0)
 +        return -1;
 +    if ((t = av_dict_get(opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        return AVERROR_OPTION_NOT_FOUND;
 +    }
 +
 +    /* prepare audio output */
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        wanted_spec.format = AUDIO_S16SYS;
 +        wanted_spec.silence = 0;
 +        wanted_spec.samples = SDL_AUDIO_BUFFER_SIZE;
 +        wanted_spec.callback = sdl_audio_callback;
 +        wanted_spec.userdata = is;
 +        if (SDL_OpenAudio(&wanted_spec, &spec) < 0) {
 +            fprintf(stderr, "SDL_OpenAudio: %s\n", SDL_GetError());
 +            return -1;
 +        }
 +        is->audio_hw_buf_size = spec.size;
 +        if (spec.format != AUDIO_S16SYS) {
 +            fprintf(stderr, "SDL advised audio format %d is not supported!\n", spec.format);
 +            return -1;
 +        }
 +        if (spec.channels != wanted_spec.channels) {
 +            wanted_channel_layout = av_get_default_channel_layout(spec.channels);
 +            if (!wanted_channel_layout) {
 +                fprintf(stderr, "SDL advised channel count %d is not supported!\n", spec.channels);
 +                return -1;
 +            }
 +        }
 +        is->audio_src_fmt = is->audio_tgt_fmt = AV_SAMPLE_FMT_S16;
 +        is->audio_src_freq = is->audio_tgt_freq = spec.freq;
 +        is->audio_src_channel_layout = is->audio_tgt_channel_layout = wanted_channel_layout;
 +        is->audio_src_channels = is->audio_tgt_channels = spec.channels;
 +    }
 +
 +    ic->streams[stream_index]->discard = AVDISCARD_DEFAULT;
-         is->audio_buf_size = 0;
++    switch (avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        is->audio_stream = stream_index;
 +        is->audio_st = ic->streams[stream_index];
-         is->audio_diff_avg_coef = exp(log(0.01) / AUDIO_DIFF_AVG_NB);
++        is->audio_buf_size  = 0;
 +        is->audio_buf_index = 0;
 +
 +        /* init averaging filter */
-     switch(avctx->codec_type) {
++        is->audio_diff_avg_coef  = exp(log(0.01) / AUDIO_DIFF_AVG_NB);
 +        is->audio_diff_avg_count = 0;
 +        /* since we do not have a precise anough audio fifo fullness,
 +           we correct audio sync only if larger than this threshold */
 +        is->audio_diff_threshold = 2.0 * SDL_AUDIO_BUFFER_SIZE / wanted_spec.freq;
 +
 +        memset(&is->audio_pkt, 0, sizeof(is->audio_pkt));
 +        packet_queue_init(&is->audioq);
 +        SDL_PauseAudio(0);
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_stream = stream_index;
 +        is->video_st = ic->streams[stream_index];
 +
 +        packet_queue_init(&is->videoq);
 +        is->video_tid = SDL_CreateThread(video_thread, is);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_stream = stream_index;
 +        is->subtitle_st = ic->streams[stream_index];
 +        packet_queue_init(&is->subtitleq);
 +
 +        is->subtitle_tid = SDL_CreateThread(subtitle_thread, is);
 +        break;
 +    default:
 +        break;
 +    }
 +    return 0;
 +}
 +
 +static void stream_component_close(VideoState *is, int stream_index)
 +{
 +    AVFormatContext *ic = is->ic;
 +    AVCodecContext *avctx;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return;
 +    avctx = ic->streams[stream_index]->codec;
 +
-     switch(avctx->codec_type) {
++    switch (avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        packet_queue_abort(&is->audioq);
 +
 +        SDL_CloseAudio();
 +
 +        packet_queue_end(&is->audioq);
 +        if (is->swr_ctx)
 +            swr_free(&is->swr_ctx);
 +        av_free_packet(&is->audio_pkt);
 +        av_freep(&is->audio_buf1);
 +        is->audio_buf = NULL;
 +        av_freep(&is->frame);
 +
 +        if (is->rdft) {
 +            av_rdft_end(is->rdft);
 +            av_freep(&is->rdft_data);
 +            is->rdft = NULL;
 +            is->rdft_bits = 0;
 +        }
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        packet_queue_abort(&is->videoq);
 +
 +        /* note: we also signal this mutex to make sure we deblock the
 +           video thread in all cases */
 +        SDL_LockMutex(is->pictq_mutex);
 +        SDL_CondSignal(is->pictq_cond);
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        SDL_WaitThread(is->video_tid, NULL);
 +
 +        packet_queue_end(&is->videoq);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        packet_queue_abort(&is->subtitleq);
 +
 +        /* note: we also signal this mutex to make sure we deblock the
 +           video thread in all cases */
 +        SDL_LockMutex(is->subpq_mutex);
 +        is->subtitle_stream_changed = 1;
 +
 +        SDL_CondSignal(is->subpq_cond);
 +        SDL_UnlockMutex(is->subpq_mutex);
 +
 +        SDL_WaitThread(is->subtitle_tid, NULL);
 +
 +        packet_queue_end(&is->subtitleq);
 +        break;
 +    default:
 +        break;
 +    }
 +
 +    ic->streams[stream_index]->discard = AVDISCARD_ALL;
 +    avcodec_close(avctx);
-     int eof=0;
++    switch (avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        is->audio_st = NULL;
 +        is->audio_stream = -1;
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_st = NULL;
 +        is->video_stream = -1;
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_st = NULL;
 +        is->subtitle_stream = -1;
 +        break;
 +    default:
 +        break;
 +    }
 +}
 +
 +static int decode_interrupt_cb(void *ctx)
 +{
 +    VideoState *is = ctx;
 +    return is->abort_request;
 +}
 +
 +/* this thread gets the stream from the disk or the network */
 +static int read_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    AVFormatContext *ic = NULL;
 +    int err, i, ret;
 +    int st_index[AVMEDIA_TYPE_NB];
 +    AVPacket pkt1, *pkt = &pkt1;
-     if(genpts)
++    int eof = 0;
 +    int pkt_in_play_range = 0;
 +    AVDictionaryEntry *t;
 +    AVDictionary **opts;
 +    int orig_nb_streams;
 +
 +    memset(st_index, -1, sizeof(st_index));
 +    is->video_stream = -1;
 +    is->audio_stream = -1;
 +    is->subtitle_stream = -1;
 +
 +    ic = avformat_alloc_context();
 +    ic->interrupt_callback.callback = decode_interrupt_cb;
 +    ic->interrupt_callback.opaque = is;
 +    err = avformat_open_input(&ic, is->filename, is->iformat, &format_opts);
 +    if (err < 0) {
 +        print_error(is->filename, err);
 +        ret = -1;
 +        goto fail;
 +    }
 +    if ((t = av_dict_get(format_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        ret = AVERROR_OPTION_NOT_FOUND;
 +        goto fail;
 +    }
 +    is->ic = ic;
 +
-     if(ic->pb)
-         ic->pb->eof_reached= 0; //FIXME hack, ffplay maybe should not use url_feof() to test for the end
++    if (genpts)
 +        ic->flags |= AVFMT_FLAG_GENPTS;
 +
 +    opts = setup_find_stream_info_opts(ic, codec_opts);
 +    orig_nb_streams = ic->nb_streams;
 +
 +    err = avformat_find_stream_info(ic, opts);
 +    if (err < 0) {
 +        fprintf(stderr, "%s: could not find codec parameters\n", is->filename);
 +        ret = -1;
 +        goto fail;
 +    }
 +    for (i = 0; i < orig_nb_streams; i++)
 +        av_dict_free(&opts[i]);
 +    av_freep(&opts);
 +
-     if(seek_by_bytes<0)
-         seek_by_bytes= !!(ic->iformat->flags & AVFMT_TS_DISCONT);
++    if (ic->pb)
++        ic->pb->eof_reached = 0; // FIXME hack, ffplay maybe should not use url_feof() to test for the end
 +
-     ret=-1;
++    if (seek_by_bytes < 0)
++        seek_by_bytes = !!(ic->iformat->flags & AVFMT_TS_DISCONT);
 +
 +    /* if seeking requested, we execute it */
 +    if (start_time != AV_NOPTS_VALUE) {
 +        int64_t timestamp;
 +
 +        timestamp = start_time;
 +        /* add the stream start time */
 +        if (ic->start_time != AV_NOPTS_VALUE)
 +            timestamp += ic->start_time;
 +        ret = avformat_seek_file(ic, -1, INT64_MIN, timestamp, INT64_MAX, 0);
 +        if (ret < 0) {
 +            fprintf(stderr, "%s: could not seek to position %0.3f\n",
 +                    is->filename, (double)timestamp / AV_TIME_BASE);
 +        }
 +    }
 +
 +    for (i = 0; i < ic->nb_streams; i++)
 +        ic->streams[i]->discard = AVDISCARD_ALL;
 +    if (!video_disable)
 +        st_index[AVMEDIA_TYPE_VIDEO] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_VIDEO,
 +                                wanted_stream[AVMEDIA_TYPE_VIDEO], -1, NULL, 0);
 +    if (!audio_disable)
 +        st_index[AVMEDIA_TYPE_AUDIO] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO,
 +                                wanted_stream[AVMEDIA_TYPE_AUDIO],
 +                                st_index[AVMEDIA_TYPE_VIDEO],
 +                                NULL, 0);
 +    if (!video_disable)
 +        st_index[AVMEDIA_TYPE_SUBTITLE] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_SUBTITLE,
 +                                wanted_stream[AVMEDIA_TYPE_SUBTITLE],
 +                                (st_index[AVMEDIA_TYPE_AUDIO] >= 0 ?
 +                                 st_index[AVMEDIA_TYPE_AUDIO] :
 +                                 st_index[AVMEDIA_TYPE_VIDEO]),
 +                                NULL, 0);
 +    if (show_status) {
 +        av_dump_format(ic, 0, is->filename, 0);
 +    }
 +
 +    is->show_mode = show_mode;
 +
 +    /* open the streams */
 +    if (st_index[AVMEDIA_TYPE_AUDIO] >= 0) {
 +        stream_component_open(is, st_index[AVMEDIA_TYPE_AUDIO]);
 +    }
 +
-         ret= stream_component_open(is, st_index[AVMEDIA_TYPE_VIDEO]);
++    ret = -1;
 +    if (st_index[AVMEDIA_TYPE_VIDEO] >= 0) {
-     for(;;) {
++        ret = stream_component_open(is, st_index[AVMEDIA_TYPE_VIDEO]);
 +    }
 +    is->refresh_tid = SDL_CreateThread(refresh_thread, is);
 +    if (is->show_mode == SHOW_MODE_NONE)
 +        is->show_mode = ret >= 0 ? SHOW_MODE_VIDEO : SHOW_MODE_RDFT;
 +
 +    if (st_index[AVMEDIA_TYPE_SUBTITLE] >= 0) {
 +        stream_component_open(is, st_index[AVMEDIA_TYPE_SUBTITLE]);
 +    }
 +
 +    if (is->video_stream < 0 && is->audio_stream < 0) {
 +        fprintf(stderr, "%s: could not open codecs\n", is->filename);
 +        ret = -1;
 +        goto fail;
 +    }
 +
-                 is->read_pause_return= av_read_pause(ic);
++    for (;;) {
 +        if (is->abort_request)
 +            break;
 +        if (is->paused != is->last_paused) {
 +            is->last_paused = is->paused;
 +            if (is->paused)
-             int64_t seek_target= is->seek_pos;
-             int64_t seek_min= is->seek_rel > 0 ? seek_target - is->seek_rel + 2: INT64_MIN;
-             int64_t seek_max= is->seek_rel < 0 ? seek_target - is->seek_rel - 2: INT64_MAX;
- //FIXME the +-2 is due to rounding being not done in the correct direction in generation
++                is->read_pause_return = av_read_pause(ic);
 +            else
 +                av_read_play(ic);
 +        }
 +#if CONFIG_RTSP_DEMUXER || CONFIG_MMSH_PROTOCOL
 +        if (is->paused &&
 +                (!strcmp(ic->iformat->name, "rtsp") ||
 +                 (ic->pb && !strncmp(input_filename, "mmsh:", 5)))) {
 +            /* wait 10 ms to avoid trying to get another packet */
 +            /* XXX: horrible */
 +            SDL_Delay(10);
 +            continue;
 +        }
 +#endif
 +        if (is->seek_req) {
-             }else{
++            int64_t seek_target = is->seek_pos;
++            int64_t seek_min    = is->seek_rel > 0 ? seek_target - is->seek_rel + 2: INT64_MIN;
++            int64_t seek_max    = is->seek_rel < 0 ? seek_target - is->seek_rel - 2: INT64_MAX;
++// FIXME the +-2 is due to rounding being not done in the correct direction in generation
 +//      of the seek_pos/seek_rel variables
 +
 +            ret = avformat_seek_file(is->ic, -1, seek_min, seek_target, seek_max, is->seek_flags);
 +            if (ret < 0) {
 +                fprintf(stderr, "%s: error while seeking\n", is->ic->filename);
-             eof= 0;
++            } else {
 +                if (is->audio_stream >= 0) {
 +                    packet_queue_flush(&is->audioq);
 +                    packet_queue_put(&is->audioq, &flush_pkt);
 +                }
 +                if (is->subtitle_stream >= 0) {
 +                    packet_queue_flush(&is->subtitleq);
 +                    packet_queue_put(&is->subtitleq, &flush_pkt);
 +                }
 +                if (is->video_stream >= 0) {
 +                    packet_queue_flush(&is->videoq);
 +                    packet_queue_put(&is->videoq, &flush_pkt);
 +                }
 +            }
 +            is->seek_req = 0;
-             || (   (is->audioq   .size  > MIN_AUDIOQ_SIZE || is->audio_stream<0)
-                 && (is->videoq   .nb_packets > MIN_FRAMES || is->video_stream<0)
-                 && (is->subtitleq.nb_packets > MIN_FRAMES || is->subtitle_stream<0))) {
++            eof = 0;
 +        }
 +
 +        /* if the queue are full, no need to read more */
 +        if (   is->audioq.size + is->videoq.size + is->subtitleq.size > MAX_QUEUE_SIZE
-         if(eof) {
-             if(is->video_stream >= 0){
++            || (   (is->audioq   .size  > MIN_AUDIOQ_SIZE || is->audio_stream < 0)
++                && (is->videoq   .nb_packets > MIN_FRAMES || is->video_stream < 0)
++                && (is->subtitleq.nb_packets > MIN_FRAMES || is->subtitle_stream < 0))) {
 +            /* wait 10 ms */
 +            SDL_Delay(10);
 +            continue;
 +        }
-                 pkt->data=NULL;
-                 pkt->size=0;
-                 pkt->stream_index= is->video_stream;
++        if (eof) {
++            if (is->video_stream >= 0) {
 +                av_init_packet(pkt);
-             if(is->audioq.size + is->videoq.size + is->subtitleq.size ==0){
-                 if(loop!=1 && (!loop || --loop)){
++                pkt->data = NULL;
++                pkt->size = 0;
++                pkt->stream_index = is->video_stream;
 +                packet_queue_put(&is->videoq, pkt);
 +            }
 +            if (is->audio_stream >= 0 &&
 +                is->audio_st->codec->codec->capabilities & CODEC_CAP_DELAY) {
 +                av_init_packet(pkt);
 +                pkt->data = NULL;
 +                pkt->size = 0;
 +                pkt->stream_index = is->audio_stream;
 +                packet_queue_put(&is->audioq, pkt);
 +            }
 +            SDL_Delay(10);
-                 }else if(autoexit){
-                     ret=AVERROR_EOF;
++            if (is->audioq.size + is->videoq.size + is->subtitleq.size == 0) {
++                if (loop != 1 && (!loop || --loop)) {
 +                    stream_seek(is, start_time != AV_NOPTS_VALUE ? start_time : 0, 0, 0);
-                 eof=1;
++                } else if (autoexit) {
++                    ret = AVERROR_EOF;
 +                    goto fail;
 +                }
 +            }
 +            eof=0;
 +            continue;
 +        }
 +        ret = av_read_frame(ic, pkt);
 +        if (ret < 0) {
 +            if (ret == AVERROR_EOF || url_feof(ic->pb))
-                 (double)(start_time != AV_NOPTS_VALUE ? start_time : 0)/1000000
-                 <= ((double)duration/1000000);
++                eof = 1;
 +            if (ic->pb && ic->pb->error)
 +                break;
 +            SDL_Delay(100); /* wait for user event */
 +            continue;
 +        }
 +        /* check if packet is in play range specified by user, then queue, otherwise discard */
 +        pkt_in_play_range = duration == AV_NOPTS_VALUE ||
 +                (pkt->pts - ic->streams[pkt->stream_index]->start_time) *
 +                av_q2d(ic->streams[pkt->stream_index]->time_base) -
-     is->ytop = 0;
-     is->xleft = 0;
++                (double)(start_time != AV_NOPTS_VALUE ? start_time : 0) / 1000000
++                <= ((double)duration / 1000000);
 +        if (pkt->stream_index == is->audio_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->audioq, pkt);
 +        } else if (pkt->stream_index == is->video_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->videoq, pkt);
 +        } else if (pkt->stream_index == is->subtitle_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->subtitleq, pkt);
 +        } else {
 +            av_free_packet(pkt);
 +        }
 +    }
 +    /* wait until the end */
 +    while (!is->abort_request) {
 +        SDL_Delay(100);
 +    }
 +
 +    ret = 0;
 + fail:
 +    /* close each stream */
 +    if (is->audio_stream >= 0)
 +        stream_component_close(is, is->audio_stream);
 +    if (is->video_stream >= 0)
 +        stream_component_close(is, is->video_stream);
 +    if (is->subtitle_stream >= 0)
 +        stream_component_close(is, is->subtitle_stream);
 +    if (is->ic) {
 +        avformat_close_input(&is->ic);
 +    }
 +
 +    if (ret != 0) {
 +        SDL_Event event;
 +
 +        event.type = FF_QUIT_EVENT;
 +        event.user.data1 = is;
 +        SDL_PushEvent(&event);
 +    }
 +    return 0;
 +}
 +
 +static VideoState *stream_open(const char *filename, AVInputFormat *iformat)
 +{
 +    VideoState *is;
 +
 +    is = av_mallocz(sizeof(VideoState));
 +    if (!is)
 +        return NULL;
 +    av_strlcpy(is->filename, filename, sizeof(is->filename));
 +    is->iformat = iformat;
-     is->pictq_cond = SDL_CreateCond();
++    is->ytop    = 0;
++    is->xleft   = 0;
 +
 +    /* start video display */
 +    is->pictq_mutex = SDL_CreateMutex();
-     is->subpq_cond = SDL_CreateCond();
++    is->pictq_cond  = SDL_CreateCond();
 +
 +    is->subpq_mutex = SDL_CreateMutex();
-     is->read_tid = SDL_CreateThread(read_thread, is);
++    is->subpq_cond  = SDL_CreateCond();
 +
 +    is->av_sync_type = av_sync_type;
-     for(;;) {
++    is->read_tid     = SDL_CreateThread(read_thread, is);
 +    if (!is->read_tid) {
 +        av_free(is);
 +        return NULL;
 +    }
 +    return is;
 +}
 +
 +static void stream_cycle_channel(VideoState *is, int codec_type)
 +{
 +    AVFormatContext *ic = is->ic;
 +    int start_index, stream_index;
 +    AVStream *st;
 +
 +    if (codec_type == AVMEDIA_TYPE_VIDEO)
 +        start_index = is->video_stream;
 +    else if (codec_type == AVMEDIA_TYPE_AUDIO)
 +        start_index = is->audio_stream;
 +    else
 +        start_index = is->subtitle_stream;
 +    if (start_index < (codec_type == AVMEDIA_TYPE_SUBTITLE ? -1 : 0))
 +        return;
 +    stream_index = start_index;
-             switch(codec_type) {
++    for (;;) {
 +        if (++stream_index >= is->ic->nb_streams)
 +        {
 +            if (codec_type == AVMEDIA_TYPE_SUBTITLE)
 +            {
 +                stream_index = -1;
 +                goto the_end;
 +            } else
 +                stream_index = 0;
 +        }
 +        if (stream_index == start_index)
 +            return;
 +        st = ic->streams[stream_index];
 +        if (st->codec->codec_type == codec_type) {
 +            /* check that parameters are OK */
-     for(;;) {
++            switch (codec_type) {
 +            case AVMEDIA_TYPE_AUDIO:
 +                if (st->codec->sample_rate != 0 &&
 +                    st->codec->channels != 0)
 +                    goto the_end;
 +                break;
 +            case AVMEDIA_TYPE_VIDEO:
 +            case AVMEDIA_TYPE_SUBTITLE:
 +                goto the_end;
 +            default:
 +                break;
 +            }
 +        }
 +    }
 + the_end:
 +    stream_component_close(is, start_index);
 +    stream_component_open(is, stream_index);
 +}
 +
 +
 +static void toggle_full_screen(VideoState *is)
 +{
 +    int i;
 +    is_full_screen = !is_full_screen;
 +#if defined(__APPLE__) && SDL_VERSION_ATLEAST(1, 2, 14)
 +    /* OS X needs to reallocate the SDL overlays */
 +    for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +        is->pictq[i].reallocate = 1;
 +    }
 +#endif
 +    video_open(is, 1);
 +}
 +
 +static void toggle_pause(VideoState *is)
 +{
 +    stream_toggle_pause(is);
 +    is->step = 0;
 +}
 +
 +static void step_to_next_frame(VideoState *is)
 +{
 +    /* if the stream is paused unpause it, then step */
 +    if (is->paused)
 +        stream_toggle_pause(is);
 +    is->step = 1;
 +}
 +
 +static void toggle_audio_display(VideoState *is)
 +{
 +    int bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +    is->show_mode = (is->show_mode + 1) % SHOW_MODE_NB;
 +    fill_rectangle(screen,
 +                is->xleft, is->ytop, is->width, is->height,
 +                bgcolor);
 +    SDL_UpdateRect(screen, is->xleft, is->ytop, is->width, is->height);
 +}
 +
 +/* handle an event sent by the GUI */
 +static void event_loop(VideoState *cur_stream)
 +{
 +    SDL_Event event;
 +    double incr, pos, frac;
 +
-         switch(event.type) {
++    for (;;) {
 +        double x;
 +        SDL_WaitEvent(&event);
-             switch(event.key.keysym.sym) {
++        switch (event.type) {
 +        case SDL_KEYDOWN:
 +            if (exit_on_keydown) {
 +                do_exit(cur_stream);
 +                break;
 +            }
-             case SDLK_s: //S: Step to next frame
++            switch (event.key.keysym.sym) {
 +            case SDLK_ESCAPE:
 +            case SDLK_q:
 +                do_exit(cur_stream);
 +                break;
 +            case SDLK_f:
 +                toggle_full_screen(cur_stream);
 +                break;
 +            case SDLK_p:
 +            case SDLK_SPACE:
 +                toggle_pause(cur_stream);
 +                break;
-                 if (seek_by_bytes) {
-                     if (cur_stream->video_stream >= 0 && cur_stream->video_current_pos>=0){
-                         pos= cur_stream->video_current_pos;
-                     }else if(cur_stream->audio_stream >= 0 && cur_stream->audio_pkt.pos>=0){
-                         pos= cur_stream->audio_pkt.pos;
-                     }else
-                         pos = avio_tell(cur_stream->ic->pb);
-                     if (cur_stream->ic->bit_rate)
-                         incr *= cur_stream->ic->bit_rate / 8.0;
-                     else
-                         incr *= 180000.0;
-                     pos += incr;
-                     stream_seek(cur_stream, pos, incr, 1);
-                 } else {
-                     pos = get_master_clock(cur_stream);
-                     pos += incr;
-                     stream_seek(cur_stream, (int64_t)(pos * AV_TIME_BASE), (int64_t)(incr * AV_TIME_BASE), 0);
-                 }
++            case SDLK_s: // S: Step to next frame
 +                step_to_next_frame(cur_stream);
 +                break;
 +            case SDLK_a:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_AUDIO);
 +                break;
 +            case SDLK_v:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_VIDEO);
 +                break;
 +            case SDLK_t:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_SUBTITLE);
 +                break;
 +            case SDLK_w:
 +                toggle_audio_display(cur_stream);
 +                break;
 +            case SDLK_PAGEUP:
 +                incr = 600.0;
 +                goto do_seek;
 +            case SDLK_PAGEDOWN:
 +                incr = -600.0;
 +                goto do_seek;
 +            case SDLK_LEFT:
 +                incr = -10.0;
 +                goto do_seek;
 +            case SDLK_RIGHT:
 +                incr = 10.0;
 +                goto do_seek;
 +            case SDLK_UP:
 +                incr = 60.0;
 +                goto do_seek;
 +            case SDLK_DOWN:
 +                incr = -60.0;
 +            do_seek:
-             if(event.type ==SDL_MOUSEBUTTONDOWN){
-                 x= event.button.x;
-             }else{
-                 if(event.motion.state != SDL_PRESSED)
++                    if (seek_by_bytes) {
++                        if (cur_stream->video_stream >= 0 && cur_stream->video_current_pos >= 0) {
++                            pos = cur_stream->video_current_pos;
++                        } else if (cur_stream->audio_stream >= 0 && cur_stream->audio_pkt.pos >= 0) {
++                            pos = cur_stream->audio_pkt.pos;
++                        } else
++                            pos = avio_tell(cur_stream->ic->pb);
++                        if (cur_stream->ic->bit_rate)
++                            incr *= cur_stream->ic->bit_rate / 8.0;
++                        else
++                            incr *= 180000.0;
++                        pos += incr;
++                        stream_seek(cur_stream, pos, incr, 1);
++                    } else {
++                        pos = get_master_clock(cur_stream);
++                        pos += incr;
++                        stream_seek(cur_stream, (int64_t)(pos * AV_TIME_BASE), (int64_t)(incr * AV_TIME_BASE), 0);
++                    }
 +                break;
 +            default:
 +                break;
 +            }
 +            break;
 +        case SDL_MOUSEBUTTONDOWN:
 +            if (exit_on_mousedown) {
 +                do_exit(cur_stream);
 +                break;
 +            }
 +        case SDL_MOUSEMOTION:
-                 x= event.motion.x;
-             }
-             if(seek_by_bytes || cur_stream->ic->duration<=0){
-                 uint64_t size=  avio_size(cur_stream->ic->pb);
-                 stream_seek(cur_stream, size*x/cur_stream->width, 0, 1);
-             }else{
-                 int64_t ts;
-                 int ns, hh, mm, ss;
-                 int tns, thh, tmm, tss;
-                 tns = cur_stream->ic->duration/1000000LL;
-                 thh = tns/3600;
-                 tmm = (tns%3600)/60;
-                 tss = (tns%60);
-                 frac = x/cur_stream->width;
-                 ns = frac*tns;
-                 hh = ns/3600;
-                 mm = (ns%3600)/60;
-                 ss = (ns%60);
-                 fprintf(stderr, "Seek to %2.0f%% (%2d:%02d:%02d) of total duration (%2d:%02d:%02d)       \n", frac*100,
-                         hh, mm, ss, thh, tmm, tss);
-                 ts = frac*cur_stream->ic->duration;
-                 if (cur_stream->ic->start_time != AV_NOPTS_VALUE)
-                     ts += cur_stream->ic->start_time;
-                 stream_seek(cur_stream, ts, 0, 0);
++            if (event.type == SDL_MOUSEBUTTONDOWN) {
++                x = event.button.x;
++            } else {
++                if (event.motion.state != SDL_PRESSED)
 +                    break;
-             screen = SDL_SetVideoMode(event.resize.w, event.resize.h, 0,
-                                       SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL);
-             screen_width = cur_stream->width = event.resize.w;
-             screen_height= cur_stream->height= event.resize.h;
++                x = event.motion.x;
 +            }
++                if (seek_by_bytes || cur_stream->ic->duration <= 0) {
++                    uint64_t size =  avio_size(cur_stream->ic->pb);
++                    stream_seek(cur_stream, size*x/cur_stream->width, 0, 1);
++                } else {
++                    int64_t ts;
++                    int ns, hh, mm, ss;
++                    int tns, thh, tmm, tss;
++                    tns  = cur_stream->ic->duration / 1000000LL;
++                    thh  = tns / 3600;
++                    tmm  = (tns % 3600) / 60;
++                    tss  = (tns % 60);
++                    frac = x / cur_stream->width;
++                    ns   = frac * tns;
++                    hh   = ns / 3600;
++                    mm   = (ns % 3600) / 60;
++                    ss   = (ns % 60);
++                    fprintf(stderr, "Seek to %2.0f%% (%2d:%02d:%02d) of total duration (%2d:%02d:%02d)       \n", frac*100,
++                            hh, mm, ss, thh, tmm, tss);
++                    ts = frac * cur_stream->ic->duration;
++                    if (cur_stream->ic->start_time != AV_NOPTS_VALUE)
++                        ts += cur_stream->ic->start_time;
++                    stream_seek(cur_stream, ts, 0, 0);
++                }
 +            break;
 +        case SDL_VIDEORESIZE:
-             cur_stream->refresh=0;
++                screen = SDL_SetVideoMode(event.resize.w, event.resize.h, 0,
++                                          SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL);
++                screen_width  = cur_stream->width  = event.resize.w;
++                screen_height = cur_stream->height = event.resize.h;
 +            break;
 +        case SDL_QUIT:
 +        case FF_QUIT_EVENT:
 +            do_exit(cur_stream);
 +            break;
 +        case FF_ALLOC_EVENT:
 +            video_open(event.user.data1, 0);
 +            alloc_picture(event.user.data1);
 +            break;
 +        case FF_REFRESH_EVENT:
 +            video_refresh(event.user.data1);
-     { "x", HAS_ARG, {(void*)opt_width}, "force displayed width", "width" },
-     { "y", HAS_ARG, {(void*)opt_height}, "force displayed height", "height" },
-     { "s", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" },
-     { "fs", OPT_BOOL, {(void*)&is_full_screen}, "force full screen" },
-     { "an", OPT_BOOL, {(void*)&audio_disable}, "disable audio" },
-     { "vn", OPT_BOOL, {(void*)&video_disable}, "disable video" },
-     { "ast", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_AUDIO]}, "select desired audio stream", "stream_number" },
-     { "vst", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_VIDEO]}, "select desired video stream", "stream_number" },
-     { "sst", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_SUBTITLE]}, "select desired subtitle stream", "stream_number" },
-     { "ss", HAS_ARG, {(void*)&opt_seek}, "seek to a given position in seconds", "pos" },
-     { "t", HAS_ARG, {(void*)&opt_duration}, "play  \"duration\" seconds of audio/video", "duration" },
-     { "bytes", OPT_INT | HAS_ARG, {(void*)&seek_by_bytes}, "seek by bytes 0=off 1=on -1=auto", "val" },
-     { "nodisp", OPT_BOOL, {(void*)&display_disable}, "disable graphical display" },
-     { "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },
-     { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_frame_pix_fmt}, "set pixel format", "format" },
-     { "stats", OPT_BOOL | OPT_EXPERT, {(void*)&show_status}, "show status", "" },
-     { "bug", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&workaround_bugs}, "workaround bugs", "" },
-     { "fast", OPT_BOOL | OPT_EXPERT, {(void*)&fast}, "non spec compliant optimizations", "" },
-     { "genpts", OPT_BOOL | OPT_EXPERT, {(void*)&genpts}, "generate pts", "" },
-     { "drp", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&decoder_reorder_pts}, "let decoder reorder pts 0=off 1=on -1=auto", ""},
-     { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&lowres}, "", "" },
-     { "skiploop", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_loop_filter}, "", "" },
-     { "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_frame}, "", "" },
-     { "skipidct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_idct}, "", "" },
-     { "idct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&idct}, "set idct algo",  "algo" },
-     { "er", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_recognition}, "set error detection threshold (0-4)",  "threshold" },
-     { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options",  "bit_mask" },
-     { "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
-     { "autoexit", OPT_BOOL | OPT_EXPERT, {(void*)&autoexit}, "exit at the end", "" },
-     { "exitonkeydown", OPT_BOOL | OPT_EXPERT, {(void*)&exit_on_keydown}, "exit on key down", "" },
-     { "exitonmousedown", OPT_BOOL | OPT_EXPERT, {(void*)&exit_on_mousedown}, "exit on mouse down", "" },
-     { "loop", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&loop}, "set number of times the playback shall be looped", "loop count" },
-     { "framedrop", OPT_BOOL | OPT_EXPERT, {(void*)&framedrop}, "drop frames when cpu is too slow", "" },
-     { "window_title", OPT_STRING | HAS_ARG, {(void*)&window_title}, "set window title", "window title" },
++            cur_stream->refresh = 0;
 +            break;
 +        default:
 +            break;
 +        }
 +    }
 +}
 +
 +static int opt_frame_size(const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "Option -s is deprecated, use -video_size.\n");
 +    return opt_default("video_size", arg);
 +}
 +
 +static int opt_width(const char *opt, const char *arg)
 +{
 +    screen_width = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX);
 +    return 0;
 +}
 +
 +static int opt_height(const char *opt, const char *arg)
 +{
 +    screen_height = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX);
 +    return 0;
 +}
 +
 +static int opt_format(const char *opt, const char *arg)
 +{
 +    file_iformat = av_find_input_format(arg);
 +    if (!file_iformat) {
 +        fprintf(stderr, "Unknown input format: %s\n", arg);
 +        return AVERROR(EINVAL);
 +    }
 +    return 0;
 +}
 +
 +static int opt_frame_pix_fmt(const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "Option -pix_fmt is deprecated, use -pixel_format.\n");
 +    return opt_default("pixel_format", arg);
 +}
 +
 +static int opt_sync(const char *opt, const char *arg)
 +{
 +    if (!strcmp(arg, "audio"))
 +        av_sync_type = AV_SYNC_AUDIO_MASTER;
 +    else if (!strcmp(arg, "video"))
 +        av_sync_type = AV_SYNC_VIDEO_MASTER;
 +    else if (!strcmp(arg, "ext"))
 +        av_sync_type = AV_SYNC_EXTERNAL_CLOCK;
 +    else {
 +        fprintf(stderr, "Unknown value for %s: %s\n", opt, arg);
 +        exit(1);
 +    }
 +    return 0;
 +}
 +
 +static int opt_seek(const char *opt, const char *arg)
 +{
 +    start_time = parse_time_or_die(opt, arg, 1);
 +    return 0;
 +}
 +
 +static int opt_duration(const char *opt, const char *arg)
 +{
 +    duration = parse_time_or_die(opt, arg, 1);
 +    return 0;
 +}
 +
 +static int opt_show_mode(const char *opt, const char *arg)
 +{
 +    show_mode = !strcmp(arg, "video") ? SHOW_MODE_VIDEO :
 +                !strcmp(arg, "waves") ? SHOW_MODE_WAVES :
 +                !strcmp(arg, "rdft" ) ? SHOW_MODE_RDFT  :
 +                parse_number_or_die(opt, arg, OPT_INT, 0, SHOW_MODE_NB-1);
 +    return 0;
 +}
 +
 +static void opt_input_file(void *optctx, const char *filename)
 +{
 +    if (input_filename) {
 +        fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
 +                filename, input_filename);
 +        exit_program(1);
 +    }
 +    if (!strcmp(filename, "-"))
 +        filename = "pipe:";
 +    input_filename = filename;
 +}
 +
 +static int opt_codec(void *o, const char *opt, const char *arg)
 +{
 +    switch(opt[strlen(opt)-1]){
 +    case 'a' :    audio_codec_name = arg; break;
 +    case 's' : subtitle_codec_name = arg; break;
 +    case 'v' :    video_codec_name = arg; break;
 +    }
 +    return 0;
 +}
 +
 +static int dummy;
 +
 +static const OptionDef options[] = {
 +#include "cmdutils_common_opts.h"
-     { "vf", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" },
++    { "x", HAS_ARG, { (void*)opt_width }, "force displayed width", "width" },
++    { "y", HAS_ARG, { (void*)opt_height }, "force displayed height", "height" },
++    { "s", HAS_ARG | OPT_VIDEO, { (void*)opt_frame_size }, "set frame size (WxH or abbreviation)", "size" },
++    { "fs", OPT_BOOL, { (void*)&is_full_screen }, "force full screen" },
++    { "an", OPT_BOOL, { (void*)&audio_disable }, "disable audio" },
++    { "vn", OPT_BOOL, { (void*)&video_disable }, "disable video" },
++    { "ast", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&wanted_stream[AVMEDIA_TYPE_AUDIO] }, "select desired audio stream", "stream_number" },
++    { "vst", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&wanted_stream[AVMEDIA_TYPE_VIDEO] }, "select desired video stream", "stream_number" },
++    { "sst", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&wanted_stream[AVMEDIA_TYPE_SUBTITLE] }, "select desired subtitle stream", "stream_number" },
++    { "ss", HAS_ARG, { (void*)&opt_seek }, "seek to a given position in seconds", "pos" },
++    { "t", HAS_ARG, { (void*)&opt_duration }, "play  \"duration\" seconds of audio/video", "duration" },
++    { "bytes", OPT_INT | HAS_ARG, { (void*)&seek_by_bytes }, "seek by bytes 0=off 1=on -1=auto", "val" },
++    { "nodisp", OPT_BOOL, { (void*)&display_disable }, "disable graphical display" },
++    { "f", HAS_ARG, { (void*)opt_format }, "force format", "fmt" },
++    { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { (void*)opt_frame_pix_fmt }, "set pixel format", "format" },
++    { "stats", OPT_BOOL | OPT_EXPERT, { (void*)&show_status }, "show status", "" },
++    { "bug", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&workaround_bugs }, "workaround bugs", "" },
++    { "fast", OPT_BOOL | OPT_EXPERT, { (void*)&fast }, "non spec compliant optimizations", "" },
++    { "genpts", OPT_BOOL | OPT_EXPERT, { (void*)&genpts }, "generate pts", "" },
++    { "drp", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&decoder_reorder_pts }, "let decoder reorder pts 0=off 1=on -1=auto", ""},
++    { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&lowres }, "", "" },
++    { "skiploop", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_loop_filter }, "", "" },
++    { "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_frame }, "", "" },
++    { "skipidct", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_idct }, "", "" },
++    { "idct", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&idct }, "set idct algo",  "algo" },
++    { "er", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&error_recognition }, "set error detection threshold (0-4)",  "threshold" },
++    { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&error_concealment }, "set error concealment options",  "bit_mask" },
++    { "sync", HAS_ARG | OPT_EXPERT, { (void*)opt_sync }, "set audio-video sync. type (type=audio/video/ext)", "type" },
++    { "autoexit", OPT_BOOL | OPT_EXPERT, { (void*)&autoexit }, "exit at the end", "" },
++    { "exitonkeydown", OPT_BOOL | OPT_EXPERT, { (void*)&exit_on_keydown }, "exit on key down", "" },
++    { "exitonmousedown", OPT_BOOL | OPT_EXPERT, { (void*)&exit_on_mousedown }, "exit on mouse down", "" },
++    { "loop", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&loop }, "set number of times the playback shall be looped", "loop count" },
++    { "framedrop", OPT_BOOL | OPT_EXPERT, { (void*)&framedrop }, "drop frames when cpu is too slow", "" },
++    { "window_title", OPT_STRING | HAS_ARG, { (void*)&window_title }, "set window title", "window title" },
 +#if CONFIG_AVFILTER
-     { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, {(void*)&rdftspeed}, "rdft speed", "msecs" },
++    { "vf", OPT_STRING | HAS_ARG, { (void*)&vfilters }, "video filters", "filter list" },
 +#endif
-     { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
++    { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, { (void*)&rdftspeed }, "rdft speed", "msecs" },
 +    { "showmode", HAS_ARG, {(void*)opt_show_mode}, "select show mode (0 = video, 1 = waves, 2 = RDFT)", "mode" },
-     flush_pkt.data= "FLUSH";
++    { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, { (void*)opt_default }, "generic catch all option", "" },
 +    { "i", OPT_BOOL, {(void *)&dummy}, "read specified file", "input_file"},
 +    { "codec", HAS_ARG | OPT_FUNC2, {(void*)opt_codec}, "force decoder", "decoder" },
 +    { NULL, },
 +};
 +
 +static void show_usage(void)
 +{
 +    printf("Simple media player\n");
 +    printf("usage: %s [options] input_file\n", program_name);
 +    printf("\n");
 +}
 +
 +static int opt_help(const char *opt, const char *arg)
 +{
 +    av_log_set_callback(log_callback_help);
 +    show_usage();
 +    show_help_options(options, "Main options:\n",
 +                      OPT_EXPERT, 0);
 +    show_help_options(options, "\nAdvanced options:\n",
 +                      OPT_EXPERT, OPT_EXPERT);
 +    printf("\n");
 +    show_help_children(avcodec_get_class(), AV_OPT_FLAG_DECODING_PARAM);
 +    show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);
 +#if !CONFIG_AVFILTER
 +    show_help_children(sws_get_class(), AV_OPT_FLAG_ENCODING_PARAM);
 +#endif
 +    printf("\nWhile playing:\n"
 +           "q, ESC              quit\n"
 +           "f                   toggle full screen\n"
 +           "p, SPC              pause\n"
 +           "a                   cycle audio channel\n"
 +           "v                   cycle video channel\n"
 +           "t                   cycle subtitle channel\n"
 +           "w                   show audio waves\n"
 +           "s                   activate frame-step mode\n"
 +           "left/right          seek backward/forward 10 seconds\n"
 +           "down/up             seek backward/forward 1 minute\n"
 +           "page down/page up   seek backward/forward 10 minutes\n"
 +           "mouse click         seek to percentage in file corresponding to fraction of width\n"
 +           );
 +    return 0;
 +}
 +
 +static int lockmgr(void **mtx, enum AVLockOp op)
 +{
 +   switch(op) {
 +      case AV_LOCK_CREATE:
 +          *mtx = SDL_CreateMutex();
 +          if(!*mtx)
 +              return 1;
 +          return 0;
 +      case AV_LOCK_OBTAIN:
 +          return !!SDL_LockMutex(*mtx);
 +      case AV_LOCK_RELEASE:
 +          return !!SDL_UnlockMutex(*mtx);
 +      case AV_LOCK_DESTROY:
 +          SDL_DestroyMutex(*mtx);
 +          return 0;
 +   }
 +   return 1;
 +}
 +
 +/* Called from the main */
 +int main(int argc, char **argv)
 +{
 +    int flags;
 +    VideoState *is;
 +
 +    av_log_set_flags(AV_LOG_SKIP_REPEATED);
 +    parse_loglevel(argc, argv, options);
 +
 +    /* register all codecs, demux and protocols */
 +    avcodec_register_all();
 +#if CONFIG_AVDEVICE
 +    avdevice_register_all();
 +#endif
 +#if CONFIG_AVFILTER
 +    avfilter_register_all();
 +#endif
 +    av_register_all();
 +    avformat_network_init();
 +
 +    init_opts();
 +
 +    show_banner(argc, argv, options);
 +
 +    parse_options(NULL, argc, argv, options, opt_input_file);
 +
 +    if (!input_filename) {
 +        show_usage();
 +        fprintf(stderr, "An input file must be specified\n");
 +        fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
 +        exit(1);
 +    }
 +
 +    if (display_disable) {
 +        video_disable = 1;
 +    }
 +    flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
 +    if (audio_disable)
 +        flags &= ~SDL_INIT_AUDIO;
 +#if !defined(__MINGW32__) && !defined(__APPLE__)
 +    flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */
 +#endif
 +    if (SDL_Init (flags)) {
 +        fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError());
 +        fprintf(stderr, "(Did you set the DISPLAY variable?)\n");
 +        exit(1);
 +    }
 +
 +    if (!display_disable) {
 +#if HAVE_SDL_VIDEO_SIZE
 +        const SDL_VideoInfo *vi = SDL_GetVideoInfo();
 +        fs_screen_width = vi->current_w;
 +        fs_screen_height = vi->current_h;
 +#endif
 +    }
 +
 +    SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
 +    SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
 +    SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
 +
 +    if (av_lockmgr_register(lockmgr)) {
 +        fprintf(stderr, "Could not initialize lock manager!\n");
 +        do_exit(NULL);
 +    }
 +
 +    av_init_packet(&flush_pkt);
++    flush_pkt.data = "FLUSH";
 +
 +    is = stream_open(input_filename, file_iformat);
 +    if (!is) {
 +        fprintf(stderr, "Failed to initialize VideoState!\n");
 +        do_exit(NULL);
 +    }
 +
 +    event_loop(is);
 +
 +    /* never returns */
 +
 +    return 0;
 +}
@@@ -796,9 -778,9 +796,13 @@@ typedef struct RcOverride
   */
  #define CODEC_CAP_PARAM_CHANGE     0x4000
  /**
+  * Codec supports avctx->thread_count == 0 (auto).
+  */
+ #define CODEC_CAP_AUTO_THREADS     0x8000
++/**
 + * Codec is lossless.
 + */
 +#define CODEC_CAP_LOSSLESS         0x80000000
  
  //The following defines may change, don't expect compatibility if you use them.
  #define MB_TYPE_INTRA4x4   0x0001
@@@ -34,10 -34,9 +34,10 @@@ typedef struct BFIContext 
      AVCodecContext *avctx;
      AVFrame frame;
      uint8_t *dst;
 +    uint32_t pal[256];
  } BFIContext;
  
- static av_cold int bfi_decode_init(AVCodecContext * avctx)
+ static av_cold int bfi_decode_init(AVCodecContext *avctx)
  {
      BFIContext *bfi = avctx->priv_data;
      avctx->pix_fmt = PIX_FMT_PAL8;
@@@ -77,10 -75,10 +77,10 @@@ static int bfi_decode_frame(AVCodecCont
              av_log(NULL, AV_LOG_ERROR, "Palette is too large.\n");
              return -1;
          }
-         pal = (uint32_t *) bfi->frame.data[1];
+         pal = (uint32_t *)bfi->frame.data[1];
          for (i = 0; i < avctx->extradata_size / 3; i++) {
              int shift = 16;
 -            *pal = 0;
 +            *pal = 0xFF << 24;
              for (j = 0; j < 3; j++, shift -= 8)
                  *pal +=
                      ((avctx->extradata[i * 3 + j] << 2) |
      } else {
          bfi->frame.pict_type = AV_PICTURE_TYPE_P;
          bfi->frame.key_frame = 0;
 +        bfi->frame.palette_has_changed = 0;
 +        memcpy(bfi->frame.data[1], bfi->pal, sizeof(bfi->pal));
      }
  
-     buf += 4; //Unpacked size, not required.
+     buf += 4; // Unpacked size, not required.
  
      while (dst != frame_end) {
-         static const uint8_t lentab[4]={0,2,0,1};
-         unsigned int byte = *buf++, av_uninit(offset);
-         unsigned int code = byte >> 6;
+         static const uint8_t lentab[4] = { 0, 2, 0, 1 };
+         unsigned int byte   = *buf++, av_uninit(offset);
+         unsigned int code   = byte >> 6;
          unsigned int length = byte & ~0xC0;
  
          if (buf >= buf_end) {
Simple merge
Simple merge
@@@ -189,11 -186,7 +189,11 @@@ static int get_logical_cpus(AVCodecCont
      nb_cpus = sysconf(_SC_NPROCESSORS_ONLN);
  #endif
      av_log(avctx, AV_LOG_DEBUG, "detected %d logical cores\n", nb_cpus);
-     return FFMIN(nb_cpus, MAX_AUTO_THREADS);
 +
 +    if  (avctx->height)
 +        nb_cpus = FFMIN(nb_cpus, (avctx->height+15)/16);
 +
+     return nb_cpus;
  }
  
  
@@@ -781,11 -769,11 +783,13 @@@ static int frame_thread_init(AVCodecCon
  
      if (!thread_count) {
          int nb_cpus = get_logical_cpus(avctx);
-         // use number of cores + 1 as thread count if there is motre than one
 +        if ((avctx->debug & (FF_DEBUG_VIS_QP | FF_DEBUG_VIS_MB_TYPE)) || avctx->debug_mv)
 +            nb_cpus = 1;
+         // use number of cores + 1 as thread count if there is more than one
          if (nb_cpus > 1)
-             thread_count = avctx->thread_count = nb_cpus + 1;
+             thread_count = avctx->thread_count = FFMIN(nb_cpus + 1, MAX_AUTO_THREADS);
+         else
+             thread_count = avctx->thread_count = 1;
      }
  
      if (thread_count <= 1) {
@@@ -765,8 -710,10 +765,10 @@@ int attribute_align_arg avcodec_open2(A
              goto free_and_end;
          }
      }
+     if (!HAVE_THREADS && !(codec->capabilities & CODEC_CAP_AUTO_THREADS))
+         avctx->thread_count = 1;
  
 -    if (avctx->codec->max_lowres < avctx->lowres) {
 +    if (avctx->codec->max_lowres < avctx->lowres || avctx->lowres < 0) {
          av_log(avctx, AV_LOG_ERROR, "The maximum value for lowres supported by the decoder is %d\n",
                 avctx->codec->max_lowres);
          ret = AVERROR(EINVAL);
@@@ -21,8 -21,8 +21,8 @@@
  #define AVCODEC_VERSION_H
  
  #define LIBAVCODEC_VERSION_MAJOR 53
 -#define LIBAVCODEC_VERSION_MINOR 32
 -#define LIBAVCODEC_VERSION_MICRO  2
 +#define LIBAVCODEC_VERSION_MINOR 49
- #define LIBAVCODEC_VERSION_MICRO 101
++#define LIBAVCODEC_VERSION_MICRO 102
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \
@@@ -1,25 -1,25 +1,25 @@@
- 0, 0, 308224, 0x7264439e
- 0, 11520, 308224, 0xe1734f4b
- 0, 23040, 308224, 0x9cfe28a4
- 0, 34560, 308224, 0xebb6ec8b
- 0, 46080, 308224, 0xaef16ca7
- 0, 57600, 308224, 0x0390b439
- 0, 69120, 308224, 0xe69bd008
- 0, 80640, 308224, 0xa1818468
- 0, 92160, 308224, 0x9d6e7d82
- 0, 103680, 308224, 0x54971a9e
- 0, 115200, 308224, 0xe14e15a8
- 0, 126720, 308224, 0xa026cf3f
- 0, 138240, 308224, 0xf8921be4
- 0, 149760, 308224, 0xf49a42cc
- 0, 161280, 308224, 0xa4108f17
- 0, 172800, 308224, 0xfa79cbfe
- 0, 184320, 308224, 0x3431f47b
- 0, 195840, 308224, 0x72aa3426
- 0, 207360, 308224, 0x81159f85
- 0, 218880, 308224, 0x04bcb289
- 0, 230400, 308224, 0xb1dabbcd
- 0, 241920, 308224, 0x7e851c8c
- 0, 253440, 308224, 0x8bdea0bf
- 0, 264960, 308224, 0xecacdb11
- 0, 276480, 308224, 0xec4c6c41
 -0, 0, 921600, 0x2e2b3ca4
 -0, 11520, 921600, 0x0ff7a368
 -0, 23040, 921600, 0xf5f0dc50
 -0, 34560, 921600, 0x56cb0c9d
 -0, 46080, 921600, 0xb253228f
 -0, 57600, 921600, 0xefd3419e
 -0, 69120, 921600, 0x708c0ce7
 -0, 80640, 921600, 0x0b3a7f6d
 -0, 92160, 921600, 0x72db4eac
 -0, 103680, 921600, 0x94328111
 -0, 115200, 921600, 0x95f7b2f0
 -0, 126720, 921600, 0xdc3c9655
 -0, 138240, 921600, 0xfe03dec6
 -0, 149760, 921600, 0x2551dffb
 -0, 161280, 921600, 0xe8b37d9e
 -0, 172800, 921600, 0xad93508b
 -0, 184320, 921600, 0x5a1c4890
 -0, 195840, 921600, 0x6f972fb4
 -0, 207360, 921600, 0xa1d5ff95
 -0, 218880, 921600, 0x7bc5d07c
 -0, 230400, 921600, 0xc0311e4e
 -0, 241920, 921600, 0x5b02cc48
 -0, 253440, 921600, 0x8db4d5fa
 -0, 264960, 921600, 0x31aae769
 -0, 276480, 921600, 0xab62b9a7
++0, 0, 921600, 0xb69faa34
++0, 11520, 921600, 0x38680829
++0, 23040, 921600, 0xa7263c5a
++0, 34560, 921600, 0xa784626a
++0, 46080, 921600, 0xb4c47212
++0, 57600, 921600, 0xd17285ea
++0, 69120, 921600, 0xe9b33902
++0, 80640, 921600, 0x215ea693
++0, 92160, 921600, 0xe2ab6c7a
++0, 103680, 921600, 0xf2867624
++0, 115200, 921600, 0x607d78c1
++0, 126720, 921600, 0x6e743bb7
++0, 138240, 921600, 0x1fbf8f5a
++0, 149760, 921600, 0xac6c912e
++0, 161280, 921600, 0x556933bc
++0, 172800, 921600, 0xda4c242b
++0, 184320, 921600, 0xa6b32f83
++0, 195840, 921600, 0x1ecc2996
++0, 207360, 921600, 0xf1c3fc0f
++0, 218880, 921600, 0x3f1db909
++0, 230400, 921600, 0x7582fb93
++0, 241920, 921600, 0x102ba261
++0, 253440, 921600, 0xfbcf9de0
++0, 264960, 921600, 0xe9ecb4d9
++0, 276480, 921600, 0x7ee36a42
@@@ -1,8 -1,8 +1,8 @@@
- 0, 0, 65024, 0x8f31c3f0
- 0, 6390, 65024, 0x164a2d82
- 0, 12780, 65024, 0xbb72b738
- 0, 19170, 65024, 0x45b93e3a
- 0, 25560, 65024, 0xcc4019df
- 0, 31950, 65024, 0x64644557
- 0, 38340, 65024, 0xb4584b28
- 0, 44730, 65024, 0x1d87966a
 -0, 0, 192000, 0xbabcbd55
 -0, 6390, 192000, 0xf00a5683
 -0, 12780, 192000, 0xcce90589
 -0, 19170, 192000, 0x8545631f
 -0, 25560, 192000, 0xd3ab654c
 -0, 31950, 192000, 0x5e0dda12
 -0, 38340, 192000, 0x7e94b053
 -0, 44730, 192000, 0x8027e68b
++0, 0, 192000, 0x7384f9b2
++0, 6390, 192000, 0xd1f61c71
++0, 12780, 192000, 0x0c6937d1
++0, 19170, 192000, 0x56459a3a
++0, 25560, 192000, 0x6d011790
++0, 31950, 192000, 0xb5347ce8
++0, 38340, 192000, 0xcd422568
++0, 44730, 192000, 0xde4fef2d
@@@ -1,9 -1,9 +1,9 @@@
- 0, 0, 65024, 0x10db5645
- 0, 6390, 65024, 0xb5d8a5bd
- 0, 12780, 65024, 0xc9555f27
- 0, 19170, 65024, 0x74c43f84
- 0, 25560, 65024, 0x5b2445b0
- 0, 31950, 65024, 0x8bd5be38
- 0, 38340, 65024, 0x75ec97da
- 0, 44730, 65024, 0x34416636
- 0, 51120, 65024, 0x9cc2abcf
 -0, 0, 192000, 0x8b8bd8de
 -0, 6390, 192000, 0xdac26ec2
 -0, 12780, 192000, 0x0fc01c28
 -0, 19170, 192000, 0x1251eef7
 -0, 25560, 192000, 0x89eced0e
 -0, 31950, 192000, 0x4943d821
 -0, 38340, 192000, 0x49258ec9
 -0, 44730, 192000, 0x9afd5881
 -0, 51120, 192000, 0xb322b901
++0, 0, 192000, 0x4269d703
++0, 6390, 192000, 0xdf8667e7
++0, 12780, 192000, 0x450026ad
++0, 19170, 192000, 0x2528ea52
++0, 25560, 192000, 0x83bcd1ec
++0, 31950, 192000, 0x88d5ba27
++0, 38340, 192000, 0x44424577
++0, 44730, 192000, 0xd93f12a3
++0, 51120, 192000, 0xcd625f3e
@@@ -1,17 -1,17 +1,17 @@@
- 0, 0, 308224, 0x8dc9803f
- 0, 6390, 308224, 0x06308b37
- 0, 12780, 308224, 0xb8cb7be6
- 0, 19170, 308224, 0xc538862b
- 0, 25560, 308224, 0x8d4b7702
- 0, 31950, 308224, 0x97a479f0
- 0, 38340, 308224, 0x63d08e67
- 0, 44730, 308224, 0x470e8a18
- 0, 51120, 308224, 0x08aa6be4
- 0, 57510, 308224, 0x3b2f6f9a
- 0, 63900, 308224, 0xf0f1490c
- 0, 70290, 308224, 0xcb8b2ec5
- 0, 76680, 308224, 0xab361e75
- 0, 83070, 308224, 0x485aed6d
- 0, 89460, 308224, 0xd3e7ecb7
- 0, 95850, 308224, 0xa2c0d561
- 0, 102240, 308224, 0xd8f8ccd4
 -0, 0, 921600, 0x713f2da1
 -0, 6390, 921600, 0x9e772ec9
 -0, 12780, 921600, 0x9420310f
 -0, 19170, 921600, 0xd68f294f
 -0, 25560, 921600, 0xe25a1bcf
 -0, 31950, 921600, 0x32f903ec
 -0, 38340, 921600, 0xdb290b1c
 -0, 44730, 921600, 0x0b0d1b0f
 -0, 51120, 921600, 0x58430921
 -0, 57510, 921600, 0xe65dd39e
 -0, 63900, 921600, 0x146b3068
 -0, 70290, 921600, 0x6e1e7f78
 -0, 76680, 921600, 0x0166e01c
 -0, 83070, 921600, 0x83b86b56
 -0, 89460, 921600, 0xd52a1697
 -0, 95850, 921600, 0x5b38adc8
 -0, 102240, 921600, 0x457f6cea
++0, 0, 921600, 0x8a5d15df
++0, 6390, 921600, 0x92c01362
++0, 12780, 921600, 0xe1a31643
++0, 19170, 921600, 0x37a90fe2
++0, 25560, 921600, 0x74410783
++0, 31950, 921600, 0xecf4ef1a
++0, 38340, 921600, 0x4d7ff3d4
++0, 44730, 921600, 0xac820317
++0, 51120, 921600, 0xbe5ff56e
++0, 57510, 921600, 0x8e59c329
++0, 63900, 921600, 0x73bf23f3
++0, 70290, 921600, 0xb90c780f
++0, 76680, 921600, 0xfbd9dc32
++0, 83070, 921600, 0x30586821
++0, 89460, 921600, 0x6695195b
++0, 95850, 921600, 0xc449aa85
++0, 102240, 921600, 0xca6a391c
@@@ -1,10 -1,10 +1,10 @@@
- 0, 0, 65024, 0xbf9d558b
- 0, 9000, 65024, 0x4c7ea2ac
- 0, 18000, 65024, 0x4931827c
- 0, 27000, 65024, 0x5a9e09a7
- 0, 36000, 65024, 0x2b76eca9
- 0, 45000, 65024, 0xd5400a96
- 0, 54000, 65024, 0xcca17f23
- 0, 63000, 65024, 0xebca0dec
- 0, 72000, 65024, 0x07a73cfc
- 0, 81000, 65024, 0xdd5e4620
 -0, 0, 192000, 0x10380cf0
 -0, 9000, 192000, 0x1d74af4c
 -0, 18000, 192000, 0xd665492d
 -0, 27000, 192000, 0xbf544565
 -0, 36000, 192000, 0xf8a33b00
 -0, 45000, 192000, 0x7d08bbad
 -0, 54000, 192000, 0x10685a90
 -0, 63000, 192000, 0x0a1a9ef6
 -0, 72000, 192000, 0x3e967980
 -0, 81000, 192000, 0x9849f751
++0, 0, 192000, 0x236a1b54
++0, 9000, 192000, 0xfb438b68
++0, 18000, 192000, 0xde504563
++0, 27000, 192000, 0xfaf88e05
++0, 36000, 192000, 0xe15de5af
++0, 45000, 192000, 0x641fcca4
++0, 54000, 192000, 0x74899cb6
++0, 63000, 192000, 0x93fdb1b4
++0, 72000, 192000, 0x58d83456
++0, 81000, 192000, 0x7d3012ac
@@@ -1,13 -1,13 +1,13 @@@
- 0, 0, 308224, 0x5a24821c
- 0, 12780, 308224, 0xa1ecf793
- 0, 25560, 308224, 0xcb91afa5
- 0, 38340, 308224, 0x8b7e85b9
- 0, 51120, 308224, 0xe4755628
- 0, 63900, 308224, 0xe4755628
- 0, 76680, 308224, 0xe4755628
- 0, 89460, 308224, 0xe4755628
- 0, 102240, 308224, 0xe4755628
- 0, 115020, 308224, 0xe4755628
- 0, 127800, 308224, 0xdd6ca523
- 0, 140580, 308224, 0x961ba417
- 0, 153360, 308224, 0x5ed15e7f
 -0, 0, 921600, 0xe6309638
 -0, 12780, 921600, 0xa99a7665
 -0, 25560, 921600, 0x172ccfbb
 -0, 38340, 921600, 0xcf676571
 -0, 51120, 921600, 0x6a5077f2
 -0, 63900, 921600, 0x6a5077f2
 -0, 76680, 921600, 0x6a5077f2
 -0, 89460, 921600, 0x6a5077f2
 -0, 102240, 921600, 0x6a5077f2
 -0, 115020, 921600, 0x6a5077f2
 -0, 127800, 921600, 0xb83db404
 -0, 140580, 921600, 0x997ceb90
 -0, 153360, 921600, 0xd707157c
++0, 0, 921600, 0xd9e060e3
++0, 12780, 921600, 0x15e28dc7
++0, 25560, 921600, 0x78e8bfbc
++0, 38340, 921600, 0xe9407075
++0, 51120, 921600, 0xab818b8a
++0, 63900, 921600, 0xab818b8a
++0, 76680, 921600, 0xab818b8a
++0, 89460, 921600, 0xab818b8a
++0, 102240, 921600, 0xab818b8a
++0, 115020, 921600, 0xab818b8a
++0, 127800, 921600, 0xad5ad11c
++0, 140580, 921600, 0xe6e50f8c
++0, 153360, 921600, 0x9f127099
@@@ -1,15 -1,15 +1,15 @@@
- 0, 0, 65024, 0x54831a1a
- 0, 9000, 65024, 0x110f5bad
- 0, 18000, 65024, 0xdd4f97fa
- 0, 27000, 65024, 0x1ab375b2
- 0, 36000, 65024, 0x311b51d3
- 0, 45000, 65024, 0xb0614f71
- 0, 54000, 65024, 0x6d968927
- 0, 63000, 65024, 0x28d85028
- 0, 72000, 65024, 0x74ea41f5
- 0, 81000, 65024, 0x3480b067
- 0, 90000, 65024, 0x3e1115d4
- 0, 99000, 65024, 0x0c715b57
- 0, 108000, 65024, 0x3acaaea3
- 0, 117000, 65024, 0x1b60f1e8
- 0, 126000, 65024, 0xcee14632
 -0, 0, 192000, 0xc0941c10
 -0, 9000, 192000, 0xe2fe3ae5
 -0, 18000, 192000, 0x4a352d98
 -0, 27000, 192000, 0x7b78e0bb
 -0, 36000, 192000, 0x855c6675
 -0, 45000, 192000, 0xf443dad6
 -0, 54000, 192000, 0xe7e2a2e1
 -0, 63000, 192000, 0xa9009c58
 -0, 72000, 192000, 0x551855ab
 -0, 81000, 192000, 0x253908c7
 -0, 90000, 192000, 0x616213c4
 -0, 99000, 192000, 0xa381c3b1
 -0, 108000, 192000, 0xa2d64152
 -0, 117000, 192000, 0x34ed0f72
 -0, 126000, 192000, 0x05be63b4
++0, 0, 192000, 0x9754890f
++0, 9000, 192000, 0x01668965
++0, 18000, 192000, 0xbd1b5e12
++0, 27000, 192000, 0x2e97fb9f
++0, 36000, 192000, 0xf8b452e2
++0, 45000, 192000, 0xc6859449
++0, 54000, 192000, 0x910844f7
++0, 63000, 192000, 0x99443581
++0, 72000, 192000, 0xec52d1e5
++0, 81000, 192000, 0x2fc66c35
++0, 90000, 192000, 0xd9af7379
++0, 99000, 192000, 0x947a26ef
++0, 108000, 192000, 0x7b77ab28
++0, 117000, 192000, 0x2507637e
++0, 126000, 192000, 0x6ce8c0ea
@@@ -1,12 -1,12 +1,12 @@@
- 0, 0, 65024, 0x190f2398
- 0, 6390, 65024, 0x19d8c3e0
- 0, 12780, 65024, 0x848020a2
- 0, 19170, 65024, 0xbb64696f
- 0, 25560, 65024, 0x85886472
- 0, 31950, 65024, 0xc9c26668
- 0, 38340, 65024, 0xf24d1524
- 0, 44730, 65024, 0x64d98cd0
- 0, 51120, 65024, 0xa1323b5e
- 0, 57510, 65024, 0x9f48dcf9
- 0, 63900, 65024, 0x1a0591da
- 0, 70290, 65024, 0x8eabf12e
 -0, 0, 192000, 0x69f6a5f6
 -0, 6390, 192000, 0xc741d0a6
 -0, 12780, 192000, 0xba31e7a4
 -0, 19170, 192000, 0x7dc45080
 -0, 25560, 192000, 0x1c91dad5
 -0, 31950, 192000, 0x564b69b1
 -0, 38340, 192000, 0xdd9d9ae8
 -0, 44730, 192000, 0x605c05e1
 -0, 51120, 192000, 0xa5341ddb
 -0, 57510, 192000, 0x1ebff8ba
 -0, 63900, 192000, 0x240df237
 -0, 70290, 192000, 0xac641867
++0, 0, 192000, 0xb718dc63
++0, 6390, 192000, 0x2efb7b89
++0, 12780, 192000, 0x70827047
++0, 19170, 192000, 0x61e1fd2f
++0, 25560, 192000, 0x06f8bccd
++0, 31950, 192000, 0xf0362404
++0, 38340, 192000, 0xc00fc1b8
++0, 44730, 192000, 0x94265476
++0, 51120, 192000, 0x4b50ad23
++0, 57510, 192000, 0x4d578b60
++0, 63900, 192000, 0xfb14b875
++0, 70290, 192000, 0x81682338
@@@ -1,12 -1,12 +1,12 @@@
- 0, 0, 3648, 0xb6174031
- 0, 6390, 3648, 0x2e4649b0
- 0, 12780, 3648, 0xe05247cb
- 0, 19170, 3648, 0x003941f0
- 0, 25560, 3648, 0xa2563fed
- 0, 31950, 3648, 0x23d34cf1
- 0, 38340, 3648, 0x624f5173
- 0, 44730, 3648, 0xc07a491e
- 0, 51120, 3648, 0x74214090
- 0, 57510, 3648, 0xebfd469c
- 0, 63900, 3648, 0x60083f49
- 0, 70290, 3648, 0x6096486f
 -0, 0, 7866, 0xa0056fdb
 -0, 6390, 7866, 0xed906c7a
 -0, 12780, 7866, 0x1c6e6f7d
 -0, 19170, 7866, 0xa2c460f7
 -0, 25560, 7866, 0xcf2166d4
 -0, 31950, 7866, 0xea545432
 -0, 38340, 7866, 0x604a5a9e
 -0, 44730, 7866, 0xbbc95c89
 -0, 51120, 7866, 0x80b16b5b
 -0, 57510, 7866, 0x9a1660ae
 -0, 63900, 7866, 0x6f886b10
 -0, 70290, 7866, 0xad8b5c99
++0, 0, 7866, 0xab73dae7
++0, 6390, 7866, 0x100adec8
++0, 12780, 7866, 0x1a20ddfa
++0, 19170, 7866, 0xc358cd16
++0, 25560, 7866, 0xee0bd20e
++0, 31950, 7866, 0xef26bef9
++0, 38340, 7866, 0xa9d0c755
++0, 44730, 7866, 0x6c11cc7c
++0, 51120, 7866, 0x4d6ed988
++0, 57510, 7866, 0x9965cf24
++0, 63900, 7866, 0x9a12db24
++0, 70290, 7866, 0x2e85cfeb
@@@ -1,36 -1,36 +1,36 @@@
- 0, 0, 45932, 0xf9bc2e69
- 0, 6390, 45932, 0x5b8736ad
- 0, 12780, 45932, 0x4521ba17
- 0, 19170, 45932, 0xf3a374a9
- 0, 25560, 45932, 0x3fdfdc70
- 0, 31950, 45932, 0x4eb18dbb
- 0, 38340, 45932, 0x633c6377
- 0, 44730, 45932, 0x77dce8ba
- 0, 51120, 45932, 0x8246fecd
- 0, 57510, 45932, 0xe8864c0d
- 0, 63900, 45932, 0x995740d1
- 0, 70290, 45932, 0xc8a298ee
- 0, 76680, 45932, 0xa3535672
- 0, 83070, 45932, 0xb553f58b
- 0, 89460, 45932, 0x8a5b3b92
- 0, 95850, 45932, 0x1bcd50b0
- 0, 102240, 45932, 0xf22b0531
- 0, 108630, 45932, 0x5f62bc78
- 0, 115020, 45932, 0xc669075f
- 0, 121410, 45932, 0xae3b4e80
- 0, 127800, 45932, 0x3f52062f
- 0, 134190, 45932, 0xde97a978
- 0, 140580, 45932, 0x3ba7ca71
- 0, 146970, 45932, 0xe418aba1
- 0, 153360, 45932, 0xb8b3f24b
- 0, 159750, 45932, 0xd054791d
- 0, 166140, 45932, 0xddf121ce
- 0, 172530, 45932, 0xf0dcdd42
- 0, 178920, 45932, 0xd5aa9281
- 0, 185310, 45932, 0xffe8450b
- 0, 191700, 45932, 0x84f9424a
- 0, 198090, 45932, 0xe6c7592e
- 0, 204480, 45932, 0xc29c492d
- 0, 210870, 45932, 0x87186732
- 0, 217260, 45932, 0x02c73e12
- 0, 223650, 45932, 0x32eb90c8
 -0, 0, 134724, 0x2ab217de
 -0, 6390, 134724, 0xbf240f9a
 -0, 12780, 134724, 0x020a6010
 -0, 19170, 134724, 0x9a5f9374
 -0, 25560, 134724, 0x1e93a7e9
 -0, 31950, 134724, 0x9e4a4c55
 -0, 38340, 134724, 0x8f9d1bab
 -0, 44730, 134724, 0xb26ac45b
 -0, 51120, 134724, 0xc08706d2
 -0, 57510, 134724, 0x0806b031
 -0, 63900, 134724, 0x234dbb33
 -0, 70290, 134724, 0xe4cbfb2f
 -0, 76680, 134724, 0xf603f3fd
 -0, 83070, 134724, 0x205669d1
 -0, 89460, 134724, 0x7ddbb5e3
 -0, 95850, 134724, 0x8dfbb45a
 -0, 102240, 134724, 0x9632f681
 -0, 108630, 134724, 0x259e462c
 -0, 115020, 134724, 0x14f2bac1
 -0, 121410, 134724, 0xac3de7ed
 -0, 127800, 134724, 0x6b8af396
 -0, 134190, 134724, 0xd1e4bc1c
 -0, 140580, 134724, 0x716d1c73
 -0, 146970, 134724, 0x610956c8
 -0, 153360, 134724, 0x89ff8e86
 -0, 159750, 134724, 0xc3ea6b6f
 -0, 166140, 134724, 0x886688ef
 -0, 172530, 134724, 0xe60fc8c1
 -0, 178920, 134724, 0x22bd3131
 -0, 185310, 134724, 0xb1d74561
 -0, 191700, 134724, 0x61b069bc
 -0, 198090, 134724, 0x50b665c1
 -0, 204480, 134724, 0x027e5144
 -0, 210870, 134724, 0xfe0c31b4
 -0, 217260, 134724, 0x1e7a1f2d
 -0, 223650, 134724, 0x48bff03d
++0, 0, 134724, 0x53784ca9
++0, 6390, 134724, 0x14c345b7
++0, 12780, 134724, 0xe0d0dd51
++0, 19170, 134724, 0xd53b5610
++0, 25560, 134724, 0x7cbb8d47
++0, 31950, 134724, 0x875d67c4
++0, 38340, 134724, 0x9811c085
++0, 44730, 134724, 0x25f6d228
++0, 51120, 134724, 0x349495a0
++0, 57510, 134724, 0xd0d75311
++0, 63900, 134724, 0xb49cdfbb
++0, 70290, 134724, 0x9fa69518
++0, 76680, 134724, 0x28a1f58c
++0, 83070, 134724, 0xb8dab657
++0, 89460, 134724, 0x8c7e3b3b
++0, 95850, 134724, 0x37268acf
++0, 102240, 134724, 0xcce8ca02
++0, 108630, 134724, 0xe0fd0c28
++0, 115020, 134724, 0x5bdac906
++0, 121410, 134724, 0xdd850bf0
++0, 127800, 134724, 0x2002a228
++0, 134190, 134724, 0x633617ea
++0, 140580, 134724, 0x2a3ef337
++0, 146970, 134724, 0x507886c3
++0, 153360, 134724, 0x51c0f07b
++0, 159750, 134724, 0x5e73dce1
++0, 166140, 134724, 0x26acc6f0
++0, 172530, 134724, 0x360c4349
++0, 178920, 134724, 0xc7dbabd4
++0, 185310, 134724, 0x671bbf66
++0, 191700, 134724, 0x4d44df79
++0, 198090, 134724, 0x69eade5b
++0, 204480, 134724, 0x2b1bca82
++0, 210870, 134724, 0x8b16af47
++0, 217260, 134724, 0xb59fa1bd
++0, 223650, 134724, 0x2ec17c24
@@@ -1,6 -1,6 +1,6 @@@
- 0, 0, 77076, 0x33b3bf99
- 0, 6390, 77076, 0xde70a282
- 0, 12780, 77076, 0x8d4c10a4
- 0, 19170, 77076, 0xeb536bcc
- 0, 25560, 77076, 0x86cce3e8
- 0, 31950, 77076, 0x292df285
 -0, 0, 228150, 0x188c6d9b
 -0, 6390, 228150, 0x658dbf2f
 -0, 12780, 228150, 0xc09a4b2e
 -0, 19170, 228150, 0x8777bc7d
 -0, 25560, 228150, 0xa388f0ce
 -0, 31950, 228150, 0x4e06666e
++0, 0, 228150, 0xde68df49
++0, 6390, 228150, 0x8e12bcaf
++0, 12780, 228150, 0x851b04f7
++0, 19170, 228150, 0x7e5e0950
++0, 25560, 228150, 0x1d92219f
++0, 31950, 228150, 0x93caa693