Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Aug 2011 21:35:53 +0000 (23:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Aug 2011 21:35:53 +0000 (23:35 +0200)
* qatar/master:
  Fix NASM include directive
  dsputil_mmx: Honor HAVE_AMD3DNOW
  lavf,lavd: remove all usage of AVFormatParameters from demuxers.
  jack: add 'channels' private option.
  VC-1: fix reading of custom PAR.
  Remove redundant and dubious video codec detection by its extradata
  mpeg12: remove repeat-field code disabled since May 2002
  patch checklist: suggest fate instead of regression tests
  Turn on resampling on sudden size change instead of bailing out during recode.
  avtools: reinitialise filter chain when input video stream changes dimensions

Conflicts:
Makefile
avconv.c
doc/developer.texi
ffplay.c
libavcodec/x86/dsputil_mmx.c
libavdevice/libdc1394.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
41 files changed:
1  2 
avconv.c
common.mak
doc/developer.texi
ffmpeg.c
ffplay.c
libavcodec/mpeg12.c
libavcodec/x86/ac3dsp.asm
libavcodec/x86/dct32_sse.asm
libavcodec/x86/deinterlace.asm
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/dsputilenc_yasm.asm
libavcodec/x86/fft_mmx.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/vc1dsp_yasm.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/dv1394.c
libavdevice/fbdev.c
libavdevice/jack_audio.c
libavdevice/oss_audio.c
libavdevice/sndio_dec.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavformat/img2.c
libavformat/mpegts.c
libavformat/rawdec.c
libavformat/rmdec.c
libavformat/rtspdec.c
libavformat/tty.c

diff --cc avconv.c
Simple merge
diff --cc common.mak
@@@ -5,66 -5,6 +5,66 @@@
  # first so "all" becomes default target
  all: all-yes
  
- YASMFLAGS  += $(IFLAGS) -Pconfig.asm
 +ifndef SUBDIR
 +
 +ifndef V
 +Q      = @
 +ECHO   = printf "$(1)\t%s\n" $(2)
 +BRIEF  = CC AS YASM AR LD HOSTCC STRIP CP
 +SILENT = DEPCC YASMDEP RM RANLIB
 +MSG    = $@
 +M      = @$(call ECHO,$(TAG),$@);
 +$(foreach VAR,$(BRIEF), \
 +    $(eval override $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))
 +$(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))
 +$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL))
 +endif
 +
 +ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
 +
 +# NASM requires -I path terminated with /
 +IFLAGS     := -I. -I$(SRC_PATH)/
 +CPPFLAGS   := $(IFLAGS) $(CPPFLAGS)
 +CFLAGS     += $(ECFLAGS)
 +CCFLAGS     = $(CFLAGS)
++YASMFLAGS  += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
 +HOSTCFLAGS += $(IFLAGS)
 +LDFLAGS    := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)
 +
 +define COMPILE
 +       $($(1)DEP)
 +       $($(1)) $(CPPFLAGS) $($(1)FLAGS) $($(1)_DEPFLAGS) -c $($(1)_O) $<
 +endef
 +
 +COMPILE_C = $(call COMPILE,CC)
 +COMPILE_S = $(call COMPILE,AS)
 +
 +%.o: %.c
 +      $(COMPILE_C)
 +
 +%.o: %.S
 +      $(COMPILE_S)
 +
 +%.ho: %.h
 +      $(CC) $(CPPFLAGS) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
 +
 +%.ver: %.v
 +      $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
 +
 +%.c %.h: TAG = GEN
 +
 +# Dummy rule to stop make trying to rebuild removed or renamed headers
 +%.h:
 +      @:
 +
 +# Disable suffix rules.  Most of the builtin rules are suffix rules,
 +# so this saves some time on slow systems.
 +.SUFFIXES:
 +
 +# Do not delete intermediate files from chains of implicit rules
 +$(OBJS):
 +endif
 +
  OBJS-$(HAVE_MMX) +=  $(MMX-OBJS-yes)
  
  OBJS      += $(OBJS-yes)
@@@ -327,20 -314,15 +327,20 @@@ send a reminder by email. Your patch sh
  
  @enumerate
  @item
-     Does 'make fate' pass with the patch applied?
+     Does @code{make fate} pass with the patch applied?
  @item
 -    Does @code{make checkheaders} pass with the patch applied?
 +    Was the patch generated with git format-patch or send-email?
 +@item
 +    Did you sign off your patch? (git commit -s)
 +    See @url{http://kerneltrap.org/files/Jeremy/DCO.txt} for the meaning
 +    of sign off.
 +@item
 +    Did you provide a clear git commit log message?
  @item
 -    Is the patch against latest Libav git master branch?
 +    Is the patch against latest FFmpeg git master branch?
  @item
 -    Are you subscribed to the
 -    @uref{https://lists.libav.org/mailman/listinfo/libav-devel, libav-devel}
 -    mailing list? (Only list subscribers are allowed to post.)
 +    Are you subscribed to ffmpeg-devel?
 +    (the list is subscribers only due to spam)
  @item
      Have you checked that the changes are minimal, so that the same cannot be
      achieved with a smaller patch and/or simpler final code?
diff --cc ffmpeg.c
Simple merge
diff --cc ffplay.c
index 61f4bc0,0000000..d35983d
mode 100644,000000..100644
--- /dev/null
+++ b/ffplay.c
@@@ -1,3059 -1,0 +1,3073 @@@
 +/*
 + * ffplay : Simple Media Player based on the FFmpeg libraries
 + * Copyright (c) 2003 Fabrice Bellard
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
 + *
 + * FFmpeg is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with FFmpeg; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 + */
 +
 +#include "config.h"
 +#include <inttypes.h>
 +#include <math.h>
 +#include <limits.h>
 +#include "libavutil/avstring.h"
 +#include "libavutil/colorspace.h"
 +#include "libavutil/mathematics.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/imgutils.h"
 +#include "libavutil/dict.h"
 +#include "libavutil/parseutils.h"
 +#include "libavutil/samplefmt.h"
 +#include "libavutil/avassert.h"
 +#include "libavformat/avformat.h"
 +#include "libavdevice/avdevice.h"
 +#include "libswscale/swscale.h"
 +#include "libavcodec/audioconvert.h"
 +#include "libavutil/opt.h"
 +#include "libavcodec/avfft.h"
 +
 +#if CONFIG_AVFILTER
 +# include "libavfilter/avcodec.h"
 +# include "libavfilter/avfilter.h"
 +# include "libavfilter/avfiltergraph.h"
 +# include "libavfilter/vsink_buffer.h"
 +#endif
 +
 +#include <SDL.h>
 +#include <SDL_thread.h>
 +
 +#include "cmdutils.h"
 +
 +#include <unistd.h>
 +#include <assert.h>
 +
 +const char program_name[] = "ffplay";
 +const int program_birth_year = 2003;
 +
 +#define MAX_QUEUE_SIZE (15 * 1024 * 1024)
 +#define MIN_AUDIOQ_SIZE (20 * 16 * 1024)
 +#define MIN_FRAMES 5
 +
 +/* SDL audio buffer size, in samples. Should be small to have precise
 +   A/V sync as SDL does not have hardware buffer fullness info. */
 +#define SDL_AUDIO_BUFFER_SIZE 1024
 +
 +/* no AV sync correction is done if below the AV sync threshold */
 +#define AV_SYNC_THRESHOLD 0.01
 +/* no AV correction is done if too big error */
 +#define AV_NOSYNC_THRESHOLD 10.0
 +
 +#define FRAME_SKIP_FACTOR 0.05
 +
 +/* maximum audio speed change to get correct sync */
 +#define SAMPLE_CORRECTION_PERCENT_MAX 10
 +
 +/* we use about AUDIO_DIFF_AVG_NB A-V differences to make the average */
 +#define AUDIO_DIFF_AVG_NB   20
 +
 +/* NOTE: the size must be big enough to compensate the hardware audio buffersize size */
 +#define SAMPLE_ARRAY_SIZE (2*65536)
 +
 +static int sws_flags = SWS_BICUBIC;
 +
 +typedef struct PacketQueue {
 +    AVPacketList *first_pkt, *last_pkt;
 +    int nb_packets;
 +    int size;
 +    int abort_request;
 +    SDL_mutex *mutex;
 +    SDL_cond *cond;
 +} PacketQueue;
 +
 +#define VIDEO_PICTURE_QUEUE_SIZE 2
 +#define SUBPICTURE_QUEUE_SIZE 4
 +
 +typedef struct VideoPicture {
 +    double pts;                                  ///<presentation time stamp for this picture
 +    double target_clock;                         ///<av_gettime() time at which this should be displayed ideally
 +    double duration;                             ///<expected duration of the frame
 +    int64_t pos;                                 ///<byte position in file
 +    SDL_Overlay *bmp;
 +    int width, height; /* source height & width */
 +    int allocated;
 +    enum PixelFormat pix_fmt;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterBufferRef *picref;
 +#endif
 +} VideoPicture;
 +
 +typedef struct SubPicture {
 +    double pts; /* presentation time stamp for this picture */
 +    AVSubtitle sub;
 +} SubPicture;
 +
 +enum {
 +    AV_SYNC_AUDIO_MASTER, /* default choice */
 +    AV_SYNC_VIDEO_MASTER,
 +    AV_SYNC_EXTERNAL_CLOCK, /* synchronize to an external clock */
 +};
 +
 +typedef struct VideoState {
 +    SDL_Thread *read_tid;
 +    SDL_Thread *video_tid;
 +    SDL_Thread *refresh_tid;
 +    AVInputFormat *iformat;
 +    int no_background;
 +    int abort_request;
 +    int paused;
 +    int last_paused;
 +    int seek_req;
 +    int seek_flags;
 +    int64_t seek_pos;
 +    int64_t seek_rel;
 +    int read_pause_return;
 +    AVFormatContext *ic;
 +
 +    int audio_stream;
 +
 +    int av_sync_type;
 +    double external_clock; /* external clock base */
 +    int64_t external_clock_time;
 +
 +    double audio_clock;
 +    double audio_diff_cum; /* used for AV difference average computation */
 +    double audio_diff_avg_coef;
 +    double audio_diff_threshold;
 +    int audio_diff_avg_count;
 +    AVStream *audio_st;
 +    PacketQueue audioq;
 +    int audio_hw_buf_size;
 +    /* samples output by the codec. we reserve more space for avsync
 +       compensation */
 +    DECLARE_ALIGNED(16,uint8_t,audio_buf1)[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2];
 +    DECLARE_ALIGNED(16,uint8_t,audio_buf2)[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2];
 +    uint8_t *audio_buf;
 +    unsigned int audio_buf_size; /* in bytes */
 +    int audio_buf_index; /* in bytes */
 +    int audio_write_buf_size;
 +    AVPacket audio_pkt_temp;
 +    AVPacket audio_pkt;
 +    enum AVSampleFormat audio_src_fmt;
 +    AVAudioConvert *reformat_ctx;
 +    double audio_current_pts;
 +    double audio_current_pts_drift;
 +
 +    enum ShowMode {
 +        SHOW_MODE_NONE = -1, SHOW_MODE_VIDEO = 0, SHOW_MODE_WAVES, SHOW_MODE_RDFT, SHOW_MODE_NB
 +    } show_mode;
 +    int16_t sample_array[SAMPLE_ARRAY_SIZE];
 +    int sample_array_index;
 +    int last_i_start;
 +    RDFTContext *rdft;
 +    int rdft_bits;
 +    FFTSample *rdft_data;
 +    int xpos;
 +
 +    SDL_Thread *subtitle_tid;
 +    int subtitle_stream;
 +    int subtitle_stream_changed;
 +    AVStream *subtitle_st;
 +    PacketQueue subtitleq;
 +    SubPicture subpq[SUBPICTURE_QUEUE_SIZE];
 +    int subpq_size, subpq_rindex, subpq_windex;
 +    SDL_mutex *subpq_mutex;
 +    SDL_cond *subpq_cond;
 +
 +    double frame_timer;
 +    double frame_last_pts;
 +    double frame_last_delay;
 +    double video_clock;                          ///<pts of last decoded frame / predicted pts of next decoded frame
 +    int video_stream;
 +    AVStream *video_st;
 +    PacketQueue videoq;
 +    double video_current_pts;                    ///<current displayed pts (different from video_clock if frame fifos are used)
 +    double video_current_pts_drift;              ///<video_current_pts - time (av_gettime) at which we updated video_current_pts - used to have running video pts
 +    int64_t video_current_pos;                   ///<current displayed file pos
 +    VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE];
 +    int pictq_size, pictq_rindex, pictq_windex;
 +    SDL_mutex *pictq_mutex;
 +    SDL_cond *pictq_cond;
 +#if !CONFIG_AVFILTER
 +    struct SwsContext *img_convert_ctx;
 +#endif
 +
 +    char filename[1024];
 +    int width, height, xleft, ytop;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterContext *out_video_filter;          ///<the last filter in the video chain
 +#endif
 +
 +    float skip_frames;
 +    float skip_frames_index;
 +    int refresh;
 +} VideoState;
 +
 +static int opt_help(const char *opt, const char *arg);
 +
 +/* options specified by the user */
 +static AVInputFormat *file_iformat;
 +static const char *input_filename;
 +static const char *window_title;
 +static int fs_screen_width;
 +static int fs_screen_height;
 +static int screen_width = 0;
 +static int screen_height = 0;
 +static int audio_disable;
 +static int video_disable;
 +static int wanted_stream[AVMEDIA_TYPE_NB]={
 +    [AVMEDIA_TYPE_AUDIO]=-1,
 +    [AVMEDIA_TYPE_VIDEO]=-1,
 +    [AVMEDIA_TYPE_SUBTITLE]=-1,
 +};
 +static int seek_by_bytes=-1;
 +static int display_disable;
 +static int show_status = 1;
 +static int av_sync_type = AV_SYNC_AUDIO_MASTER;
 +static int64_t start_time = AV_NOPTS_VALUE;
 +static int64_t duration = AV_NOPTS_VALUE;
 +static int step = 0;
 +static int thread_count = 1;
 +static int workaround_bugs = 1;
 +static int fast = 0;
 +static int genpts = 0;
 +static int lowres = 0;
 +static int idct = FF_IDCT_AUTO;
 +static enum AVDiscard skip_frame= AVDISCARD_DEFAULT;
 +static enum AVDiscard skip_idct= AVDISCARD_DEFAULT;
 +static enum AVDiscard skip_loop_filter= AVDISCARD_DEFAULT;
 +static int error_recognition = FF_ER_CAREFUL;
 +static int error_concealment = 3;
 +static int decoder_reorder_pts= -1;
 +static int autoexit;
 +static int exit_on_keydown;
 +static int exit_on_mousedown;
 +static int loop=1;
 +static int framedrop=-1;
 +static enum ShowMode show_mode = SHOW_MODE_NONE;
 +
 +static int rdftspeed=20;
 +#if CONFIG_AVFILTER
 +static char *vfilters = NULL;
 +#endif
 +
 +/* current context */
 +static int is_full_screen;
 +static VideoState *cur_stream;
 +static int64_t audio_callback_time;
 +
 +static AVPacket flush_pkt;
 +
 +#define FF_ALLOC_EVENT   (SDL_USEREVENT)
 +#define FF_REFRESH_EVENT (SDL_USEREVENT + 1)
 +#define FF_QUIT_EVENT    (SDL_USEREVENT + 2)
 +
 +static SDL_Surface *screen;
 +
 +static int packet_queue_put(PacketQueue *q, AVPacket *pkt)
 +{
 +    AVPacketList *pkt1;
 +
 +    /* duplicate the packet */
 +    if (pkt!=&flush_pkt && av_dup_packet(pkt) < 0)
 +        return -1;
 +
 +    pkt1 = av_malloc(sizeof(AVPacketList));
 +    if (!pkt1)
 +        return -1;
 +    pkt1->pkt = *pkt;
 +    pkt1->next = NULL;
 +
 +
 +    SDL_LockMutex(q->mutex);
 +
 +    if (!q->last_pkt)
 +
 +        q->first_pkt = pkt1;
 +    else
 +        q->last_pkt->next = pkt1;
 +    q->last_pkt = pkt1;
 +    q->nb_packets++;
 +    q->size += pkt1->pkt.size + sizeof(*pkt1);
 +    /* XXX: should duplicate packet data in DV case */
 +    SDL_CondSignal(q->cond);
 +
 +    SDL_UnlockMutex(q->mutex);
 +    return 0;
 +}
 +
 +/* packet queue handling */
 +static void packet_queue_init(PacketQueue *q)
 +{
 +    memset(q, 0, sizeof(PacketQueue));
 +    q->mutex = SDL_CreateMutex();
 +    q->cond = SDL_CreateCond();
 +    packet_queue_put(q, &flush_pkt);
 +}
 +
 +static void packet_queue_flush(PacketQueue *q)
 +{
 +    AVPacketList *pkt, *pkt1;
 +
 +    SDL_LockMutex(q->mutex);
 +    for(pkt = q->first_pkt; pkt != NULL; pkt = pkt1) {
 +        pkt1 = pkt->next;
 +        av_free_packet(&pkt->pkt);
 +        av_freep(&pkt);
 +    }
 +    q->last_pkt = NULL;
 +    q->first_pkt = NULL;
 +    q->nb_packets = 0;
 +    q->size = 0;
 +    SDL_UnlockMutex(q->mutex);
 +}
 +
 +static void packet_queue_end(PacketQueue *q)
 +{
 +    packet_queue_flush(q);
 +    SDL_DestroyMutex(q->mutex);
 +    SDL_DestroyCond(q->cond);
 +}
 +
 +static void packet_queue_abort(PacketQueue *q)
 +{
 +    SDL_LockMutex(q->mutex);
 +
 +    q->abort_request = 1;
 +
 +    SDL_CondSignal(q->cond);
 +
 +    SDL_UnlockMutex(q->mutex);
 +}
 +
 +/* return < 0 if aborted, 0 if no packet and > 0 if packet.  */
 +static int packet_queue_get(PacketQueue *q, AVPacket *pkt, int block)
 +{
 +    AVPacketList *pkt1;
 +    int ret;
 +
 +    SDL_LockMutex(q->mutex);
 +
 +    for(;;) {
 +        if (q->abort_request) {
 +            ret = -1;
 +            break;
 +        }
 +
 +        pkt1 = q->first_pkt;
 +        if (pkt1) {
 +            q->first_pkt = pkt1->next;
 +            if (!q->first_pkt)
 +                q->last_pkt = NULL;
 +            q->nb_packets--;
 +            q->size -= pkt1->pkt.size + sizeof(*pkt1);
 +            *pkt = pkt1->pkt;
 +            av_free(pkt1);
 +            ret = 1;
 +            break;
 +        } else if (!block) {
 +            ret = 0;
 +            break;
 +        } else {
 +            SDL_CondWait(q->cond, q->mutex);
 +        }
 +    }
 +    SDL_UnlockMutex(q->mutex);
 +    return ret;
 +}
 +
 +static inline void fill_rectangle(SDL_Surface *screen,
 +                                  int x, int y, int w, int h, int color)
 +{
 +    SDL_Rect rect;
 +    rect.x = x;
 +    rect.y = y;
 +    rect.w = w;
 +    rect.h = h;
 +    SDL_FillRect(screen, &rect, color);
 +}
 +
 +#define ALPHA_BLEND(a, oldp, newp, s)\
 +((((oldp << s) * (255 - (a))) + (newp * (a))) / (255 << s))
 +
 +#define RGBA_IN(r, g, b, a, s)\
 +{\
 +    unsigned int v = ((const uint32_t *)(s))[0];\
 +    a = (v >> 24) & 0xff;\
 +    r = (v >> 16) & 0xff;\
 +    g = (v >> 8) & 0xff;\
 +    b = v & 0xff;\
 +}
 +
 +#define YUVA_IN(y, u, v, a, s, pal)\
 +{\
 +    unsigned int val = ((const uint32_t *)(pal))[*(const uint8_t*)(s)];\
 +    a = (val >> 24) & 0xff;\
 +    y = (val >> 16) & 0xff;\
 +    u = (val >> 8) & 0xff;\
 +    v = val & 0xff;\
 +}
 +
 +#define YUVA_OUT(d, y, u, v, a)\
 +{\
 +    ((uint32_t *)(d))[0] = (a << 24) | (y << 16) | (u << 8) | v;\
 +}
 +
 +
 +#define BPP 1
 +
 +static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, int imgh)
 +{
 +    int wrap, wrap3, width2, skip2;
 +    int y, u, v, a, u1, v1, a1, w, h;
 +    uint8_t *lum, *cb, *cr;
 +    const uint8_t *p;
 +    const uint32_t *pal;
 +    int dstx, dsty, dstw, dsth;
 +
 +    dstw = av_clip(rect->w, 0, imgw);
 +    dsth = av_clip(rect->h, 0, imgh);
 +    dstx = av_clip(rect->x, 0, imgw - dstw);
 +    dsty = av_clip(rect->y, 0, imgh - dsth);
 +    lum = dst->data[0] + dsty * dst->linesize[0];
 +    cb = dst->data[1] + (dsty >> 1) * dst->linesize[1];
 +    cr = dst->data[2] + (dsty >> 1) * dst->linesize[2];
 +
 +    width2 = ((dstw + 1) >> 1) + (dstx & ~dstw & 1);
 +    skip2 = dstx >> 1;
 +    wrap = dst->linesize[0];
 +    wrap3 = rect->pict.linesize[0];
 +    p = rect->pict.data[0];
 +    pal = (const uint32_t *)rect->pict.data[1];  /* Now in YCrCb! */
 +
 +    if (dsty & 1) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            cb++;
 +            cr++;
 +            lum++;
 +            p += BPP;
 +        }
 +        for(w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += 2 * BPP;
 +            lum += 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            p++;
 +            lum++;
 +        }
 +        p += wrap3 - dstw * BPP;
 +        lum += wrap - dstw - dstx;
 +        cb += dst->linesize[1] - width2 - skip2;
 +        cr += dst->linesize[2] - width2 - skip2;
 +    }
 +    for(h = dsth - (dsty & 1); h >= 2; h -= 2) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += -wrap3 + BPP;
 +            lum += -wrap + 1;
 +        }
 +        for(w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 2);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 2);
 +
 +            cb++;
 +            cr++;
 +            p += -wrap3 + 2 * BPP;
 +            lum += -wrap + 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += -wrap3 + BPP;
 +            lum += -wrap + 1;
 +        }
 +        p += wrap3 + (wrap3 - dstw * BPP);
 +        lum += wrap + (wrap - dstw - dstx);
 +        cb += dst->linesize[1] - width2 - skip2;
 +        cr += dst->linesize[2] - width2 - skip2;
 +    }
 +    /* handle odd height */
 +    if (h) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            cb++;
 +            cr++;
 +            lum++;
 +            p += BPP;
 +        }
 +        for(w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v, 1);
 +            cb++;
 +            cr++;
 +            p += 2 * BPP;
 +            lum += 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +        }
 +    }
 +}
 +
 +static void free_subpicture(SubPicture *sp)
 +{
 +    avsubtitle_free(&sp->sub);
 +}
 +
 +static void video_image_display(VideoState *is)
 +{
 +    VideoPicture *vp;
 +    SubPicture *sp;
 +    AVPicture pict;
 +    float aspect_ratio;
 +    int width, height, x, y;
 +    SDL_Rect rect;
 +    int i;
 +
 +    vp = &is->pictq[is->pictq_rindex];
 +    if (vp->bmp) {
 +#if CONFIG_AVFILTER
 +         if (vp->picref->video->sample_aspect_ratio.num == 0)
 +             aspect_ratio = 0;
 +         else
 +             aspect_ratio = av_q2d(vp->picref->video->sample_aspect_ratio);
 +#else
 +
 +        /* XXX: use variable in the frame */
 +        if (is->video_st->sample_aspect_ratio.num)
 +            aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio);
 +        else if (is->video_st->codec->sample_aspect_ratio.num)
 +            aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio);
 +        else
 +            aspect_ratio = 0;
 +#endif
 +        if (aspect_ratio <= 0.0)
 +            aspect_ratio = 1.0;
 +        aspect_ratio *= (float)vp->width / (float)vp->height;
 +
 +        if (is->subtitle_st) {
 +            if (is->subpq_size > 0) {
 +                sp = &is->subpq[is->subpq_rindex];
 +
 +                if (vp->pts >= sp->pts + ((float) sp->sub.start_display_time / 1000)) {
 +                    SDL_LockYUVOverlay (vp->bmp);
 +
 +                    pict.data[0] = vp->bmp->pixels[0];
 +                    pict.data[1] = vp->bmp->pixels[2];
 +                    pict.data[2] = vp->bmp->pixels[1];
 +
 +                    pict.linesize[0] = vp->bmp->pitches[0];
 +                    pict.linesize[1] = vp->bmp->pitches[2];
 +                    pict.linesize[2] = vp->bmp->pitches[1];
 +
 +                    for (i = 0; i < sp->sub.num_rects; i++)
 +                        blend_subrect(&pict, sp->sub.rects[i],
 +                                      vp->bmp->w, vp->bmp->h);
 +
 +                    SDL_UnlockYUVOverlay (vp->bmp);
 +                }
 +            }
 +        }
 +
 +
 +        /* XXX: we suppose the screen has a 1.0 pixel ratio */
 +        height = is->height;
 +        width = ((int)rint(height * aspect_ratio)) & ~1;
 +        if (width > is->width) {
 +            width = is->width;
 +            height = ((int)rint(width / aspect_ratio)) & ~1;
 +        }
 +        x = (is->width - width) / 2;
 +        y = (is->height - height) / 2;
 +        is->no_background = 0;
 +        rect.x = is->xleft + x;
 +        rect.y = is->ytop  + y;
 +        rect.w = FFMAX(width,  1);
 +        rect.h = FFMAX(height, 1);
 +        SDL_DisplayYUVOverlay(vp->bmp, &rect);
 +    }
 +}
 +
 +static inline int compute_mod(int a, int b)
 +{
 +    return a < 0 ? a%b + b : a%b;
 +}
 +
 +static void video_audio_display(VideoState *s)
 +{
 +    int i, i_start, x, y1, y, ys, delay, n, nb_display_channels;
 +    int ch, channels, h, h2, bgcolor, fgcolor;
 +    int16_t time_diff;
 +    int rdft_bits, nb_freq;
 +
 +    for(rdft_bits=1; (1<<rdft_bits)<2*s->height; rdft_bits++)
 +        ;
 +    nb_freq= 1<<(rdft_bits-1);
 +
 +    /* compute display index : center on currently output samples */
 +    channels = s->audio_st->codec->channels;
 +    nb_display_channels = channels;
 +    if (!s->paused) {
 +        int data_used= s->show_mode == SHOW_MODE_WAVES ? s->width : (2*nb_freq);
 +        n = 2 * channels;
 +        delay = s->audio_write_buf_size;
 +        delay /= n;
 +
 +        /* to be more precise, we take into account the time spent since
 +           the last buffer computation */
 +        if (audio_callback_time) {
 +            time_diff = av_gettime() - audio_callback_time;
 +            delay -= (time_diff * s->audio_st->codec->sample_rate) / 1000000;
 +        }
 +
 +        delay += 2*data_used;
 +        if (delay < data_used)
 +            delay = data_used;
 +
 +        i_start= x = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE);
 +        if (s->show_mode == SHOW_MODE_WAVES) {
 +            h= INT_MIN;
 +            for(i=0; i<1000; i+=channels){
 +                int idx= (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE;
 +                int a= s->sample_array[idx];
 +                int b= s->sample_array[(idx + 4*channels)%SAMPLE_ARRAY_SIZE];
 +                int c= s->sample_array[(idx + 5*channels)%SAMPLE_ARRAY_SIZE];
 +                int d= s->sample_array[(idx + 9*channels)%SAMPLE_ARRAY_SIZE];
 +                int score= a-d;
 +                if(h<score && (b^c)<0){
 +                    h= score;
 +                    i_start= idx;
 +                }
 +            }
 +        }
 +
 +        s->last_i_start = i_start;
 +    } else {
 +        i_start = s->last_i_start;
 +    }
 +
 +    bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +    if (s->show_mode == SHOW_MODE_WAVES) {
 +        fill_rectangle(screen,
 +                       s->xleft, s->ytop, s->width, s->height,
 +                       bgcolor);
 +
 +        fgcolor = SDL_MapRGB(screen->format, 0xff, 0xff, 0xff);
 +
 +        /* total height for one channel */
 +        h = s->height / nb_display_channels;
 +        /* graph height / 2 */
 +        h2 = (h * 9) / 20;
 +        for(ch = 0;ch < nb_display_channels; ch++) {
 +            i = i_start + ch;
 +            y1 = s->ytop + ch * h + (h / 2); /* position of center line */
 +            for(x = 0; x < s->width; x++) {
 +                y = (s->sample_array[i] * h2) >> 15;
 +                if (y < 0) {
 +                    y = -y;
 +                    ys = y1 - y;
 +                } else {
 +                    ys = y1;
 +                }
 +                fill_rectangle(screen,
 +                               s->xleft + x, ys, 1, y,
 +                               fgcolor);
 +                i += channels;
 +                if (i >= SAMPLE_ARRAY_SIZE)
 +                    i -= SAMPLE_ARRAY_SIZE;
 +            }
 +        }
 +
 +        fgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0xff);
 +
 +        for(ch = 1;ch < nb_display_channels; ch++) {
 +            y = s->ytop + ch * h;
 +            fill_rectangle(screen,
 +                           s->xleft, y, s->width, 1,
 +                           fgcolor);
 +        }
 +        SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height);
 +    }else{
 +        nb_display_channels= FFMIN(nb_display_channels, 2);
 +        if(rdft_bits != s->rdft_bits){
 +            av_rdft_end(s->rdft);
 +            av_free(s->rdft_data);
 +            s->rdft = av_rdft_init(rdft_bits, DFT_R2C);
 +            s->rdft_bits= rdft_bits;
 +            s->rdft_data= av_malloc(4*nb_freq*sizeof(*s->rdft_data));
 +        }
 +        {
 +            FFTSample *data[2];
 +            for(ch = 0;ch < nb_display_channels; ch++) {
 +                data[ch] = s->rdft_data + 2*nb_freq*ch;
 +                i = i_start + ch;
 +                for(x = 0; x < 2*nb_freq; x++) {
 +                    double w= (x-nb_freq)*(1.0/nb_freq);
 +                    data[ch][x]= s->sample_array[i]*(1.0-w*w);
 +                    i += channels;
 +                    if (i >= SAMPLE_ARRAY_SIZE)
 +                        i -= SAMPLE_ARRAY_SIZE;
 +                }
 +                av_rdft_calc(s->rdft, data[ch]);
 +            }
 +            //least efficient way to do this, we should of course directly access it but its more than fast enough
 +            for(y=0; y<s->height; y++){
 +                double w= 1/sqrt(nb_freq);
 +                int a= sqrt(w*sqrt(data[0][2*y+0]*data[0][2*y+0] + data[0][2*y+1]*data[0][2*y+1]));
 +                int b= (nb_display_channels == 2 ) ? sqrt(w*sqrt(data[1][2*y+0]*data[1][2*y+0]
 +                       + data[1][2*y+1]*data[1][2*y+1])) : a;
 +                a= FFMIN(a,255);
 +                b= FFMIN(b,255);
 +                fgcolor = SDL_MapRGB(screen->format, a, b, (a+b)/2);
 +
 +                fill_rectangle(screen,
 +                            s->xpos, s->height-y, 1, 1,
 +                            fgcolor);
 +            }
 +        }
 +        SDL_UpdateRect(screen, s->xpos, s->ytop, 1, s->height);
 +        s->xpos++;
 +        if(s->xpos >= s->width)
 +            s->xpos= s->xleft;
 +    }
 +}
 +
 +static void stream_close(VideoState *is)
 +{
 +    VideoPicture *vp;
 +    int i;
 +    /* XXX: use a special url_shutdown call to abort parse cleanly */
 +    is->abort_request = 1;
 +    SDL_WaitThread(is->read_tid, NULL);
 +    SDL_WaitThread(is->refresh_tid, NULL);
 +
 +    /* free all pictures */
 +    for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +        vp = &is->pictq[i];
 +#if CONFIG_AVFILTER
 +        if (vp->picref) {
 +            avfilter_unref_buffer(vp->picref);
 +            vp->picref = NULL;
 +        }
 +#endif
 +        if (vp->bmp) {
 +            SDL_FreeYUVOverlay(vp->bmp);
 +            vp->bmp = NULL;
 +        }
 +    }
 +    SDL_DestroyMutex(is->pictq_mutex);
 +    SDL_DestroyCond(is->pictq_cond);
 +    SDL_DestroyMutex(is->subpq_mutex);
 +    SDL_DestroyCond(is->subpq_cond);
 +#if !CONFIG_AVFILTER
 +    if (is->img_convert_ctx)
 +        sws_freeContext(is->img_convert_ctx);
 +#endif
 +    av_free(is);
 +}
 +
 +static void do_exit(void)
 +{
 +    if (cur_stream) {
 +        stream_close(cur_stream);
 +        cur_stream = NULL;
 +    }
 +    uninit_opts();
 +#if CONFIG_AVFILTER
 +    avfilter_uninit();
 +#endif
 +    if (show_status)
 +        printf("\n");
 +    SDL_Quit();
 +    av_log(NULL, AV_LOG_QUIET, "%s", "");
 +    exit(0);
 +}
 +
 +static int video_open(VideoState *is){
 +    int flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL;
 +    int w,h;
 +
 +    if(is_full_screen) flags |= SDL_FULLSCREEN;
 +    else               flags |= SDL_RESIZABLE;
 +
 +    if (is_full_screen && fs_screen_width) {
 +        w = fs_screen_width;
 +        h = fs_screen_height;
 +    } else if(!is_full_screen && screen_width){
 +        w = screen_width;
 +        h = screen_height;
 +#if CONFIG_AVFILTER
 +    }else if (is->out_video_filter && is->out_video_filter->inputs[0]){
 +        w = is->out_video_filter->inputs[0]->w;
 +        h = is->out_video_filter->inputs[0]->h;
 +#else
 +    }else if (is->video_st && is->video_st->codec->width){
 +        w = is->video_st->codec->width;
 +        h = is->video_st->codec->height;
 +#endif
 +    } else {
 +        w = 640;
 +        h = 480;
 +    }
 +    if(screen && is->width == screen->w && screen->w == w
 +       && is->height== screen->h && screen->h == h)
 +        return 0;
 +
 +#ifndef __APPLE__
 +    screen = SDL_SetVideoMode(w, h, 0, flags);
 +#else
 +    /* setting bits_per_pixel = 0 or 32 causes blank video on OS X */
 +    screen = SDL_SetVideoMode(w, h, 24, flags);
 +#endif
 +    if (!screen) {
 +        fprintf(stderr, "SDL: could not set video mode - exiting\n");
 +        do_exit();
 +    }
 +    if (!window_title)
 +        window_title = input_filename;
 +    SDL_WM_SetCaption(window_title, window_title);
 +
 +    is->width = screen->w;
 +    is->height = screen->h;
 +
 +    return 0;
 +}
 +
 +/* display the current picture, if any */
 +static void video_display(VideoState *is)
 +{
 +    if(!screen)
 +        video_open(cur_stream);
 +    if (is->audio_st && is->show_mode != SHOW_MODE_VIDEO)
 +        video_audio_display(is);
 +    else if (is->video_st)
 +        video_image_display(is);
 +}
 +
 +static int refresh_thread(void *opaque)
 +{
 +    VideoState *is= opaque;
 +    while(!is->abort_request){
 +        SDL_Event event;
 +        event.type = FF_REFRESH_EVENT;
 +        event.user.data1 = opaque;
 +        if(!is->refresh){
 +            is->refresh=1;
 +            SDL_PushEvent(&event);
 +        }
 +        //FIXME ideally we should wait the correct time but SDLs event passing is so slow it would be silly
 +        usleep(is->audio_st && is->show_mode != SHOW_MODE_VIDEO ? rdftspeed*1000 : 5000);
 +    }
 +    return 0;
 +}
 +
 +/* get the current audio clock value */
 +static double get_audio_clock(VideoState *is)
 +{
 +    if (is->paused) {
 +        return is->audio_current_pts;
 +    } else {
 +        return is->audio_current_pts_drift + av_gettime() / 1000000.0;
 +    }
 +}
 +
 +/* get the current video clock value */
 +static double get_video_clock(VideoState *is)
 +{
 +    if (is->paused) {
 +        return is->video_current_pts;
 +    } else {
 +        return is->video_current_pts_drift + av_gettime() / 1000000.0;
 +    }
 +}
 +
 +/* get the current external clock value */
 +static double get_external_clock(VideoState *is)
 +{
 +    int64_t ti;
 +    ti = av_gettime();
 +    return is->external_clock + ((ti - is->external_clock_time) * 1e-6);
 +}
 +
 +/* get the current master clock value */
 +static double get_master_clock(VideoState *is)
 +{
 +    double val;
 +
 +    if (is->av_sync_type == AV_SYNC_VIDEO_MASTER) {
 +        if (is->video_st)
 +            val = get_video_clock(is);
 +        else
 +            val = get_audio_clock(is);
 +    } else if (is->av_sync_type == AV_SYNC_AUDIO_MASTER) {
 +        if (is->audio_st)
 +            val = get_audio_clock(is);
 +        else
 +            val = get_video_clock(is);
 +    } else {
 +        val = get_external_clock(is);
 +    }
 +    return val;
 +}
 +
 +/* seek in the stream */
 +static void stream_seek(VideoState *is, int64_t pos, int64_t rel, int seek_by_bytes)
 +{
 +    if (!is->seek_req) {
 +        is->seek_pos = pos;
 +        is->seek_rel = rel;
 +        is->seek_flags &= ~AVSEEK_FLAG_BYTE;
 +        if (seek_by_bytes)
 +            is->seek_flags |= AVSEEK_FLAG_BYTE;
 +        is->seek_req = 1;
 +    }
 +}
 +
 +/* pause or resume the video */
 +static void stream_toggle_pause(VideoState *is)
 +{
 +    if (is->paused) {
 +        is->frame_timer += av_gettime() / 1000000.0 + is->video_current_pts_drift - is->video_current_pts;
 +        if(is->read_pause_return != AVERROR(ENOSYS)){
 +            is->video_current_pts = is->video_current_pts_drift + av_gettime() / 1000000.0;
 +        }
 +        is->video_current_pts_drift = is->video_current_pts - av_gettime() / 1000000.0;
 +    }
 +    is->paused = !is->paused;
 +}
 +
 +static double compute_target_time(double frame_current_pts, VideoState *is)
 +{
 +    double delay, sync_threshold, diff;
 +
 +    /* compute nominal delay */
 +    delay = frame_current_pts - is->frame_last_pts;
 +    if (delay <= 0 || delay >= 10.0) {
 +        /* if incorrect delay, use previous one */
 +        delay = is->frame_last_delay;
 +    } else {
 +        is->frame_last_delay = delay;
 +    }
 +    is->frame_last_pts = frame_current_pts;
 +
 +    /* update delay to follow master synchronisation source */
 +    if (((is->av_sync_type == AV_SYNC_AUDIO_MASTER && is->audio_st) ||
 +         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
 +        /* if video is slave, we try to correct big delays by
 +           duplicating or deleting a frame */
 +        diff = get_video_clock(is) - get_master_clock(is);
 +
 +        /* skip or repeat frame. We take into account the
 +           delay to compute the threshold. I still don't know
 +           if it is the best guess */
 +        sync_threshold = FFMAX(AV_SYNC_THRESHOLD, delay);
 +        if (fabs(diff) < AV_NOSYNC_THRESHOLD) {
 +            if (diff <= -sync_threshold)
 +                delay = 0;
 +            else if (diff >= sync_threshold)
 +                delay = 2 * delay;
 +        }
 +    }
 +    is->frame_timer += delay;
 +
 +    av_dlog(NULL, "video: delay=%0.3f pts=%0.3f A-V=%f\n",
 +            delay, frame_current_pts, -diff);
 +
 +    return is->frame_timer;
 +}
 +
 +/* called to display each frame */
 +static void video_refresh(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +
 +    SubPicture *sp, *sp2;
 +
 +    if (is->video_st) {
 +retry:
 +        if (is->pictq_size == 0) {
 +            //nothing to do, no picture to display in the que
 +        } else {
 +            double time= av_gettime()/1000000.0;
 +            double next_target;
 +            /* dequeue the picture */
 +            vp = &is->pictq[is->pictq_rindex];
 +
 +            if(time < vp->target_clock)
 +                return;
 +            /* update current video pts */
 +            is->video_current_pts = vp->pts;
 +            is->video_current_pts_drift = is->video_current_pts - time;
 +            is->video_current_pos = vp->pos;
 +            if(is->pictq_size > 1){
 +                VideoPicture *nextvp= &is->pictq[(is->pictq_rindex+1)%VIDEO_PICTURE_QUEUE_SIZE];
 +                assert(nextvp->target_clock >= vp->target_clock);
 +                next_target= nextvp->target_clock;
 +            }else{
 +                next_target= vp->target_clock + vp->duration;
 +            }
 +            if((framedrop>0 || (framedrop && is->audio_st)) && time > next_target){
 +                is->skip_frames *= 1.0 + FRAME_SKIP_FACTOR;
 +                if(is->pictq_size > 1 || time > next_target + 0.5){
 +                    /* update queue size and signal for next picture */
 +                    if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE)
 +                        is->pictq_rindex = 0;
 +
 +                    SDL_LockMutex(is->pictq_mutex);
 +                    is->pictq_size--;
 +                    SDL_CondSignal(is->pictq_cond);
 +                    SDL_UnlockMutex(is->pictq_mutex);
 +                    goto retry;
 +                }
 +            }
 +
 +            if(is->subtitle_st) {
 +                if (is->subtitle_stream_changed) {
 +                    SDL_LockMutex(is->subpq_mutex);
 +
 +                    while (is->subpq_size) {
 +                        free_subpicture(&is->subpq[is->subpq_rindex]);
 +
 +                        /* update queue size and signal for next picture */
 +                        if (++is->subpq_rindex == SUBPICTURE_QUEUE_SIZE)
 +                            is->subpq_rindex = 0;
 +
 +                        is->subpq_size--;
 +                    }
 +                    is->subtitle_stream_changed = 0;
 +
 +                    SDL_CondSignal(is->subpq_cond);
 +                    SDL_UnlockMutex(is->subpq_mutex);
 +                } else {
 +                    if (is->subpq_size > 0) {
 +                        sp = &is->subpq[is->subpq_rindex];
 +
 +                        if (is->subpq_size > 1)
 +                            sp2 = &is->subpq[(is->subpq_rindex + 1) % SUBPICTURE_QUEUE_SIZE];
 +                        else
 +                            sp2 = NULL;
 +
 +                        if ((is->video_current_pts > (sp->pts + ((float) sp->sub.end_display_time / 1000)))
 +                                || (sp2 && is->video_current_pts > (sp2->pts + ((float) sp2->sub.start_display_time / 1000))))
 +                        {
 +                            free_subpicture(sp);
 +
 +                            /* update queue size and signal for next picture */
 +                            if (++is->subpq_rindex == SUBPICTURE_QUEUE_SIZE)
 +                                is->subpq_rindex = 0;
 +
 +                            SDL_LockMutex(is->subpq_mutex);
 +                            is->subpq_size--;
 +                            SDL_CondSignal(is->subpq_cond);
 +                            SDL_UnlockMutex(is->subpq_mutex);
 +                        }
 +                    }
 +                }
 +            }
 +
 +            /* display picture */
 +            if (!display_disable)
 +                video_display(is);
 +
 +            /* update queue size and signal for next picture */
 +            if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE)
 +                is->pictq_rindex = 0;
 +
 +            SDL_LockMutex(is->pictq_mutex);
 +            is->pictq_size--;
 +            SDL_CondSignal(is->pictq_cond);
 +            SDL_UnlockMutex(is->pictq_mutex);
 +        }
 +    } else if (is->audio_st) {
 +        /* draw the next audio frame */
 +
 +        /* if only audio stream, then display the audio bars (better
 +           than nothing, just to test the implementation */
 +
 +        /* display picture */
 +        if (!display_disable)
 +            video_display(is);
 +    }
 +    if (show_status) {
 +        static int64_t last_time;
 +        int64_t cur_time;
 +        int aqsize, vqsize, sqsize;
 +        double av_diff;
 +
 +        cur_time = av_gettime();
 +        if (!last_time || (cur_time - last_time) >= 30000) {
 +            aqsize = 0;
 +            vqsize = 0;
 +            sqsize = 0;
 +            if (is->audio_st)
 +                aqsize = is->audioq.size;
 +            if (is->video_st)
 +                vqsize = is->videoq.size;
 +            if (is->subtitle_st)
 +                sqsize = is->subtitleq.size;
 +            av_diff = 0;
 +            if (is->audio_st && is->video_st)
 +                av_diff = get_audio_clock(is) - get_video_clock(is);
 +            printf("%7.2f A-V:%7.3f s:%3.1f aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64"   \r",
 +                   get_master_clock(is),
 +                   av_diff,
 +                   FFMAX(is->skip_frames-1, 0),
 +                   aqsize / 1024,
 +                   vqsize / 1024,
 +                   sqsize,
 +                   is->video_st ? is->video_st->codec->pts_correction_num_faulty_dts : 0,
 +                   is->video_st ? is->video_st->codec->pts_correction_num_faulty_pts : 0);
 +            fflush(stdout);
 +            last_time = cur_time;
 +        }
 +    }
 +}
 +
 +/* allocate a picture (needs to do that in main thread to avoid
 +   potential locking problems */
 +static void alloc_picture(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +
 +    vp = &is->pictq[is->pictq_windex];
 +
 +    if (vp->bmp)
 +        SDL_FreeYUVOverlay(vp->bmp);
 +
 +#if CONFIG_AVFILTER
 +    if (vp->picref)
 +        avfilter_unref_buffer(vp->picref);
 +    vp->picref = NULL;
 +
 +    vp->width   = is->out_video_filter->inputs[0]->w;
 +    vp->height  = is->out_video_filter->inputs[0]->h;
 +    vp->pix_fmt = is->out_video_filter->inputs[0]->format;
 +#else
 +    vp->width   = is->video_st->codec->width;
 +    vp->height  = is->video_st->codec->height;
 +    vp->pix_fmt = is->video_st->codec->pix_fmt;
 +#endif
 +
 +    vp->bmp = SDL_CreateYUVOverlay(vp->width, vp->height,
 +                                   SDL_YV12_OVERLAY,
 +                                   screen);
 +    if (!vp->bmp || vp->bmp->pitches[0] < vp->width) {
 +        /* SDL allocates a buffer smaller than requested if the video
 +         * overlay hardware is unable to support the requested size. */
 +        fprintf(stderr, "Error: the video system does not support an image\n"
 +                        "size of %dx%d pixels. Try using -lowres or -vf \"scale=w:h\"\n"
 +                        "to reduce the image size.\n", vp->width, vp->height );
 +        do_exit();
 +    }
 +
 +    SDL_LockMutex(is->pictq_mutex);
 +    vp->allocated = 1;
 +    SDL_CondSignal(is->pictq_cond);
 +    SDL_UnlockMutex(is->pictq_mutex);
 +}
 +
 +static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_t pos)
 +{
 +    VideoPicture *vp;
 +    double frame_delay, pts = pts1;
 +
 +    /* compute the exact PTS for the picture if it is omitted in the stream
 +     * pts1 is the dts of the pkt / pts of the frame */
 +    if (pts != 0) {
 +        /* update video clock with pts, if present */
 +        is->video_clock = pts;
 +    } else {
 +        pts = is->video_clock;
 +    }
 +    /* update video clock for next frame */
 +    frame_delay = av_q2d(is->video_st->codec->time_base);
 +    /* for MPEG2, the frame can be repeated, so we update the
 +       clock accordingly */
 +    frame_delay += src_frame->repeat_pict * (frame_delay * 0.5);
 +    is->video_clock += frame_delay;
 +
 +#if defined(DEBUG_SYNC) && 0
 +    printf("frame_type=%c clock=%0.3f pts=%0.3f\n",
 +           av_get_picture_type_char(src_frame->pict_type), pts, pts1);
 +#endif
 +
 +    /* wait until we have space to put a new picture */
 +    SDL_LockMutex(is->pictq_mutex);
 +
 +    if(is->pictq_size>=VIDEO_PICTURE_QUEUE_SIZE && !is->refresh)
 +        is->skip_frames= FFMAX(1.0 - FRAME_SKIP_FACTOR, is->skip_frames * (1.0-FRAME_SKIP_FACTOR));
 +
 +    while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE &&
 +           !is->videoq.abort_request) {
 +        SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +    }
 +    SDL_UnlockMutex(is->pictq_mutex);
 +
 +    if (is->videoq.abort_request)
 +        return -1;
 +
 +    vp = &is->pictq[is->pictq_windex];
 +
 +    vp->duration = frame_delay;
 +
 +    /* alloc or resize hardware picture buffer */
 +    if (!vp->bmp ||
 +#if CONFIG_AVFILTER
 +        vp->width  != is->out_video_filter->inputs[0]->w ||
 +        vp->height != is->out_video_filter->inputs[0]->h) {
 +#else
 +        vp->width != is->video_st->codec->width ||
 +        vp->height != is->video_st->codec->height) {
 +#endif
 +        SDL_Event event;
 +
 +        vp->allocated = 0;
 +
 +        /* the allocation must be done in the main thread to avoid
 +           locking problems */
 +        event.type = FF_ALLOC_EVENT;
 +        event.user.data1 = is;
 +        SDL_PushEvent(&event);
 +
 +        /* wait until the picture is allocated */
 +        SDL_LockMutex(is->pictq_mutex);
 +        while (!vp->allocated && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        if (is->videoq.abort_request)
 +            return -1;
 +    }
 +
 +    /* if the frame is not skipped, then display it */
 +    if (vp->bmp) {
 +        AVPicture pict;
 +#if CONFIG_AVFILTER
 +        if(vp->picref)
 +            avfilter_unref_buffer(vp->picref);
 +        vp->picref = src_frame->opaque;
 +#endif
 +
 +        /* get a pointer on the bitmap */
 +        SDL_LockYUVOverlay (vp->bmp);
 +
 +        memset(&pict,0,sizeof(AVPicture));
 +        pict.data[0] = vp->bmp->pixels[0];
 +        pict.data[1] = vp->bmp->pixels[2];
 +        pict.data[2] = vp->bmp->pixels[1];
 +
 +        pict.linesize[0] = vp->bmp->pitches[0];
 +        pict.linesize[1] = vp->bmp->pitches[2];
 +        pict.linesize[2] = vp->bmp->pitches[1];
 +
 +#if CONFIG_AVFILTER
 +        //FIXME use direct rendering
 +        av_picture_copy(&pict, (AVPicture *)src_frame,
 +                        vp->pix_fmt, vp->width, vp->height);
 +#else
 +        sws_flags = av_get_int(sws_opts, "sws_flags", NULL);
 +        is->img_convert_ctx = sws_getCachedContext(is->img_convert_ctx,
 +            vp->width, vp->height, vp->pix_fmt, vp->width, vp->height,
 +            PIX_FMT_YUV420P, sws_flags, NULL, NULL, NULL);
 +        if (is->img_convert_ctx == NULL) {
 +            fprintf(stderr, "Cannot initialize the conversion context\n");
 +            exit(1);
 +        }
 +        sws_scale(is->img_convert_ctx, src_frame->data, src_frame->linesize,
 +                  0, vp->height, pict.data, pict.linesize);
 +#endif
 +        /* update the bitmap content */
 +        SDL_UnlockYUVOverlay(vp->bmp);
 +
 +        vp->pts = pts;
 +        vp->pos = pos;
 +
 +        /* now we can update the picture count */
 +        if (++is->pictq_windex == VIDEO_PICTURE_QUEUE_SIZE)
 +            is->pictq_windex = 0;
 +        SDL_LockMutex(is->pictq_mutex);
 +        vp->target_clock= compute_target_time(vp->pts, is);
 +
 +        is->pictq_size++;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +    }
 +    return 0;
 +}
 +
 +static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacket *pkt)
 +{
 +    int got_picture, i;
 +
 +    if (packet_queue_get(&is->videoq, pkt, 1) < 0)
 +        return -1;
 +
 +    if (pkt->data == flush_pkt.data) {
 +        avcodec_flush_buffers(is->video_st->codec);
 +
 +        SDL_LockMutex(is->pictq_mutex);
 +        //Make sure there are no long delay timers (ideally we should just flush the que but thats harder)
 +        for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +            is->pictq[i].target_clock= 0;
 +        }
 +        while (is->pictq_size && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        is->video_current_pos = -1;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        is->frame_last_pts = AV_NOPTS_VALUE;
 +        is->frame_last_delay = 0;
 +        is->frame_timer = (double)av_gettime() / 1000000.0;
 +        is->skip_frames = 1;
 +        is->skip_frames_index = 0;
 +        return 0;
 +    }
 +
 +    avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt);
 +
 +    if (got_picture) {
 +        if (decoder_reorder_pts == -1) {
 +            *pts = frame->best_effort_timestamp;
 +        } else if (decoder_reorder_pts) {
 +            *pts = frame->pkt_pts;
 +        } else {
 +            *pts = frame->pkt_dts;
 +        }
 +
 +        if (*pts == AV_NOPTS_VALUE) {
 +            *pts = 0;
 +        }
 +
 +        is->skip_frames_index += 1;
 +        if(is->skip_frames_index >= is->skip_frames){
 +            is->skip_frames_index -= FFMAX(is->skip_frames, 1.0);
 +            return 1;
 +        }
 +
 +    }
 +    return 0;
 +}
 +
 +#if CONFIG_AVFILTER
 +typedef struct {
 +    VideoState *is;
 +    AVFrame *frame;
 +    int use_dr1;
 +} FilterPriv;
 +
 +static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    AVFilterContext *ctx = codec->opaque;
 +    AVFilterBufferRef  *ref;
 +    int perms = AV_PERM_WRITE;
 +    int i, w, h, stride[4];
 +    unsigned edge;
 +    int pixel_size;
 +
 +    av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE);
 +
 +    if (codec->codec->capabilities & CODEC_CAP_NEG_LINESIZES)
 +        perms |= AV_PERM_NEG_LINESIZES;
 +
 +    if(pic->buffer_hints & FF_BUFFER_HINTS_VALID) {
 +        if(pic->buffer_hints & FF_BUFFER_HINTS_READABLE) perms |= AV_PERM_READ;
 +        if(pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) perms |= AV_PERM_PRESERVE;
 +        if(pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) perms |= AV_PERM_REUSE2;
 +    }
 +    if(pic->reference) perms |= AV_PERM_READ | AV_PERM_PRESERVE;
 +
 +    w = codec->width;
 +    h = codec->height;
 +
 +    if(av_image_check_size(w, h, 0, codec))
 +        return -1;
 +
 +    avcodec_align_dimensions2(codec, &w, &h, stride);
 +    edge = codec->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width();
 +    w += edge << 1;
 +    h += edge << 1;
 +
 +    if(!(ref = avfilter_get_video_buffer(ctx->outputs[0], perms, w, h)))
 +        return -1;
 +
 +    pixel_size = av_pix_fmt_descriptors[ref->format].comp[0].step_minus1+1;
 +    ref->video->w = codec->width;
 +    ref->video->h = codec->height;
 +    for(i = 0; i < 4; i ++) {
 +        unsigned hshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_w : 0;
 +        unsigned vshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_h : 0;
 +
 +        if (ref->data[i]) {
 +            ref->data[i]    += ((edge * pixel_size) >> hshift) + ((edge * ref->linesize[i]) >> vshift);
 +        }
 +        pic->data[i]     = ref->data[i];
 +        pic->linesize[i] = ref->linesize[i];
 +    }
 +    pic->opaque = ref;
 +    pic->age    = INT_MAX;
 +    pic->type   = FF_BUFFER_TYPE_USER;
 +    pic->reordered_opaque = codec->reordered_opaque;
 +    if(codec->pkt) pic->pkt_pts = codec->pkt->pts;
 +    else           pic->pkt_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +static void input_release_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    memset(pic->data, 0, sizeof(pic->data));
 +    avfilter_unref_buffer(pic->opaque);
 +}
 +
 +static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    AVFilterBufferRef *ref = pic->opaque;
 +
 +    if (pic->data[0] == NULL) {
 +        pic->buffer_hints |= FF_BUFFER_HINTS_READABLE;
 +        return codec->get_buffer(codec, pic);
 +    }
 +
 +    if ((codec->width != ref->video->w) || (codec->height != ref->video->h) ||
 +        (codec->pix_fmt != ref->format)) {
 +        av_log(codec, AV_LOG_ERROR, "Picture properties changed.\n");
 +        return -1;
 +    }
 +
 +    pic->reordered_opaque = codec->reordered_opaque;
 +    if(codec->pkt) pic->pkt_pts = codec->pkt->pts;
 +    else           pic->pkt_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +static int input_init(AVFilterContext *ctx, const char *args, void *opaque)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    AVCodecContext *codec;
 +    if(!opaque) return -1;
 +
 +    priv->is = opaque;
 +    codec    = priv->is->video_st->codec;
 +    codec->opaque = ctx;
 +    if((codec->codec->capabilities & CODEC_CAP_DR1)
 +    ) {
 +        av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE);
 +        priv->use_dr1 = 1;
 +        codec->get_buffer     = input_get_buffer;
 +        codec->release_buffer = input_release_buffer;
 +        codec->reget_buffer   = input_reget_buffer;
 +        codec->thread_safe_callbacks = 1;
 +    }
 +
 +    priv->frame = avcodec_alloc_frame();
 +
 +    return 0;
 +}
 +
 +static void input_uninit(AVFilterContext *ctx)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    av_free(priv->frame);
 +}
 +
 +static int input_request_frame(AVFilterLink *link)
 +{
 +    FilterPriv *priv = link->src->priv;
 +    AVFilterBufferRef *picref;
 +    int64_t pts = 0;
 +    AVPacket pkt;
 +    int ret;
 +
 +    while (!(ret = get_video_frame(priv->is, priv->frame, &pts, &pkt)))
 +        av_free_packet(&pkt);
 +    if (ret < 0)
 +        return -1;
 +
 +    if(priv->use_dr1 && priv->frame->opaque) {
 +        picref = avfilter_ref_buffer(priv->frame->opaque, ~0);
 +    } else {
 +        picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h);
 +        av_image_copy(picref->data, picref->linesize,
 +                      priv->frame->data, priv->frame->linesize,
 +                      picref->format, link->w, link->h);
 +    }
 +    av_free_packet(&pkt);
 +
 +    avfilter_copy_frame_props(picref, priv->frame);
 +    picref->pts = pts;
 +
 +    avfilter_start_frame(link, picref);
 +    avfilter_draw_slice(link, 0, link->h, 1);
 +    avfilter_end_frame(link);
 +
 +    return 0;
 +}
 +
 +static int input_query_formats(AVFilterContext *ctx)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    enum PixelFormat pix_fmts[] = {
 +        priv->is->video_st->codec->pix_fmt, PIX_FMT_NONE
 +    };
 +
 +    avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts));
 +    return 0;
 +}
 +
 +static int input_config_props(AVFilterLink *link)
 +{
 +    FilterPriv *priv  = link->src->priv;
 +    AVCodecContext *c = priv->is->video_st->codec;
 +
 +    link->w = c->width;
 +    link->h = c->height;
 +    link->sample_aspect_ratio = priv->is->video_st->sample_aspect_ratio;
 +    link->time_base = priv->is->video_st->time_base;
 +
 +    return 0;
 +}
 +
 +static AVFilter input_filter =
 +{
 +    .name      = "ffplay_input",
 +
 +    .priv_size = sizeof(FilterPriv),
 +
 +    .init      = input_init,
 +    .uninit    = input_uninit,
 +
 +    .query_formats = input_query_formats,
 +
 +    .inputs    = (AVFilterPad[]) {{ .name = NULL }},
 +    .outputs   = (AVFilterPad[]) {{ .name = "default",
 +                                    .type = AVMEDIA_TYPE_VIDEO,
 +                                    .request_frame = input_request_frame,
 +                                    .config_props  = input_config_props, },
 +                                  { .name = NULL }},
 +};
 +
 +static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const char *vfilters)
 +{
 +    char sws_flags_str[128];
 +    int ret;
 +    enum PixelFormat pix_fmts[] = { PIX_FMT_YUV420P, PIX_FMT_NONE };
 +    AVFilterContext *filt_src = NULL, *filt_out = NULL;
 +    snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags);
 +    graph->scale_sws_opts = av_strdup(sws_flags_str);
 +
 +    if ((ret = avfilter_graph_create_filter(&filt_src, &input_filter, "src",
 +                                            NULL, is, graph)) < 0)
 +        return ret;
 +    if ((ret = avfilter_graph_create_filter(&filt_out, avfilter_get_by_name("buffersink"), "out",
 +                                            NULL, pix_fmts, graph)) < 0)
 +        return ret;
 +
 +    if(vfilters) {
 +        AVFilterInOut *outputs = avfilter_inout_alloc();
 +        AVFilterInOut *inputs  = avfilter_inout_alloc();
 +
 +        outputs->name    = av_strdup("in");
 +        outputs->filter_ctx = filt_src;
 +        outputs->pad_idx = 0;
 +        outputs->next    = NULL;
 +
 +        inputs->name    = av_strdup("out");
 +        inputs->filter_ctx = filt_out;
 +        inputs->pad_idx = 0;
 +        inputs->next    = NULL;
 +
 +        if ((ret = avfilter_graph_parse(graph, vfilters, &inputs, &outputs, NULL)) < 0)
 +            return ret;
 +        av_freep(&vfilters);
 +    } else {
 +        if ((ret = avfilter_link(filt_src, 0, filt_out, 0)) < 0)
 +            return ret;
 +    }
 +
 +    if ((ret = avfilter_graph_config(graph, NULL)) < 0)
 +        return ret;
 +
 +    is->out_video_filter = filt_out;
 +
 +    return ret;
 +}
 +
 +#endif  /* CONFIG_AVFILTER */
 +
 +static int video_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    AVFrame *frame= avcodec_alloc_frame();
 +    int64_t pts_int = AV_NOPTS_VALUE, pos = -1;
 +    double pts;
 +    int ret;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterGraph *graph = avfilter_graph_alloc();
 +    AVFilterContext *filt_out = NULL;
++    int last_w = is->video_st->codec->width;
++    int last_h = is->video_st->codec->height;
 +
 +    if ((ret = configure_video_filters(graph, is, vfilters)) < 0)
 +        goto the_end;
 +    filt_out = is->out_video_filter;
 +#endif
 +
 +    for(;;) {
 +#if !CONFIG_AVFILTER
 +        AVPacket pkt;
 +#else
 +        AVFilterBufferRef *picref;
 +        AVRational tb = filt_out->inputs[0]->time_base;
 +#endif
 +        while (is->paused && !is->videoq.abort_request)
 +            SDL_Delay(10);
 +#if CONFIG_AVFILTER
++        if (   last_w != is->video_st->codec->width
++            || last_h != is->video_st->codec->height) {
++            av_dlog(NULL, "Changing size %dx%d -> %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_vsink_buffer_get_video_buffer_ref(filt_out, &picref, 0);
 +        if (picref) {
 +            avfilter_fill_frame_from_video_buffer_ref(frame, picref);
 +            pts_int = picref->pts;
 +            pos     = picref->pos;
 +            frame->opaque = picref;
 +        }
 +
 +        if (av_cmp_q(tb, is->video_st->time_base)) {
 +            av_unused int64_t pts1 = pts_int;
 +            pts_int = av_rescale_q(pts_int, tb, is->video_st->time_base);
 +            av_dlog(NULL, "video_thread(): "
 +                    "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n",
 +                    tb.num, tb.den, pts1,
 +                    is->video_st->time_base.num, is->video_st->time_base.den, pts_int);
 +        }
 +#else
 +        ret = get_video_frame(is, frame, &pts_int, &pkt);
 +        pos = pkt.pos;
 +        av_free_packet(&pkt);
 +#endif
 +
 +        if (ret < 0) goto the_end;
 +
 +        if (!picref)
 +            continue;
 +
 +        pts = pts_int*av_q2d(is->video_st->time_base);
 +
 +        ret = queue_picture(is, frame, pts, pos);
 +
 +        if (ret < 0)
 +            goto the_end;
 +
 +        if (step)
 +            if (cur_stream)
 +                stream_toggle_pause(cur_stream);
 +    }
 + the_end:
 +#if CONFIG_AVFILTER
 +    avfilter_graph_free(&graph);
 +#endif
 +    av_free(frame);
 +    return 0;
 +}
 +
 +static int subtitle_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    SubPicture *sp;
 +    AVPacket pkt1, *pkt = &pkt1;
 +    int got_subtitle;
 +    double pts;
 +    int i, j;
 +    int r, g, b, y, u, v, a;
 +
 +    for(;;) {
 +        while (is->paused && !is->subtitleq.abort_request) {
 +            SDL_Delay(10);
 +        }
 +        if (packet_queue_get(&is->subtitleq, pkt, 1) < 0)
 +            break;
 +
 +        if(pkt->data == flush_pkt.data){
 +            avcodec_flush_buffers(is->subtitle_st->codec);
 +            continue;
 +        }
 +        SDL_LockMutex(is->subpq_mutex);
 +        while (is->subpq_size >= SUBPICTURE_QUEUE_SIZE &&
 +               !is->subtitleq.abort_request) {
 +            SDL_CondWait(is->subpq_cond, is->subpq_mutex);
 +        }
 +        SDL_UnlockMutex(is->subpq_mutex);
 +
 +        if (is->subtitleq.abort_request)
 +            return 0;
 +
 +        sp = &is->subpq[is->subpq_windex];
 +
 +       /* NOTE: ipts is the PTS of the _first_ picture beginning in
 +           this packet, if any */
 +        pts = 0;
 +        if (pkt->pts != AV_NOPTS_VALUE)
 +            pts = av_q2d(is->subtitle_st->time_base)*pkt->pts;
 +
 +        avcodec_decode_subtitle2(is->subtitle_st->codec, &sp->sub,
 +                                 &got_subtitle, pkt);
 +
 +        if (got_subtitle && sp->sub.format == 0) {
 +            sp->pts = pts;
 +
 +            for (i = 0; i < sp->sub.num_rects; i++)
 +            {
 +                for (j = 0; j < sp->sub.rects[i]->nb_colors; j++)
 +                {
 +                    RGBA_IN(r, g, b, a, (uint32_t*)sp->sub.rects[i]->pict.data[1] + j);
 +                    y = RGB_TO_Y_CCIR(r, g, b);
 +                    u = RGB_TO_U_CCIR(r, g, b, 0);
 +                    v = RGB_TO_V_CCIR(r, g, b, 0);
 +                    YUVA_OUT((uint32_t*)sp->sub.rects[i]->pict.data[1] + j, y, u, v, a);
 +                }
 +            }
 +
 +            /* now we can update the picture count */
 +            if (++is->subpq_windex == SUBPICTURE_QUEUE_SIZE)
 +                is->subpq_windex = 0;
 +            SDL_LockMutex(is->subpq_mutex);
 +            is->subpq_size++;
 +            SDL_UnlockMutex(is->subpq_mutex);
 +        }
 +        av_free_packet(pkt);
 +    }
 +    return 0;
 +}
 +
 +/* copy samples for viewing in editor window */
 +static void update_sample_display(VideoState *is, short *samples, int samples_size)
 +{
 +    int size, len;
 +
 +    size = samples_size / sizeof(short);
 +    while (size > 0) {
 +        len = SAMPLE_ARRAY_SIZE - is->sample_array_index;
 +        if (len > size)
 +            len = size;
 +        memcpy(is->sample_array + is->sample_array_index, samples, len * sizeof(short));
 +        samples += len;
 +        is->sample_array_index += len;
 +        if (is->sample_array_index >= SAMPLE_ARRAY_SIZE)
 +            is->sample_array_index = 0;
 +        size -= len;
 +    }
 +}
 +
 +/* return the new audio buffer size (samples can be added or deleted
 +   to get better sync if video or external master clock) */
 +static int synchronize_audio(VideoState *is, short *samples,
 +                             int samples_size1, double pts)
 +{
 +    int n, samples_size;
 +    double ref_clock;
 +
 +    n = 2 * is->audio_st->codec->channels;
 +    samples_size = samples_size1;
 +
 +    /* if not master, then we try to remove or add samples to correct the clock */
 +    if (((is->av_sync_type == AV_SYNC_VIDEO_MASTER && is->video_st) ||
 +         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
 +        double diff, avg_diff;
 +        int wanted_size, min_size, max_size, nb_samples;
 +
 +        ref_clock = get_master_clock(is);
 +        diff = get_audio_clock(is) - ref_clock;
 +
 +        if (diff < AV_NOSYNC_THRESHOLD) {
 +            is->audio_diff_cum = diff + is->audio_diff_avg_coef * is->audio_diff_cum;
 +            if (is->audio_diff_avg_count < AUDIO_DIFF_AVG_NB) {
 +                /* not enough measures to have a correct estimate */
 +                is->audio_diff_avg_count++;
 +            } else {
 +                /* estimate the A-V difference */
 +                avg_diff = is->audio_diff_cum * (1.0 - is->audio_diff_avg_coef);
 +
 +                if (fabs(avg_diff) >= is->audio_diff_threshold) {
 +                    wanted_size = samples_size + ((int)(diff * is->audio_st->codec->sample_rate) * n);
 +                    nb_samples = samples_size / n;
 +
 +                    min_size = ((nb_samples * (100 - SAMPLE_CORRECTION_PERCENT_MAX)) / 100) * n;
 +                    max_size = ((nb_samples * (100 + SAMPLE_CORRECTION_PERCENT_MAX)) / 100) * n;
 +                    if (wanted_size < min_size)
 +                        wanted_size = min_size;
 +                    else if (wanted_size > max_size)
 +                        wanted_size = max_size;
 +
 +                    /* add or remove samples to correction the synchro */
 +                    if (wanted_size < samples_size) {
 +                        /* remove samples */
 +                        samples_size = wanted_size;
 +                    } else if (wanted_size > samples_size) {
 +                        uint8_t *samples_end, *q;
 +                        int nb;
 +
 +                        /* add samples */
 +                        nb = (samples_size - wanted_size);
 +                        samples_end = (uint8_t *)samples + samples_size - n;
 +                        q = samples_end + n;
 +                        while (nb > 0) {
 +                            memcpy(q, samples_end, n);
 +                            q += n;
 +                            nb -= n;
 +                        }
 +                        samples_size = wanted_size;
 +                    }
 +                }
 +#if 0
 +                printf("diff=%f adiff=%f sample_diff=%d apts=%0.3f vpts=%0.3f %f\n",
 +                       diff, avg_diff, samples_size - samples_size1,
 +                       is->audio_clock, is->video_clock, is->audio_diff_threshold);
 +#endif
 +            }
 +        } else {
 +            /* too big difference : may be initial PTS errors, so
 +               reset A-V filter */
 +            is->audio_diff_avg_count = 0;
 +            is->audio_diff_cum = 0;
 +        }
 +    }
 +
 +    return samples_size;
 +}
 +
 +/* decode one audio frame and returns its uncompressed size */
 +static int audio_decode_frame(VideoState *is, double *pts_ptr)
 +{
 +    AVPacket *pkt_temp = &is->audio_pkt_temp;
 +    AVPacket *pkt = &is->audio_pkt;
 +    AVCodecContext *dec= is->audio_st->codec;
 +    int n, len1, data_size;
 +    double pts;
 +
 +    for(;;) {
 +        /* NOTE: the audio packet can contain several frames */
 +        while (pkt_temp->size > 0) {
 +            data_size = sizeof(is->audio_buf1);
 +            len1 = avcodec_decode_audio3(dec,
 +                                        (int16_t *)is->audio_buf1, &data_size,
 +                                        pkt_temp);
 +            if (len1 < 0) {
 +                /* if error, we skip the frame */
 +                pkt_temp->size = 0;
 +                break;
 +            }
 +
 +            pkt_temp->data += len1;
 +            pkt_temp->size -= len1;
 +            if (data_size <= 0)
 +                continue;
 +
 +            if (dec->sample_fmt != is->audio_src_fmt) {
 +                if (is->reformat_ctx)
 +                    av_audio_convert_free(is->reformat_ctx);
 +                is->reformat_ctx= av_audio_convert_alloc(AV_SAMPLE_FMT_S16, 1,
 +                                                         dec->sample_fmt, 1, NULL, 0);
 +                if (!is->reformat_ctx) {
 +                    fprintf(stderr, "Cannot convert %s sample format to %s sample format\n",
 +                        av_get_sample_fmt_name(dec->sample_fmt),
 +                        av_get_sample_fmt_name(AV_SAMPLE_FMT_S16));
 +                        break;
 +                }
 +                is->audio_src_fmt= dec->sample_fmt;
 +            }
 +
 +            if (is->reformat_ctx) {
 +                const void *ibuf[6]= {is->audio_buf1};
 +                void *obuf[6]= {is->audio_buf2};
 +                int istride[6]= {av_get_bytes_per_sample(dec->sample_fmt)};
 +                int ostride[6]= {2};
 +                int len= data_size/istride[0];
 +                if (av_audio_convert(is->reformat_ctx, obuf, ostride, ibuf, istride, len)<0) {
 +                    printf("av_audio_convert() failed\n");
 +                    break;
 +                }
 +                is->audio_buf= is->audio_buf2;
 +                /* FIXME: existing code assume that data_size equals framesize*channels*2
 +                          remove this legacy cruft */
 +                data_size= len*2;
 +            }else{
 +                is->audio_buf= is->audio_buf1;
 +            }
 +
 +            /* if no pts, then compute it */
 +            pts = is->audio_clock;
 +            *pts_ptr = pts;
 +            n = 2 * dec->channels;
 +            is->audio_clock += (double)data_size /
 +                (double)(n * dec->sample_rate);
 +#ifdef DEBUG
 +            {
 +                static double last_clock;
 +                printf("audio: delay=%0.3f clock=%0.3f pts=%0.3f\n",
 +                       is->audio_clock - last_clock,
 +                       is->audio_clock, pts);
 +                last_clock = is->audio_clock;
 +            }
 +#endif
 +            return data_size;
 +        }
 +
 +        /* free the current packet */
 +        if (pkt->data)
 +            av_free_packet(pkt);
 +
 +        if (is->paused || is->audioq.abort_request) {
 +            return -1;
 +        }
 +
 +        /* read next packet */
 +        if (packet_queue_get(&is->audioq, pkt, 1) < 0)
 +            return -1;
 +        if(pkt->data == flush_pkt.data){
 +            avcodec_flush_buffers(dec);
 +            continue;
 +        }
 +
 +        pkt_temp->data = pkt->data;
 +        pkt_temp->size = pkt->size;
 +
 +        /* if update the audio clock with the pts */
 +        if (pkt->pts != AV_NOPTS_VALUE) {
 +            is->audio_clock = av_q2d(is->audio_st->time_base)*pkt->pts;
 +        }
 +    }
 +}
 +
 +/* prepare a new audio buffer */
 +static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
 +{
 +    VideoState *is = opaque;
 +    int audio_size, len1;
 +    int bytes_per_sec;
 +    double pts;
 +
 +    audio_callback_time = av_gettime();
 +
 +    while (len > 0) {
 +        if (is->audio_buf_index >= is->audio_buf_size) {
 +           audio_size = audio_decode_frame(is, &pts);
 +           if (audio_size < 0) {
 +                /* if error, just output silence */
 +               is->audio_buf = is->audio_buf1;
 +               is->audio_buf_size = 1024;
 +               memset(is->audio_buf, 0, is->audio_buf_size);
 +           } else {
 +               if (is->show_mode != SHOW_MODE_VIDEO)
 +                   update_sample_display(is, (int16_t *)is->audio_buf, audio_size);
 +               audio_size = synchronize_audio(is, (int16_t *)is->audio_buf, audio_size,
 +                                              pts);
 +               is->audio_buf_size = audio_size;
 +           }
 +           is->audio_buf_index = 0;
 +        }
 +        len1 = is->audio_buf_size - is->audio_buf_index;
 +        if (len1 > len)
 +            len1 = len;
 +        memcpy(stream, (uint8_t *)is->audio_buf + is->audio_buf_index, len1);
 +        len -= len1;
 +        stream += len1;
 +        is->audio_buf_index += len1;
 +    }
 +    bytes_per_sec = is->audio_st->codec->sample_rate *
 +            2 * is->audio_st->codec->channels;
 +    is->audio_write_buf_size = is->audio_buf_size - is->audio_buf_index;
 +    /* Let's assume the audio driver that is used by SDL has two periods. */
 +    is->audio_current_pts = is->audio_clock - (double)(2 * is->audio_hw_buf_size + is->audio_write_buf_size) / bytes_per_sec;
 +    is->audio_current_pts_drift = is->audio_current_pts - audio_callback_time / 1000000.0;
 +}
 +
 +/* open a given stream. Return 0 if OK */
 +static int stream_component_open(VideoState *is, int stream_index)
 +{
 +    AVFormatContext *ic = is->ic;
 +    AVCodecContext *avctx;
 +    AVCodec *codec;
 +    SDL_AudioSpec wanted_spec, spec;
 +    AVDictionary *opts;
 +    AVDictionaryEntry *t = NULL;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return -1;
 +    avctx = ic->streams[stream_index]->codec;
 +
 +    opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index]);
 +
 +    /* prepare audio output */
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        if (avctx->channels > 0) {
 +            avctx->request_channels = FFMIN(2, avctx->channels);
 +        } else {
 +            avctx->request_channels = 2;
 +        }
 +    }
 +
 +    codec = avcodec_find_decoder(avctx->codec_id);
 +    if (!codec)
 +        return -1;
 +
 +    avctx->workaround_bugs = workaround_bugs;
 +    avctx->lowres = lowres;
 +    if(lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +    avctx->idct_algo= idct;
 +    if(fast) avctx->flags2 |= CODEC_FLAG2_FAST;
 +    avctx->skip_frame= skip_frame;
 +    avctx->skip_idct= skip_idct;
 +    avctx->skip_loop_filter= skip_loop_filter;
 +    avctx->error_recognition= error_recognition;
 +    avctx->error_concealment= error_concealment;
 +    avctx->thread_count= thread_count;
 +
 +    if(codec->capabilities & CODEC_CAP_DR1)
 +        avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +
 +    if (!codec ||
 +        avcodec_open2(avctx, codec, &opts) < 0)
 +        return -1;
 +    if ((t = av_dict_get(opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        return AVERROR_OPTION_NOT_FOUND;
 +    }
 +
 +    /* prepare audio output */
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        if(avctx->sample_rate <= 0 || avctx->channels <= 0){
 +            fprintf(stderr, "Invalid sample rate or channel count\n");
 +            return -1;
 +        }
 +        wanted_spec.freq = avctx->sample_rate;
 +        wanted_spec.format = AUDIO_S16SYS;
 +        wanted_spec.channels = avctx->channels;
 +        wanted_spec.silence = 0;
 +        wanted_spec.samples = SDL_AUDIO_BUFFER_SIZE;
 +        wanted_spec.callback = sdl_audio_callback;
 +        wanted_spec.userdata = is;
 +        if (SDL_OpenAudio(&wanted_spec, &spec) < 0) {
 +            fprintf(stderr, "SDL_OpenAudio: %s\n", SDL_GetError());
 +            return -1;
 +        }
 +        is->audio_hw_buf_size = spec.size;
 +        is->audio_src_fmt= AV_SAMPLE_FMT_S16;
 +    }
 +
 +    ic->streams[stream_index]->discard = AVDISCARD_DEFAULT;
 +    switch(avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        is->audio_stream = stream_index;
 +        is->audio_st = ic->streams[stream_index];
 +        is->audio_buf_size = 0;
 +        is->audio_buf_index = 0;
 +
 +        /* init averaging filter */
 +        is->audio_diff_avg_coef = exp(log(0.01) / AUDIO_DIFF_AVG_NB);
 +        is->audio_diff_avg_count = 0;
 +        /* since we do not have a precise anough audio fifo fullness,
 +           we correct audio sync only if larger than this threshold */
 +        is->audio_diff_threshold = 2.0 * SDL_AUDIO_BUFFER_SIZE / avctx->sample_rate;
 +
 +        memset(&is->audio_pkt, 0, sizeof(is->audio_pkt));
 +        packet_queue_init(&is->audioq);
 +        SDL_PauseAudio(0);
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_stream = stream_index;
 +        is->video_st = ic->streams[stream_index];
 +
 +        packet_queue_init(&is->videoq);
 +        is->video_tid = SDL_CreateThread(video_thread, is);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_stream = stream_index;
 +        is->subtitle_st = ic->streams[stream_index];
 +        packet_queue_init(&is->subtitleq);
 +
 +        is->subtitle_tid = SDL_CreateThread(subtitle_thread, is);
 +        break;
 +    default:
 +        break;
 +    }
 +    return 0;
 +}
 +
 +static void stream_component_close(VideoState *is, int stream_index)
 +{
 +    AVFormatContext *ic = is->ic;
 +    AVCodecContext *avctx;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return;
 +    avctx = ic->streams[stream_index]->codec;
 +
 +    switch(avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        packet_queue_abort(&is->audioq);
 +
 +        SDL_CloseAudio();
 +
 +        packet_queue_end(&is->audioq);
 +        if (is->reformat_ctx)
 +            av_audio_convert_free(is->reformat_ctx);
 +        is->reformat_ctx = NULL;
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        packet_queue_abort(&is->videoq);
 +
 +        /* note: we also signal this mutex to make sure we deblock the
 +           video thread in all cases */
 +        SDL_LockMutex(is->pictq_mutex);
 +        SDL_CondSignal(is->pictq_cond);
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        SDL_WaitThread(is->video_tid, NULL);
 +
 +        packet_queue_end(&is->videoq);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        packet_queue_abort(&is->subtitleq);
 +
 +        /* note: we also signal this mutex to make sure we deblock the
 +           video thread in all cases */
 +        SDL_LockMutex(is->subpq_mutex);
 +        is->subtitle_stream_changed = 1;
 +
 +        SDL_CondSignal(is->subpq_cond);
 +        SDL_UnlockMutex(is->subpq_mutex);
 +
 +        SDL_WaitThread(is->subtitle_tid, NULL);
 +
 +        packet_queue_end(&is->subtitleq);
 +        break;
 +    default:
 +        break;
 +    }
 +
 +    ic->streams[stream_index]->discard = AVDISCARD_ALL;
 +    avcodec_close(avctx);
 +    switch(avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        is->audio_st = NULL;
 +        is->audio_stream = -1;
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_st = NULL;
 +        is->video_stream = -1;
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_st = NULL;
 +        is->subtitle_stream = -1;
 +        break;
 +    default:
 +        break;
 +    }
 +}
 +
 +/* since we have only one decoding thread, we can use a global
 +   variable instead of a thread local variable */
 +static VideoState *global_video_state;
 +
 +static int decode_interrupt_cb(void)
 +{
 +    return (global_video_state && global_video_state->abort_request);
 +}
 +
 +/* this thread gets the stream from the disk or the network */
 +static int read_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    AVFormatContext *ic = NULL;
 +    int err, i, ret;
 +    int st_index[AVMEDIA_TYPE_NB];
 +    AVPacket pkt1, *pkt = &pkt1;
 +    int eof=0;
 +    int pkt_in_play_range = 0;
 +    AVDictionaryEntry *t;
 +    AVDictionary **opts;
 +    int orig_nb_streams;
 +
 +    memset(st_index, -1, sizeof(st_index));
 +    is->video_stream = -1;
 +    is->audio_stream = -1;
 +    is->subtitle_stream = -1;
 +
 +    global_video_state = is;
 +    avio_set_interrupt_cb(decode_interrupt_cb);
 +
 +    err = avformat_open_input(&ic, is->filename, is->iformat, &format_opts);
 +    if (err < 0) {
 +        print_error(is->filename, err);
 +        ret = -1;
 +        goto fail;
 +    }
 +    if ((t = av_dict_get(format_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        ret = AVERROR_OPTION_NOT_FOUND;
 +        goto fail;
 +    }
 +    is->ic = ic;
 +
 +    if(genpts)
 +        ic->flags |= AVFMT_FLAG_GENPTS;
 +
 +    opts = setup_find_stream_info_opts(ic, codec_opts);
 +    orig_nb_streams = ic->nb_streams;
 +
 +    err = avformat_find_stream_info(ic, opts);
 +    if (err < 0) {
 +        fprintf(stderr, "%s: could not find codec parameters\n", is->filename);
 +        ret = -1;
 +        goto fail;
 +    }
 +    for (i = 0; i < orig_nb_streams; i++)
 +        av_dict_free(&opts[i]);
 +    av_freep(&opts);
 +
 +    if(ic->pb)
 +        ic->pb->eof_reached= 0; //FIXME hack, ffplay maybe should not use url_feof() to test for the end
 +
 +    if(seek_by_bytes<0)
 +        seek_by_bytes= !!(ic->iformat->flags & AVFMT_TS_DISCONT);
 +
 +    /* if seeking requested, we execute it */
 +    if (start_time != AV_NOPTS_VALUE) {
 +        int64_t timestamp;
 +
 +        timestamp = start_time;
 +        /* add the stream start time */
 +        if (ic->start_time != AV_NOPTS_VALUE)
 +            timestamp += ic->start_time;
 +        ret = avformat_seek_file(ic, -1, INT64_MIN, timestamp, INT64_MAX, 0);
 +        if (ret < 0) {
 +            fprintf(stderr, "%s: could not seek to position %0.3f\n",
 +                    is->filename, (double)timestamp / AV_TIME_BASE);
 +        }
 +    }
 +
 +    for (i = 0; i < ic->nb_streams; i++)
 +        ic->streams[i]->discard = AVDISCARD_ALL;
 +    if (!video_disable)
 +        st_index[AVMEDIA_TYPE_VIDEO] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_VIDEO,
 +                                wanted_stream[AVMEDIA_TYPE_VIDEO], -1, NULL, 0);
 +    if (!audio_disable)
 +        st_index[AVMEDIA_TYPE_AUDIO] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO,
 +                                wanted_stream[AVMEDIA_TYPE_AUDIO],
 +                                st_index[AVMEDIA_TYPE_VIDEO],
 +                                NULL, 0);
 +    if (!video_disable)
 +        st_index[AVMEDIA_TYPE_SUBTITLE] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_SUBTITLE,
 +                                wanted_stream[AVMEDIA_TYPE_SUBTITLE],
 +                                (st_index[AVMEDIA_TYPE_AUDIO] >= 0 ?
 +                                 st_index[AVMEDIA_TYPE_AUDIO] :
 +                                 st_index[AVMEDIA_TYPE_VIDEO]),
 +                                NULL, 0);
 +    if (show_status) {
 +        av_dump_format(ic, 0, is->filename, 0);
 +    }
 +
 +    is->show_mode = show_mode;
 +
 +    /* open the streams */
 +    if (st_index[AVMEDIA_TYPE_AUDIO] >= 0) {
 +        stream_component_open(is, st_index[AVMEDIA_TYPE_AUDIO]);
 +    }
 +
 +    ret=-1;
 +    if (st_index[AVMEDIA_TYPE_VIDEO] >= 0) {
 +        ret= stream_component_open(is, st_index[AVMEDIA_TYPE_VIDEO]);
 +    }
 +    is->refresh_tid = SDL_CreateThread(refresh_thread, is);
 +    if (is->show_mode == SHOW_MODE_NONE)
 +        is->show_mode = ret >= 0 ? SHOW_MODE_VIDEO : SHOW_MODE_RDFT;
 +
 +    if (st_index[AVMEDIA_TYPE_SUBTITLE] >= 0) {
 +        stream_component_open(is, st_index[AVMEDIA_TYPE_SUBTITLE]);
 +    }
 +
 +    if (is->video_stream < 0 && is->audio_stream < 0) {
 +        fprintf(stderr, "%s: could not open codecs\n", is->filename);
 +        ret = -1;
 +        goto fail;
 +    }
 +
 +    for(;;) {
 +        if (is->abort_request)
 +            break;
 +        if (is->paused != is->last_paused) {
 +            is->last_paused = is->paused;
 +            if (is->paused)
 +                is->read_pause_return= av_read_pause(ic);
 +            else
 +                av_read_play(ic);
 +        }
 +#if CONFIG_RTSP_DEMUXER
 +        if (is->paused && !strcmp(ic->iformat->name, "rtsp")) {
 +            /* wait 10 ms to avoid trying to get another packet */
 +            /* XXX: horrible */
 +            SDL_Delay(10);
 +            continue;
 +        }
 +#endif
 +        if (is->seek_req) {
 +            int64_t seek_target= is->seek_pos;
 +            int64_t seek_min= is->seek_rel > 0 ? seek_target - is->seek_rel + 2: INT64_MIN;
 +            int64_t seek_max= is->seek_rel < 0 ? seek_target - is->seek_rel - 2: INT64_MAX;
 +//FIXME the +-2 is due to rounding being not done in the correct direction in generation
 +//      of the seek_pos/seek_rel variables
 +
 +            ret = avformat_seek_file(is->ic, -1, seek_min, seek_target, seek_max, is->seek_flags);
 +            if (ret < 0) {
 +                fprintf(stderr, "%s: error while seeking\n", is->ic->filename);
 +            }else{
 +                if (is->audio_stream >= 0) {
 +                    packet_queue_flush(&is->audioq);
 +                    packet_queue_put(&is->audioq, &flush_pkt);
 +                }
 +                if (is->subtitle_stream >= 0) {
 +                    packet_queue_flush(&is->subtitleq);
 +                    packet_queue_put(&is->subtitleq, &flush_pkt);
 +                }
 +                if (is->video_stream >= 0) {
 +                    packet_queue_flush(&is->videoq);
 +                    packet_queue_put(&is->videoq, &flush_pkt);
 +                }
 +            }
 +            is->seek_req = 0;
 +            eof= 0;
 +        }
 +
 +        /* if the queue are full, no need to read more */
 +        if (   is->audioq.size + is->videoq.size + is->subtitleq.size > MAX_QUEUE_SIZE
 +            || (   (is->audioq   .size  > MIN_AUDIOQ_SIZE || is->audio_stream<0)
 +                && (is->videoq   .nb_packets > MIN_FRAMES || is->video_stream<0)
 +                && (is->subtitleq.nb_packets > MIN_FRAMES || is->subtitle_stream<0))) {
 +            /* wait 10 ms */
 +            SDL_Delay(10);
 +            continue;
 +        }
 +        if(eof) {
 +            if(is->video_stream >= 0){
 +                av_init_packet(pkt);
 +                pkt->data=NULL;
 +                pkt->size=0;
 +                pkt->stream_index= is->video_stream;
 +                packet_queue_put(&is->videoq, pkt);
 +            }
 +            SDL_Delay(10);
 +            if(is->audioq.size + is->videoq.size + is->subtitleq.size ==0){
 +                if(loop!=1 && (!loop || --loop)){
 +                    stream_seek(cur_stream, start_time != AV_NOPTS_VALUE ? start_time : 0, 0, 0);
 +                }else if(autoexit){
 +                    ret=AVERROR_EOF;
 +                    goto fail;
 +                }
 +            }
 +            eof=0;
 +            continue;
 +        }
 +        ret = av_read_frame(ic, pkt);
 +        if (ret < 0) {
 +            if (ret == AVERROR_EOF || url_feof(ic->pb))
 +                eof=1;
 +            if (ic->pb && ic->pb->error)
 +                break;
 +            SDL_Delay(100); /* wait for user event */
 +            continue;
 +        }
 +        /* check if packet is in play range specified by user, then queue, otherwise discard */
 +        pkt_in_play_range = duration == AV_NOPTS_VALUE ||
 +                (pkt->pts - ic->streams[pkt->stream_index]->start_time) *
 +                av_q2d(ic->streams[pkt->stream_index]->time_base) -
 +                (double)(start_time != AV_NOPTS_VALUE ? start_time : 0)/1000000
 +                <= ((double)duration/1000000);
 +        if (pkt->stream_index == is->audio_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->audioq, pkt);
 +        } else if (pkt->stream_index == is->video_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->videoq, pkt);
 +        } else if (pkt->stream_index == is->subtitle_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->subtitleq, pkt);
 +        } else {
 +            av_free_packet(pkt);
 +        }
 +    }
 +    /* wait until the end */
 +    while (!is->abort_request) {
 +        SDL_Delay(100);
 +    }
 +
 +    ret = 0;
 + fail:
 +    /* disable interrupting */
 +    global_video_state = NULL;
 +
 +    /* close each stream */
 +    if (is->audio_stream >= 0)
 +        stream_component_close(is, is->audio_stream);
 +    if (is->video_stream >= 0)
 +        stream_component_close(is, is->video_stream);
 +    if (is->subtitle_stream >= 0)
 +        stream_component_close(is, is->subtitle_stream);
 +    if (is->ic) {
 +        av_close_input_file(is->ic);
 +        is->ic = NULL; /* safety */
 +    }
 +    avio_set_interrupt_cb(NULL);
 +
 +    if (ret != 0) {
 +        SDL_Event event;
 +
 +        event.type = FF_QUIT_EVENT;
 +        event.user.data1 = is;
 +        SDL_PushEvent(&event);
 +    }
 +    return 0;
 +}
 +
 +static VideoState *stream_open(const char *filename, AVInputFormat *iformat)
 +{
 +    VideoState *is;
 +
 +    is = av_mallocz(sizeof(VideoState));
 +    if (!is)
 +        return NULL;
 +    av_strlcpy(is->filename, filename, sizeof(is->filename));
 +    is->iformat = iformat;
 +    is->ytop = 0;
 +    is->xleft = 0;
 +
 +    /* start video display */
 +    is->pictq_mutex = SDL_CreateMutex();
 +    is->pictq_cond = SDL_CreateCond();
 +
 +    is->subpq_mutex = SDL_CreateMutex();
 +    is->subpq_cond = SDL_CreateCond();
 +
 +    is->av_sync_type = av_sync_type;
 +    is->read_tid = SDL_CreateThread(read_thread, is);
 +    if (!is->read_tid) {
 +        av_free(is);
 +        return NULL;
 +    }
 +    return is;
 +}
 +
 +static void stream_cycle_channel(VideoState *is, int codec_type)
 +{
 +    AVFormatContext *ic = is->ic;
 +    int start_index, stream_index;
 +    AVStream *st;
 +
 +    if (codec_type == AVMEDIA_TYPE_VIDEO)
 +        start_index = is->video_stream;
 +    else if (codec_type == AVMEDIA_TYPE_AUDIO)
 +        start_index = is->audio_stream;
 +    else
 +        start_index = is->subtitle_stream;
 +    if (start_index < (codec_type == AVMEDIA_TYPE_SUBTITLE ? -1 : 0))
 +        return;
 +    stream_index = start_index;
 +    for(;;) {
 +        if (++stream_index >= is->ic->nb_streams)
 +        {
 +            if (codec_type == AVMEDIA_TYPE_SUBTITLE)
 +            {
 +                stream_index = -1;
 +                goto the_end;
 +            } else
 +                stream_index = 0;
 +        }
 +        if (stream_index == start_index)
 +            return;
 +        st = ic->streams[stream_index];
 +        if (st->codec->codec_type == codec_type) {
 +            /* check that parameters are OK */
 +            switch(codec_type) {
 +            case AVMEDIA_TYPE_AUDIO:
 +                if (st->codec->sample_rate != 0 &&
 +                    st->codec->channels != 0)
 +                    goto the_end;
 +                break;
 +            case AVMEDIA_TYPE_VIDEO:
 +            case AVMEDIA_TYPE_SUBTITLE:
 +                goto the_end;
 +            default:
 +                break;
 +            }
 +        }
 +    }
 + the_end:
 +    stream_component_close(is, start_index);
 +    stream_component_open(is, stream_index);
 +}
 +
 +
 +static void toggle_full_screen(void)
 +{
 +    is_full_screen = !is_full_screen;
 +    video_open(cur_stream);
 +}
 +
 +static void toggle_pause(void)
 +{
 +    if (cur_stream)
 +        stream_toggle_pause(cur_stream);
 +    step = 0;
 +}
 +
 +static void step_to_next_frame(void)
 +{
 +    if (cur_stream) {
 +        /* if the stream is paused unpause it, then step */
 +        if (cur_stream->paused)
 +            stream_toggle_pause(cur_stream);
 +    }
 +    step = 1;
 +}
 +
 +static void toggle_audio_display(void)
 +{
 +    if (cur_stream) {
 +        int bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +        cur_stream->show_mode = (cur_stream->show_mode + 1) % SHOW_MODE_NB;
 +        fill_rectangle(screen,
 +                    cur_stream->xleft, cur_stream->ytop, cur_stream->width, cur_stream->height,
 +                    bgcolor);
 +        SDL_UpdateRect(screen, cur_stream->xleft, cur_stream->ytop, cur_stream->width, cur_stream->height);
 +    }
 +}
 +
 +/* handle an event sent by the GUI */
 +static void event_loop(void)
 +{
 +    SDL_Event event;
 +    double incr, pos, frac;
 +
 +    for(;;) {
 +        double x;
 +        SDL_WaitEvent(&event);
 +        switch(event.type) {
 +        case SDL_KEYDOWN:
 +            if (exit_on_keydown) {
 +                do_exit();
 +                break;
 +            }
 +            switch(event.key.keysym.sym) {
 +            case SDLK_ESCAPE:
 +            case SDLK_q:
 +                do_exit();
 +                break;
 +            case SDLK_f:
 +                toggle_full_screen();
 +                break;
 +            case SDLK_p:
 +            case SDLK_SPACE:
 +                toggle_pause();
 +                break;
 +            case SDLK_s: //S: Step to next frame
 +                step_to_next_frame();
 +                break;
 +            case SDLK_a:
 +                if (cur_stream)
 +                    stream_cycle_channel(cur_stream, AVMEDIA_TYPE_AUDIO);
 +                break;
 +            case SDLK_v:
 +                if (cur_stream)
 +                    stream_cycle_channel(cur_stream, AVMEDIA_TYPE_VIDEO);
 +                break;
 +            case SDLK_t:
 +                if (cur_stream)
 +                    stream_cycle_channel(cur_stream, AVMEDIA_TYPE_SUBTITLE);
 +                break;
 +            case SDLK_w:
 +                toggle_audio_display();
 +                break;
 +            case SDLK_LEFT:
 +                incr = -10.0;
 +                goto do_seek;
 +            case SDLK_RIGHT:
 +                incr = 10.0;
 +                goto do_seek;
 +            case SDLK_UP:
 +                incr = 60.0;
 +                goto do_seek;
 +            case SDLK_DOWN:
 +                incr = -60.0;
 +            do_seek:
 +                if (cur_stream) {
 +                    if (seek_by_bytes) {
 +                        if (cur_stream->video_stream >= 0 && cur_stream->video_current_pos>=0){
 +                            pos= cur_stream->video_current_pos;
 +                        }else if(cur_stream->audio_stream >= 0 && cur_stream->audio_pkt.pos>=0){
 +                            pos= cur_stream->audio_pkt.pos;
 +                        }else
 +                            pos = avio_tell(cur_stream->ic->pb);
 +                        if (cur_stream->ic->bit_rate)
 +                            incr *= cur_stream->ic->bit_rate / 8.0;
 +                        else
 +                            incr *= 180000.0;
 +                        pos += incr;
 +                        stream_seek(cur_stream, pos, incr, 1);
 +                    } else {
 +                        pos = get_master_clock(cur_stream);
 +                        pos += incr;
 +                        stream_seek(cur_stream, (int64_t)(pos * AV_TIME_BASE), (int64_t)(incr * AV_TIME_BASE), 0);
 +                    }
 +                }
 +                break;
 +            default:
 +                break;
 +            }
 +            break;
 +        case SDL_MOUSEBUTTONDOWN:
 +            if (exit_on_mousedown) {
 +                do_exit();
 +                break;
 +            }
 +        case SDL_MOUSEMOTION:
 +            if(event.type ==SDL_MOUSEBUTTONDOWN){
 +                x= event.button.x;
 +            }else{
 +                if(event.motion.state != SDL_PRESSED)
 +                    break;
 +                x= event.motion.x;
 +            }
 +            if (cur_stream) {
 +                if(seek_by_bytes || cur_stream->ic->duration<=0){
 +                    uint64_t size=  avio_size(cur_stream->ic->pb);
 +                    stream_seek(cur_stream, size*x/cur_stream->width, 0, 1);
 +                }else{
 +                    int64_t ts;
 +                    int ns, hh, mm, ss;
 +                    int tns, thh, tmm, tss;
 +                    tns = cur_stream->ic->duration/1000000LL;
 +                    thh = tns/3600;
 +                    tmm = (tns%3600)/60;
 +                    tss = (tns%60);
 +                    frac = x/cur_stream->width;
 +                    ns = frac*tns;
 +                    hh = ns/3600;
 +                    mm = (ns%3600)/60;
 +                    ss = (ns%60);
 +                    fprintf(stderr, "Seek to %2.0f%% (%2d:%02d:%02d) of total duration (%2d:%02d:%02d)       \n", frac*100,
 +                            hh, mm, ss, thh, tmm, tss);
 +                    ts = frac*cur_stream->ic->duration;
 +                    if (cur_stream->ic->start_time != AV_NOPTS_VALUE)
 +                        ts += cur_stream->ic->start_time;
 +                    stream_seek(cur_stream, ts, 0, 0);
 +                }
 +            }
 +            break;
 +        case SDL_VIDEORESIZE:
 +            if (cur_stream) {
 +                screen = SDL_SetVideoMode(event.resize.w, event.resize.h, 0,
 +                                          SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL);
 +                screen_width = cur_stream->width = event.resize.w;
 +                screen_height= cur_stream->height= event.resize.h;
 +            }
 +            break;
 +        case SDL_QUIT:
 +        case FF_QUIT_EVENT:
 +            do_exit();
 +            break;
 +        case FF_ALLOC_EVENT:
 +            video_open(event.user.data1);
 +            alloc_picture(event.user.data1);
 +            break;
 +        case FF_REFRESH_EVENT:
 +            video_refresh(event.user.data1);
 +            cur_stream->refresh=0;
 +            break;
 +        default:
 +            break;
 +        }
 +    }
 +}
 +
 +static int opt_frame_size(const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "Option -s is deprecated, use -video_size.\n");
 +    return opt_default("video_size", arg);
 +}
 +
 +static int opt_width(const char *opt, const char *arg)
 +{
 +    screen_width = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX);
 +    return 0;
 +}
 +
 +static int opt_height(const char *opt, const char *arg)
 +{
 +    screen_height = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX);
 +    return 0;
 +}
 +
 +static int opt_format(const char *opt, const char *arg)
 +{
 +    file_iformat = av_find_input_format(arg);
 +    if (!file_iformat) {
 +        fprintf(stderr, "Unknown input format: %s\n", arg);
 +        return AVERROR(EINVAL);
 +    }
 +    return 0;
 +}
 +
 +static int opt_frame_pix_fmt(const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "Option -pix_fmt is deprecated, use -pixel_format.\n");
 +    return opt_default("pixel_format", arg);
 +}
 +
 +static int opt_sync(const char *opt, const char *arg)
 +{
 +    if (!strcmp(arg, "audio"))
 +        av_sync_type = AV_SYNC_AUDIO_MASTER;
 +    else if (!strcmp(arg, "video"))
 +        av_sync_type = AV_SYNC_VIDEO_MASTER;
 +    else if (!strcmp(arg, "ext"))
 +        av_sync_type = AV_SYNC_EXTERNAL_CLOCK;
 +    else {
 +        fprintf(stderr, "Unknown value for %s: %s\n", opt, arg);
 +        exit(1);
 +    }
 +    return 0;
 +}
 +
 +static int opt_seek(const char *opt, const char *arg)
 +{
 +    start_time = parse_time_or_die(opt, arg, 1);
 +    return 0;
 +}
 +
 +static int opt_duration(const char *opt, const char *arg)
 +{
 +    duration = parse_time_or_die(opt, arg, 1);
 +    return 0;
 +}
 +
 +static int opt_thread_count(const char *opt, const char *arg)
 +{
 +    thread_count= parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX);
 +#if !HAVE_THREADS
 +    fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n");
 +#endif
 +    return 0;
 +}
 +
 +static int opt_show_mode(const char *opt, const char *arg)
 +{
 +    show_mode = !strcmp(arg, "video") ? SHOW_MODE_VIDEO :
 +                !strcmp(arg, "waves") ? SHOW_MODE_WAVES :
 +                !strcmp(arg, "rdft" ) ? SHOW_MODE_RDFT  :
 +                parse_number_or_die(opt, arg, OPT_INT, 0, SHOW_MODE_NB-1);
 +    return 0;
 +}
 +
 +static int opt_input_file(const char *opt, const char *filename)
 +{
 +    if (input_filename) {
 +        fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
 +                filename, input_filename);
 +        exit(1);
 +    }
 +    if (!strcmp(filename, "-"))
 +        filename = "pipe:";
 +    input_filename = filename;
 +    return 0;
 +}
 +
 +static const OptionDef options[] = {
 +#include "cmdutils_common_opts.h"
 +    { "x", HAS_ARG, {(void*)opt_width}, "force displayed width", "width" },
 +    { "y", HAS_ARG, {(void*)opt_height}, "force displayed height", "height" },
 +    { "s", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" },
 +    { "fs", OPT_BOOL, {(void*)&is_full_screen}, "force full screen" },
 +    { "an", OPT_BOOL, {(void*)&audio_disable}, "disable audio" },
 +    { "vn", OPT_BOOL, {(void*)&video_disable}, "disable video" },
 +    { "ast", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_AUDIO]}, "select desired audio stream", "stream_number" },
 +    { "vst", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_VIDEO]}, "select desired video stream", "stream_number" },
 +    { "sst", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_SUBTITLE]}, "select desired subtitle stream", "stream_number" },
 +    { "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" },
 +    { "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
 +    { "autoexit", OPT_BOOL | OPT_EXPERT, {(void*)&autoexit}, "exit at the end", "" },
 +    { "exitonkeydown", OPT_BOOL | OPT_EXPERT, {(void*)&exit_on_keydown}, "exit on key down", "" },
 +    { "exitonmousedown", OPT_BOOL | OPT_EXPERT, {(void*)&exit_on_mousedown}, "exit on mouse down", "" },
 +    { "loop", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&loop}, "set number of times the playback shall be looped", "loop count" },
 +    { "framedrop", OPT_BOOL | OPT_EXPERT, {(void*)&framedrop}, "drop frames when cpu is too slow", "" },
 +    { "window_title", OPT_STRING | HAS_ARG, {(void*)&window_title}, "set window title", "window title" },
 +#if CONFIG_AVFILTER
 +    { "vf", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" },
 +#endif
 +    { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, {(void*)&rdftspeed}, "rdft speed", "msecs" },
 +    { "showmode", HAS_ARG, {(void*)opt_show_mode}, "select show mode (0 = video, 1 = waves, 2 = RDFT)", "mode" },
 +    { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
 +    { "i", HAS_ARG, {(void *)opt_input_file}, "read specified file", "input_file"},
 +    { NULL, },
 +};
 +
 +static void show_usage(void)
 +{
 +    printf("Simple media player\n");
 +    printf("usage: %s [options] input_file\n", program_name);
 +    printf("\n");
 +}
 +
 +static int opt_help(const char *opt, const char *arg)
 +{
 +    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");
 +    av_opt_show2(avcodec_opts[0], NULL,
 +                 AV_OPT_FLAG_DECODING_PARAM, 0);
 +    printf("\n");
 +    av_opt_show2(avformat_opts, NULL,
 +                 AV_OPT_FLAG_DECODING_PARAM, 0);
 +#if !CONFIG_AVFILTER
 +    printf("\n");
 +    av_opt_show2(sws_opts, NULL,
 +                 AV_OPT_FLAG_ENCODING_PARAM, 0);
 +#endif
 +    printf("\nWhile playing:\n"
 +           "q, ESC              quit\n"
 +           "f                   toggle full screen\n"
 +           "p, SPC              pause\n"
 +           "a                   cycle audio channel\n"
 +           "v                   cycle video channel\n"
 +           "t                   cycle subtitle channel\n"
 +           "w                   show audio waves\n"
 +           "s                   activate frame-step mode\n"
 +           "left/right          seek backward/forward 10 seconds\n"
 +           "down/up             seek backward/forward 1 minute\n"
 +           "mouse click         seek to percentage in file corresponding to fraction of width\n"
 +           );
 +    return 0;
 +}
 +
 +/* Called from the main */
 +int main(int argc, char **argv)
 +{
 +    int flags;
 +
 +    av_log_set_flags(AV_LOG_SKIP_REPEATED);
 +
 +    /* register all codecs, demux and protocols */
 +    avcodec_register_all();
 +#if CONFIG_AVDEVICE
 +    avdevice_register_all();
 +#endif
 +#if CONFIG_AVFILTER
 +    avfilter_register_all();
 +#endif
 +    av_register_all();
 +
 +    init_opts();
 +
 +    show_banner();
 +
 +    parse_options(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);
 +
 +    av_init_packet(&flush_pkt);
 +    flush_pkt.data= "FLUSH";
 +
 +    cur_stream = stream_open(input_filename, file_iformat);
 +
 +    event_loop();
 +
 +    /* never returns */
 +
 +    return 0;
 +}
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -2583,7 -2680,8 +2583,7 @@@ void dsputil_init_mmx(DSPContext* c, AV
                  c->add_hfyu_median_prediction = add_hfyu_median_prediction_cmov;
  #endif
  
-         } else if (mm_flags & AV_CPU_FLAG_3DNOW) {
 -            c->add_png_paeth_prediction= add_png_paeth_prediction_mmx2;
+         } else if (HAVE_AMD3DNOW && (mm_flags & AV_CPU_FLAG_3DNOW)) {
              c->prefetch = prefetch_3dnow;
  
              if (!high_bit_depth) {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -59,16 -58,8 +59,8 @@@ static av_cold int audio_read_header(AV
      AVStream *st;
      int ret;
      enum CodecID codec_id;
 -    snd_pcm_sw_params_t *sw_params;
 +    double o;
  
- #if FF_API_FORMAT_PARAMETERS
-     if (ap->sample_rate > 0)
-         s->sample_rate = ap->sample_rate;
-     if (ap->channels > 0)
-         s->channels = ap->channels;
- #endif
      st = av_new_stream(s1, 0);
      if (!st) {
          av_log(s1, AV_LOG_ERROR, "Cannot add stream\n");
Simple merge
Simple merge
Simple merge
  
  #include "libavutil/log.h"
  #include "libavutil/fifo.h"
+ #include "libavutil/opt.h"
  #include "libavcodec/avcodec.h"
 -#include "libavformat/avformat.h"
  #include "libavformat/timefilter.h"
 +#include "avdevice.h"
  
  /**
   * Size of the internal FIFO buffers as a number of audio packets
Simple merge
Simple merge
Simple merge
@@@ -447,14 -463,9 +447,8 @@@ static int v4l2_set_parameters(AVFormat
          av_log(s1, AV_LOG_ERROR, "Could not parse framerate '%s'.\n", s->framerate);
          return ret;
      }
- #if FF_API_FORMAT_PARAMETERS
-     if (ap->channel > 0)
-         s->channel = ap->channel;
-     if (ap->time_base.num)
-         framerate_q = (AVRational){ap->time_base.den, ap->time_base.num};
- #endif
  
      /* set tv video input */
 -    memset (&input, 0, sizeof (input));
      input.index = s->channel;
      if (ioctl(s->fd, VIDIOC_ENUMINPUT, &input) < 0) {
          av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl enum input failed:\n");
Simple merge
@@@ -183,19 -183,10 +183,11 @@@ x11grab_read_header(AVFormatContext *s1
          av_log(s1, AV_LOG_ERROR, "Could not parse framerate: %s.\n", x11grab->framerate);
          goto out;
      }
- #if FF_API_FORMAT_PARAMETERS
-     if (ap->width > 0)
-         x11grab->width = ap->width;
-     if (ap->height > 0)
-         x11grab->height = ap->height;
-     if (ap->time_base.num)
-         framerate = (AVRational){ap->time_base.den, ap->time_base.num};
- #endif
      av_log(s1, AV_LOG_INFO, "device: %s -> display: %s x: %d y: %d width: %d height: %d\n",
 -           s1->filename, param, x_off, y_off, x11grab->width, x11grab->height);
 +           s1->filename, dpyname, x_off, y_off, x11grab->width, x11grab->height);
  
 -    dpy = XOpenDisplay(param);
 +    dpy = XOpenDisplay(dpyname);
 +    av_freep(&dpyname);
      if(!dpy) {
          av_log(s1, AV_LOG_ERROR, "Could not open X display.\n");
          ret = AVERROR(EIO);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge