Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Jan 2012 22:11:27 +0000 (23:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Jan 2012 22:11:27 +0000 (23:11 +0100)
* qatar/master:
  rtpdec: Use our own SSRC in the SDES field when sending RRs
  Finalize changelog for 0.8 Release
  Prepare for 0.8 Release
  threads: change the default for threads back to 1
  threads: update slice_count and slice_offset from user context
  aviocat: Remove useless includes
  doc/APIChanges: fill in missing dates and hashes
  Revert "avserver: fix build after the next bump."
  mpegaudiodec: switch error detection check to AV_EF_BUFFER
  lavf: rename fer option and document resulting (f_)err_detect options
  lavc: rename err_filter option to err_detect and document it
  mpegvideo: fix invalid memory access for small video dimensions
  movenc: Reorder entries in the MOVIentry struct, for tigheter packing
  rtsp: Remove extern declarations for variables that don't exist
  aviocat: Flush the output before closing

Conflicts:
Changelog
RELEASE
libavcodec/mpegaudiodec.c
libavcodec/pthread.c
libavformat/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
1  2 
RELEASE
avconv.c
doc/APIchanges
ffplay.c
ffserver.c
libavcodec/mpegaudiodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_common.h
libavcodec/options.c
libavcodec/pthread.c
libavformat/movenc.h
libavformat/options.c
libavformat/rtpdec.c
libavformat/rtsp.h

diff --cc RELEASE
+++ b/RELEASE
@@@ -1,2 -1,1 +1,1 @@@
 -0.8
 +0.9.1.git
diff --cc avconv.c
Simple merge
diff --cc doc/APIchanges
@@@ -13,37 -13,33 +13,37 @@@ libavutil:   2011-04-1
  
  API changes, most recent first:
  
- 2012-xx-xx - lavc 53.34.0
+ 2012-01-15 - lavc 53.34.0
    New audio encoding API:
-   xxxxxxx Add CODEC_CAP_VARIABLE_FRAME_SIZE capability for use by audio
+   b2c75b6 Add CODEC_CAP_VARIABLE_FRAME_SIZE capability for use by audio
            encoders.
-   xxxxxxx Add avcodec_fill_audio_frame() as a convenience function.
-   xxxxxxx Add avcodec_encode_audio2() and deprecate avcodec_encode_audio().
+   5ee5fa0 Add avcodec_fill_audio_frame() as a convenience function.
+   b2c75b6 Add avcodec_encode_audio2() and deprecate avcodec_encode_audio().
            Add AVCodec.encode2().
  
- 2012-01-xx - xxxxxxx - lavfi 2.15.0
+ 2012-01-12 - 3167dc9 - lavfi 2.15.0
    Add a new installed header -- libavfilter/version.h -- with version macros.
  
 -2011-01-03 - b73ec05 - lavu 51.21.0
 -  Add av_popcount64
 +2011-12-08 - a502939 - lavfi 2.52.0
 +  Add av_buffersink_poll_frame() to buffersink.h.
 +
 +2011-12-08 - xxxxxxx - lavu 51.31.0
 +  Add av_log_format_line.
 +
 +2011-12-03 - xxxxxxx - lavu 51.30.0
 +  Add AVERROR_BUG.
  
 -2011-12-25 - lavfi 2.14.0
 -  e1d9dbf Add a new installed header - buffersrc.h
 -  It contains a new function av_buffersrc_buffer() that allows passing
 -  frames to the 'buffer' filter, but unlike av_vsrc_buffer_add_frame()
 -  it allows for direct rendering.
 -  1c9e340 Add avfilter_copy_frame_props() for copying properties from
 -  AVFrame to AVFilterBufferRef.
 +2011-xx-xx - xxxxxxx - lavu 51.28.1
 +  Add av_get_alt_sample_fmt() to samplefmt.h.
  
 -2011-12-25 - lavc 53.31.0
 -  Add the following new fields to AVFrame:
 -    b58dbb5 sample_aspect_ratio
 -    3a2ddf7 width, height
 -    8a4a5f6 format
 +2011-11-03 - 96949da - lavu 51.23.0
 +  Add av_strcasecmp() and av_strncasecmp() to avstring.h.
 +
 +2011-10-20 - b35e9e1 - lavu 51.22.0
 +  Add av_strtok() to avstring.h.
 +
 +2011-01-03 - b73ec05 - lavu 51.21.0
 +  Add av_popcount64
  
  2011-12-18 - 8400b12 - lavc 53.28.1
    Deprecate AVFrame.age. The field is unused.
diff --cc ffplay.c
index 4fd8b36,0000000..babdcb9
mode 100644,000000..100644
--- /dev/null
+++ b/ffplay.c
@@@ -1,3231 -1,0 +1,3233 @@@
 +/*
 + * Copyright (c) 2003 Fabrice Bellard
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
 + *
 + * FFmpeg is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with FFmpeg; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 + */
 +
 +/**
 + * @file
 + * simple media player based on the FFmpeg libraries
 + */
 +
 +#include "config.h"
 +#include <inttypes.h>
 +#include <math.h>
 +#include <limits.h>
 +#include <signal.h>
 +#include "libavutil/avstring.h"
 +#include "libavutil/colorspace.h"
 +#include "libavutil/mathematics.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/imgutils.h"
 +#include "libavutil/dict.h"
 +#include "libavutil/parseutils.h"
 +#include "libavutil/samplefmt.h"
 +#include "libavutil/avassert.h"
 +#include "libavformat/avformat.h"
 +#include "libavdevice/avdevice.h"
 +#include "libswscale/swscale.h"
 +#include "libavcodec/audioconvert.h"
 +#include "libavutil/opt.h"
 +#include "libavcodec/avfft.h"
 +#include "libswresample/swresample.h"
 +
 +#if CONFIG_AVFILTER
 +# include "libavfilter/avcodec.h"
 +# include "libavfilter/avfilter.h"
 +# include "libavfilter/avfiltergraph.h"
 +# include "libavfilter/buffersink.h"
 +#endif
 +
 +#include <SDL.h>
 +#include <SDL_thread.h>
 +
 +#include "cmdutils.h"
 +
 +#include <unistd.h>
 +#include <assert.h>
 +
 +const char program_name[] = "ffplay";
 +const int program_birth_year = 2003;
 +
 +#define MAX_QUEUE_SIZE (15 * 1024 * 1024)
 +#define MIN_AUDIOQ_SIZE (20 * 16 * 1024)
 +#define MIN_FRAMES 5
 +
 +/* SDL audio buffer size, in samples. Should be small to have precise
 +   A/V sync as SDL does not have hardware buffer fullness info. */
 +#define SDL_AUDIO_BUFFER_SIZE 1024
 +
 +/* no AV sync correction is done if below the AV sync threshold */
 +#define AV_SYNC_THRESHOLD 0.01
 +/* no AV correction is done if too big error */
 +#define AV_NOSYNC_THRESHOLD 10.0
 +
 +/* maximum audio speed change to get correct sync */
 +#define SAMPLE_CORRECTION_PERCENT_MAX 10
 +
 +/* we use about AUDIO_DIFF_AVG_NB A-V differences to make the average */
 +#define AUDIO_DIFF_AVG_NB   20
 +
 +/* NOTE: the size must be big enough to compensate the hardware audio buffersize size */
 +#define SAMPLE_ARRAY_SIZE (2 * 65536)
 +
 +static int sws_flags = SWS_BICUBIC;
 +
 +typedef struct PacketQueue {
 +    AVPacketList *first_pkt, *last_pkt;
 +    int nb_packets;
 +    int size;
 +    int abort_request;
 +    SDL_mutex *mutex;
 +    SDL_cond *cond;
 +} PacketQueue;
 +
 +#define VIDEO_PICTURE_QUEUE_SIZE 2
 +#define SUBPICTURE_QUEUE_SIZE 4
 +
 +typedef struct VideoPicture {
 +    double pts;                                  ///< presentation time stamp for this picture
 +    double duration;                             ///< expected duration of the frame
 +    int64_t pos;                                 ///< byte position in file
 +    int skip;
 +    SDL_Overlay *bmp;
 +    int width, height; /* source height & width */
 +    int allocated;
 +    int reallocate;
 +    enum PixelFormat pix_fmt;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterBufferRef *picref;
 +#endif
 +} VideoPicture;
 +
 +typedef struct SubPicture {
 +    double pts; /* presentation time stamp for this picture */
 +    AVSubtitle sub;
 +} SubPicture;
 +
 +enum {
 +    AV_SYNC_AUDIO_MASTER, /* default choice */
 +    AV_SYNC_VIDEO_MASTER,
 +    AV_SYNC_EXTERNAL_CLOCK, /* synchronize to an external clock */
 +};
 +
 +typedef struct VideoState {
 +    SDL_Thread *read_tid;
 +    SDL_Thread *video_tid;
 +    SDL_Thread *refresh_tid;
 +    AVInputFormat *iformat;
 +    int no_background;
 +    int abort_request;
 +    int paused;
 +    int last_paused;
 +    int seek_req;
 +    int seek_flags;
 +    int64_t seek_pos;
 +    int64_t seek_rel;
 +    int read_pause_return;
 +    AVFormatContext *ic;
 +
 +    int audio_stream;
 +
 +    int av_sync_type;
 +    double external_clock; /* external clock base */
 +    int64_t external_clock_time;
 +
 +    double audio_clock;
 +    double audio_diff_cum; /* used for AV difference average computation */
 +    double audio_diff_avg_coef;
 +    double audio_diff_threshold;
 +    int audio_diff_avg_count;
 +    AVStream *audio_st;
 +    PacketQueue audioq;
 +    int audio_hw_buf_size;
 +    DECLARE_ALIGNED(16,uint8_t,audio_buf2)[AVCODEC_MAX_AUDIO_FRAME_SIZE * 4];
 +    uint8_t silence_buf[SDL_AUDIO_BUFFER_SIZE];
 +    uint8_t *audio_buf;
 +    uint8_t *audio_buf1;
 +    unsigned int audio_buf_size; /* in bytes */
 +    int audio_buf_index; /* in bytes */
 +    int audio_write_buf_size;
 +    AVPacket audio_pkt_temp;
 +    AVPacket audio_pkt;
 +    enum AVSampleFormat audio_src_fmt;
 +    enum AVSampleFormat audio_tgt_fmt;
 +    int audio_src_channels;
 +    int audio_tgt_channels;
 +    int64_t audio_src_channel_layout;
 +    int64_t audio_tgt_channel_layout;
 +    int audio_src_freq;
 +    int audio_tgt_freq;
 +    struct SwrContext *swr_ctx;
 +    double audio_current_pts;
 +    double audio_current_pts_drift;
 +    int frame_drops_early;
 +    int frame_drops_late;
 +    AVFrame *frame;
 +
 +    enum ShowMode {
 +        SHOW_MODE_NONE = -1, SHOW_MODE_VIDEO = 0, SHOW_MODE_WAVES, SHOW_MODE_RDFT, SHOW_MODE_NB
 +    } show_mode;
 +    int16_t sample_array[SAMPLE_ARRAY_SIZE];
 +    int sample_array_index;
 +    int last_i_start;
 +    RDFTContext *rdft;
 +    int rdft_bits;
 +    FFTSample *rdft_data;
 +    int xpos;
 +
 +    SDL_Thread *subtitle_tid;
 +    int subtitle_stream;
 +    int subtitle_stream_changed;
 +    AVStream *subtitle_st;
 +    PacketQueue subtitleq;
 +    SubPicture subpq[SUBPICTURE_QUEUE_SIZE];
 +    int subpq_size, subpq_rindex, subpq_windex;
 +    SDL_mutex *subpq_mutex;
 +    SDL_cond *subpq_cond;
 +
 +    double frame_timer;
 +    double frame_last_pts;
 +    double frame_last_duration;
 +    double frame_last_dropped_pts;
 +    double frame_last_returned_time;
 +    double frame_last_filter_delay;
 +    int64_t frame_last_dropped_pos;
 +    double video_clock;                          ///< pts of last decoded frame / predicted pts of next decoded frame
 +    int video_stream;
 +    AVStream *video_st;
 +    PacketQueue videoq;
 +    double video_current_pts;                    ///< current displayed pts (different from video_clock if frame fifos are used)
 +    double video_current_pts_drift;              ///< video_current_pts - time (av_gettime) at which we updated video_current_pts - used to have running video pts
 +    int64_t video_current_pos;                   ///< current displayed file pos
 +    VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE];
 +    int pictq_size, pictq_rindex, pictq_windex;
 +    SDL_mutex *pictq_mutex;
 +    SDL_cond *pictq_cond;
 +#if !CONFIG_AVFILTER
 +    struct SwsContext *img_convert_ctx;
 +#endif
 +
 +    char filename[1024];
 +    int width, height, xleft, ytop;
 +    int step;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterContext *out_video_filter;          ///< the last filter in the video chain
 +#endif
 +
 +    int refresh;
 +} VideoState;
 +
 +static int opt_help(const char *opt, const char *arg);
 +
 +/* options specified by the user */
 +static AVInputFormat *file_iformat;
 +static const char *input_filename;
 +static const char *window_title;
 +static int fs_screen_width;
 +static int fs_screen_height;
 +static int screen_width  = 0;
 +static int screen_height = 0;
 +static int audio_disable;
 +static int video_disable;
 +static int wanted_stream[AVMEDIA_TYPE_NB] = {
 +    [AVMEDIA_TYPE_AUDIO]    = -1,
 +    [AVMEDIA_TYPE_VIDEO]    = -1,
 +    [AVMEDIA_TYPE_SUBTITLE] = -1,
 +};
 +static int seek_by_bytes = -1;
 +static int display_disable;
 +static int show_status = 1;
 +static int av_sync_type = AV_SYNC_AUDIO_MASTER;
 +static int64_t start_time = AV_NOPTS_VALUE;
 +static int64_t duration = AV_NOPTS_VALUE;
 +static int workaround_bugs = 1;
 +static int fast = 0;
 +static int genpts = 0;
 +static int lowres = 0;
 +static int idct = FF_IDCT_AUTO;
 +static enum AVDiscard skip_frame       = AVDISCARD_DEFAULT;
 +static enum AVDiscard skip_idct        = AVDISCARD_DEFAULT;
 +static enum AVDiscard skip_loop_filter = AVDISCARD_DEFAULT;
 +static int error_recognition = FF_ER_CAREFUL;
 +static int error_concealment = 3;
 +static int decoder_reorder_pts = -1;
 +static int autoexit;
 +static int exit_on_keydown;
 +static int exit_on_mousedown;
 +static int loop = 1;
 +static int framedrop = -1;
 +static enum ShowMode show_mode = SHOW_MODE_NONE;
 +static const char *audio_codec_name;
 +static const char *subtitle_codec_name;
 +static const char *video_codec_name;
 +static int rdftspeed = 20;
 +#if CONFIG_AVFILTER
 +static char *vfilters = NULL;
 +#endif
 +
 +/* current context */
 +static int is_full_screen;
 +static int64_t audio_callback_time;
 +
 +static AVPacket flush_pkt;
 +
 +#define FF_ALLOC_EVENT   (SDL_USEREVENT)
 +#define FF_REFRESH_EVENT (SDL_USEREVENT + 1)
 +#define FF_QUIT_EVENT    (SDL_USEREVENT + 2)
 +
 +static SDL_Surface *screen;
 +
 +void av_noreturn exit_program(int ret)
 +{
 +    exit(ret);
 +}
 +
 +static int packet_queue_put(PacketQueue *q, AVPacket *pkt)
 +{
 +    AVPacketList *pkt1;
 +
 +    /* duplicate the packet */
 +    if (pkt != &flush_pkt && av_dup_packet(pkt) < 0)
 +        return -1;
 +
 +    pkt1 = av_malloc(sizeof(AVPacketList));
 +    if (!pkt1)
 +        return -1;
 +    pkt1->pkt = *pkt;
 +    pkt1->next = NULL;
 +
 +
 +    SDL_LockMutex(q->mutex);
 +
 +    if (!q->last_pkt)
 +
 +        q->first_pkt = pkt1;
 +    else
 +        q->last_pkt->next = pkt1;
 +    q->last_pkt = pkt1;
 +    q->nb_packets++;
 +    q->size += pkt1->pkt.size + sizeof(*pkt1);
 +    /* XXX: should duplicate packet data in DV case */
 +    SDL_CondSignal(q->cond);
 +
 +    SDL_UnlockMutex(q->mutex);
 +    return 0;
 +}
 +
 +/* packet queue handling */
 +static void packet_queue_init(PacketQueue *q)
 +{
 +    memset(q, 0, sizeof(PacketQueue));
 +    q->mutex = SDL_CreateMutex();
 +    q->cond = SDL_CreateCond();
 +    packet_queue_put(q, &flush_pkt);
 +}
 +
 +static void packet_queue_flush(PacketQueue *q)
 +{
 +    AVPacketList *pkt, *pkt1;
 +
 +    SDL_LockMutex(q->mutex);
 +    for (pkt = q->first_pkt; pkt != NULL; pkt = pkt1) {
 +        pkt1 = pkt->next;
 +        av_free_packet(&pkt->pkt);
 +        av_freep(&pkt);
 +    }
 +    q->last_pkt = NULL;
 +    q->first_pkt = NULL;
 +    q->nb_packets = 0;
 +    q->size = 0;
 +    SDL_UnlockMutex(q->mutex);
 +}
 +
 +static void packet_queue_end(PacketQueue *q)
 +{
 +    packet_queue_flush(q);
 +    SDL_DestroyMutex(q->mutex);
 +    SDL_DestroyCond(q->cond);
 +}
 +
 +static void packet_queue_abort(PacketQueue *q)
 +{
 +    SDL_LockMutex(q->mutex);
 +
 +    q->abort_request = 1;
 +
 +    SDL_CondSignal(q->cond);
 +
 +    SDL_UnlockMutex(q->mutex);
 +}
 +
 +/* return < 0 if aborted, 0 if no packet and > 0 if packet.  */
 +static int packet_queue_get(PacketQueue *q, AVPacket *pkt, int block)
 +{
 +    AVPacketList *pkt1;
 +    int ret;
 +
 +    SDL_LockMutex(q->mutex);
 +
 +    for (;;) {
 +        if (q->abort_request) {
 +            ret = -1;
 +            break;
 +        }
 +
 +        pkt1 = q->first_pkt;
 +        if (pkt1) {
 +            q->first_pkt = pkt1->next;
 +            if (!q->first_pkt)
 +                q->last_pkt = NULL;
 +            q->nb_packets--;
 +            q->size -= pkt1->pkt.size + sizeof(*pkt1);
 +            *pkt = pkt1->pkt;
 +            av_free(pkt1);
 +            ret = 1;
 +            break;
 +        } else if (!block) {
 +            ret = 0;
 +            break;
 +        } else {
 +            SDL_CondWait(q->cond, q->mutex);
 +        }
 +    }
 +    SDL_UnlockMutex(q->mutex);
 +    return ret;
 +}
 +
 +static inline void fill_rectangle(SDL_Surface *screen,
 +                                  int x, int y, int w, int h, int color)
 +{
 +    SDL_Rect rect;
 +    rect.x = x;
 +    rect.y = y;
 +    rect.w = w;
 +    rect.h = h;
 +    SDL_FillRect(screen, &rect, color);
 +}
 +
 +#define ALPHA_BLEND(a, oldp, newp, s)\
 +((((oldp << s) * (255 - (a))) + (newp * (a))) / (255 << s))
 +
 +#define RGBA_IN(r, g, b, a, s)\
 +{\
 +    unsigned int v = ((const uint32_t *)(s))[0];\
 +    a = (v >> 24) & 0xff;\
 +    r = (v >> 16) & 0xff;\
 +    g = (v >> 8) & 0xff;\
 +    b = v & 0xff;\
 +}
 +
 +#define YUVA_IN(y, u, v, a, s, pal)\
 +{\
 +    unsigned int val = ((const uint32_t *)(pal))[*(const uint8_t*)(s)];\
 +    a = (val >> 24) & 0xff;\
 +    y = (val >> 16) & 0xff;\
 +    u = (val >> 8) & 0xff;\
 +    v = val & 0xff;\
 +}
 +
 +#define YUVA_OUT(d, y, u, v, a)\
 +{\
 +    ((uint32_t *)(d))[0] = (a << 24) | (y << 16) | (u << 8) | v;\
 +}
 +
 +
 +#define BPP 1
 +
 +static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, int imgh)
 +{
 +    int wrap, wrap3, width2, skip2;
 +    int y, u, v, a, u1, v1, a1, w, h;
 +    uint8_t *lum, *cb, *cr;
 +    const uint8_t *p;
 +    const uint32_t *pal;
 +    int dstx, dsty, dstw, dsth;
 +
 +    dstw = av_clip(rect->w, 0, imgw);
 +    dsth = av_clip(rect->h, 0, imgh);
 +    dstx = av_clip(rect->x, 0, imgw - dstw);
 +    dsty = av_clip(rect->y, 0, imgh - dsth);
 +    lum = dst->data[0] + dsty * dst->linesize[0];
 +    cb  = dst->data[1] + (dsty >> 1) * dst->linesize[1];
 +    cr  = dst->data[2] + (dsty >> 1) * dst->linesize[2];
 +
 +    width2 = ((dstw + 1) >> 1) + (dstx & ~dstw & 1);
 +    skip2 = dstx >> 1;
 +    wrap = dst->linesize[0];
 +    wrap3 = rect->pict.linesize[0];
 +    p = rect->pict.data[0];
 +    pal = (const uint32_t *)rect->pict.data[1];  /* Now in YCrCb! */
 +
 +    if (dsty & 1) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            cb++;
 +            cr++;
 +            lum++;
 +            p += BPP;
 +        }
 +        for (w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += 2 * BPP;
 +            lum += 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            p++;
 +            lum++;
 +        }
 +        p += wrap3 - dstw * BPP;
 +        lum += wrap - dstw - dstx;
 +        cb += dst->linesize[1] - width2 - skip2;
 +        cr += dst->linesize[2] - width2 - skip2;
 +    }
 +    for (h = dsth - (dsty & 1); h >= 2; h -= 2) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += -wrap3 + BPP;
 +            lum += -wrap + 1;
 +        }
 +        for (w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 2);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 2);
 +
 +            cb++;
 +            cr++;
 +            p += -wrap3 + 2 * BPP;
 +            lum += -wrap + 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += -wrap3 + BPP;
 +            lum += -wrap + 1;
 +        }
 +        p += wrap3 + (wrap3 - dstw * BPP);
 +        lum += wrap + (wrap - dstw - dstx);
 +        cb += dst->linesize[1] - width2 - skip2;
 +        cr += dst->linesize[2] - width2 - skip2;
 +    }
 +    /* handle odd height */
 +    if (h) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            cb++;
 +            cr++;
 +            lum++;
 +            p += BPP;
 +        }
 +        for (w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v, 1);
 +            cb++;
 +            cr++;
 +            p += 2 * BPP;
 +            lum += 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +        }
 +    }
 +}
 +
 +static void free_subpicture(SubPicture *sp)
 +{
 +    avsubtitle_free(&sp->sub);
 +}
 +
 +static void video_image_display(VideoState *is)
 +{
 +    VideoPicture *vp;
 +    SubPicture *sp;
 +    AVPicture pict;
 +    float aspect_ratio;
 +    int width, height, x, y;
 +    SDL_Rect rect;
 +    int i;
 +
 +    vp = &is->pictq[is->pictq_rindex];
 +    if (vp->bmp) {
 +#if CONFIG_AVFILTER
 +         if (vp->picref->video->sample_aspect_ratio.num == 0)
 +             aspect_ratio = 0;
 +         else
 +             aspect_ratio = av_q2d(vp->picref->video->sample_aspect_ratio);
 +#else
 +
 +        /* XXX: use variable in the frame */
 +        if (is->video_st->sample_aspect_ratio.num)
 +            aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio);
 +        else if (is->video_st->codec->sample_aspect_ratio.num)
 +            aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio);
 +        else
 +            aspect_ratio = 0;
 +#endif
 +        if (aspect_ratio <= 0.0)
 +            aspect_ratio = 1.0;
 +        aspect_ratio *= (float)vp->width / (float)vp->height;
 +
 +        if (is->subtitle_st) {
 +            if (is->subpq_size > 0) {
 +                sp = &is->subpq[is->subpq_rindex];
 +
 +                if (vp->pts >= sp->pts + ((float) sp->sub.start_display_time / 1000)) {
 +                    SDL_LockYUVOverlay (vp->bmp);
 +
 +                    pict.data[0] = vp->bmp->pixels[0];
 +                    pict.data[1] = vp->bmp->pixels[2];
 +                    pict.data[2] = vp->bmp->pixels[1];
 +
 +                    pict.linesize[0] = vp->bmp->pitches[0];
 +                    pict.linesize[1] = vp->bmp->pitches[2];
 +                    pict.linesize[2] = vp->bmp->pitches[1];
 +
 +                    for (i = 0; i < sp->sub.num_rects; i++)
 +                        blend_subrect(&pict, sp->sub.rects[i],
 +                                      vp->bmp->w, vp->bmp->h);
 +
 +                    SDL_UnlockYUVOverlay (vp->bmp);
 +                }
 +            }
 +        }
 +
 +
 +        /* XXX: we suppose the screen has a 1.0 pixel ratio */
 +        height = is->height;
 +        width = ((int)rint(height * aspect_ratio)) & ~1;
 +        if (width > is->width) {
 +            width = is->width;
 +            height = ((int)rint(width / aspect_ratio)) & ~1;
 +        }
 +        x = (is->width - width) / 2;
 +        y = (is->height - height) / 2;
 +        is->no_background = 0;
 +        rect.x = is->xleft + x;
 +        rect.y = is->ytop  + y;
 +        rect.w = FFMAX(width,  1);
 +        rect.h = FFMAX(height, 1);
 +        SDL_DisplayYUVOverlay(vp->bmp, &rect);
 +    }
 +}
 +
 +static inline int compute_mod(int a, int b)
 +{
 +    return a < 0 ? a%b + b : a%b;
 +}
 +
 +static void video_audio_display(VideoState *s)
 +{
 +    int i, i_start, x, y1, y, ys, delay, n, nb_display_channels;
 +    int ch, channels, h, h2, bgcolor, fgcolor;
 +    int16_t time_diff;
 +    int rdft_bits, nb_freq;
 +
 +    for (rdft_bits = 1; (1 << rdft_bits) < 2 * s->height; rdft_bits++)
 +        ;
 +    nb_freq = 1 << (rdft_bits - 1);
 +
 +    /* compute display index : center on currently output samples */
 +    channels = s->audio_tgt_channels;
 +    nb_display_channels = channels;
 +    if (!s->paused) {
 +        int data_used= s->show_mode == SHOW_MODE_WAVES ? s->width : (2*nb_freq);
 +        n = 2 * channels;
 +        delay = s->audio_write_buf_size;
 +        delay /= n;
 +
 +        /* to be more precise, we take into account the time spent since
 +           the last buffer computation */
 +        if (audio_callback_time) {
 +            time_diff = av_gettime() - audio_callback_time;
 +            delay -= (time_diff * s->audio_tgt_freq) / 1000000;
 +        }
 +
 +        delay += 2 * data_used;
 +        if (delay < data_used)
 +            delay = data_used;
 +
 +        i_start= x = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE);
 +        if (s->show_mode == SHOW_MODE_WAVES) {
 +            h = INT_MIN;
 +            for (i = 0; i < 1000; i += channels) {
 +                int idx = (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE;
 +                int a = s->sample_array[idx];
 +                int b = s->sample_array[(idx + 4 * channels) % SAMPLE_ARRAY_SIZE];
 +                int c = s->sample_array[(idx + 5 * channels) % SAMPLE_ARRAY_SIZE];
 +                int d = s->sample_array[(idx + 9 * channels) % SAMPLE_ARRAY_SIZE];
 +                int score = a - d;
 +                if (h < score && (b ^ c) < 0) {
 +                    h = score;
 +                    i_start = idx;
 +                }
 +            }
 +        }
 +
 +        s->last_i_start = i_start;
 +    } else {
 +        i_start = s->last_i_start;
 +    }
 +
 +    bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +    if (s->show_mode == SHOW_MODE_WAVES) {
 +        fill_rectangle(screen,
 +                       s->xleft, s->ytop, s->width, s->height,
 +                       bgcolor);
 +
 +        fgcolor = SDL_MapRGB(screen->format, 0xff, 0xff, 0xff);
 +
 +        /* total height for one channel */
 +        h = s->height / nb_display_channels;
 +        /* graph height / 2 */
 +        h2 = (h * 9) / 20;
 +        for (ch = 0; ch < nb_display_channels; ch++) {
 +            i = i_start + ch;
 +            y1 = s->ytop + ch * h + (h / 2); /* position of center line */
 +            for (x = 0; x < s->width; x++) {
 +                y = (s->sample_array[i] * h2) >> 15;
 +                if (y < 0) {
 +                    y = -y;
 +                    ys = y1 - y;
 +                } else {
 +                    ys = y1;
 +                }
 +                fill_rectangle(screen,
 +                               s->xleft + x, ys, 1, y,
 +                               fgcolor);
 +                i += channels;
 +                if (i >= SAMPLE_ARRAY_SIZE)
 +                    i -= SAMPLE_ARRAY_SIZE;
 +            }
 +        }
 +
 +        fgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0xff);
 +
 +        for (ch = 1; ch < nb_display_channels; ch++) {
 +            y = s->ytop + ch * h;
 +            fill_rectangle(screen,
 +                           s->xleft, y, s->width, 1,
 +                           fgcolor);
 +        }
 +        SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height);
 +    } else {
 +        nb_display_channels= FFMIN(nb_display_channels, 2);
 +        if (rdft_bits != s->rdft_bits) {
 +            av_rdft_end(s->rdft);
 +            av_free(s->rdft_data);
 +            s->rdft = av_rdft_init(rdft_bits, DFT_R2C);
 +            s->rdft_bits = rdft_bits;
 +            s->rdft_data = av_malloc(4 * nb_freq * sizeof(*s->rdft_data));
 +        }
 +        {
 +            FFTSample *data[2];
 +            for (ch = 0; ch < nb_display_channels; ch++) {
 +                data[ch] = s->rdft_data + 2 * nb_freq * ch;
 +                i = i_start + ch;
 +                for (x = 0; x < 2 * nb_freq; x++) {
 +                    double w = (x-nb_freq) * (1.0 / nb_freq);
 +                    data[ch][x] = s->sample_array[i] * (1.0 - w * w);
 +                    i += channels;
 +                    if (i >= SAMPLE_ARRAY_SIZE)
 +                        i -= SAMPLE_ARRAY_SIZE;
 +                }
 +                av_rdft_calc(s->rdft, data[ch]);
 +            }
 +            // least efficient way to do this, we should of course directly access it but its more than fast enough
 +            for (y = 0; y < s->height; y++) {
 +                double w = 1 / sqrt(nb_freq);
 +                int a = sqrt(w * sqrt(data[0][2 * y + 0] * data[0][2 * y + 0] + data[0][2 * y + 1] * data[0][2 * y + 1]));
 +                int b = (nb_display_channels == 2 ) ? sqrt(w * sqrt(data[1][2 * y + 0] * data[1][2 * y + 0]
 +                       + data[1][2 * y + 1] * data[1][2 * y + 1])) : a;
 +                a = FFMIN(a, 255);
 +                b = FFMIN(b, 255);
 +                fgcolor = SDL_MapRGB(screen->format, a, b, (a + b) / 2);
 +
 +                fill_rectangle(screen,
 +                            s->xpos, s->height-y, 1, 1,
 +                            fgcolor);
 +            }
 +        }
 +        SDL_UpdateRect(screen, s->xpos, s->ytop, 1, s->height);
 +        s->xpos++;
 +        if (s->xpos >= s->width)
 +            s->xpos= s->xleft;
 +    }
 +}
 +
 +static void stream_close(VideoState *is)
 +{
 +    VideoPicture *vp;
 +    int i;
 +    /* XXX: use a special url_shutdown call to abort parse cleanly */
 +    is->abort_request = 1;
 +    SDL_WaitThread(is->read_tid, NULL);
 +    SDL_WaitThread(is->refresh_tid, NULL);
 +
 +    /* free all pictures */
 +    for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +        vp = &is->pictq[i];
 +#if CONFIG_AVFILTER
 +        if (vp->picref) {
 +            avfilter_unref_buffer(vp->picref);
 +            vp->picref = NULL;
 +        }
 +#endif
 +        if (vp->bmp) {
 +            SDL_FreeYUVOverlay(vp->bmp);
 +            vp->bmp = NULL;
 +        }
 +    }
 +    SDL_DestroyMutex(is->pictq_mutex);
 +    SDL_DestroyCond(is->pictq_cond);
 +    SDL_DestroyMutex(is->subpq_mutex);
 +    SDL_DestroyCond(is->subpq_cond);
 +#if !CONFIG_AVFILTER
 +    if (is->img_convert_ctx)
 +        sws_freeContext(is->img_convert_ctx);
 +#endif
 +    av_free(is);
 +}
 +
 +static void do_exit(VideoState *is)
 +{
 +    if (is) {
 +        stream_close(is);
 +    }
 +    av_lockmgr_register(NULL);
 +    uninit_opts();
 +#if CONFIG_AVFILTER
 +    avfilter_uninit();
 +#endif
 +    avformat_network_deinit();
 +    if (show_status)
 +        printf("\n");
 +    SDL_Quit();
 +    av_log(NULL, AV_LOG_QUIET, "%s", "");
 +    exit(0);
 +}
 +
 +static void sigterm_handler(int sig)
 +{
 +    exit(123);
 +}
 +
 +static int video_open(VideoState *is, int force_set_video_mode)
 +{
 +    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 && !force_set_video_mode)
 +        return 0;
 +    screen = SDL_SetVideoMode(w, h, 0, flags);
 +    if (!screen) {
 +        fprintf(stderr, "SDL: could not set video mode - exiting\n");
 +        do_exit(is);
 +    }
 +    if (!window_title)
 +        window_title = input_filename;
 +    SDL_WM_SetCaption(window_title, window_title);
 +
 +    is->width  = screen->w;
 +    is->height = screen->h;
 +
 +    return 0;
 +}
 +
 +/* display the current picture, if any */
 +static void video_display(VideoState *is)
 +{
 +    if (!screen)
 +        video_open(is, 0);
 +    if (is->audio_st && is->show_mode != SHOW_MODE_VIDEO)
 +        video_audio_display(is);
 +    else if (is->video_st)
 +        video_image_display(is);
 +}
 +
 +static int refresh_thread(void *opaque)
 +{
 +    VideoState *is= opaque;
 +    while (!is->abort_request) {
 +        SDL_Event event;
 +        event.type = FF_REFRESH_EVENT;
 +        event.user.data1 = opaque;
 +        if (!is->refresh) {
 +            is->refresh = 1;
 +            SDL_PushEvent(&event);
 +        }
 +        //FIXME ideally we should wait the correct time but SDLs event passing is so slow it would be silly
 +        usleep(is->audio_st && is->show_mode != SHOW_MODE_VIDEO ? rdftspeed*1000 : 5000);
 +    }
 +    return 0;
 +}
 +
 +/* get the current audio clock value */
 +static double get_audio_clock(VideoState *is)
 +{
 +    if (is->paused) {
 +        return is->audio_current_pts;
 +    } else {
 +        return is->audio_current_pts_drift + av_gettime() / 1000000.0;
 +    }
 +}
 +
 +/* get the current video clock value */
 +static double get_video_clock(VideoState *is)
 +{
 +    if (is->paused) {
 +        return is->video_current_pts;
 +    } else {
 +        return is->video_current_pts_drift + av_gettime() / 1000000.0;
 +    }
 +}
 +
 +/* get the current external clock value */
 +static double get_external_clock(VideoState *is)
 +{
 +    int64_t ti;
 +    ti = av_gettime();
 +    return is->external_clock + ((ti - is->external_clock_time) * 1e-6);
 +}
 +
 +/* get the current master clock value */
 +static double get_master_clock(VideoState *is)
 +{
 +    double val;
 +
 +    if (is->av_sync_type == AV_SYNC_VIDEO_MASTER) {
 +        if (is->video_st)
 +            val = get_video_clock(is);
 +        else
 +            val = get_audio_clock(is);
 +    } else if (is->av_sync_type == AV_SYNC_AUDIO_MASTER) {
 +        if (is->audio_st)
 +            val = get_audio_clock(is);
 +        else
 +            val = get_video_clock(is);
 +    } else {
 +        val = get_external_clock(is);
 +    }
 +    return val;
 +}
 +
 +/* seek in the stream */
 +static void stream_seek(VideoState *is, int64_t pos, int64_t rel, int seek_by_bytes)
 +{
 +    if (!is->seek_req) {
 +        is->seek_pos = pos;
 +        is->seek_rel = rel;
 +        is->seek_flags &= ~AVSEEK_FLAG_BYTE;
 +        if (seek_by_bytes)
 +            is->seek_flags |= AVSEEK_FLAG_BYTE;
 +        is->seek_req = 1;
 +    }
 +}
 +
 +/* pause or resume the video */
 +static void stream_toggle_pause(VideoState *is)
 +{
 +    if (is->paused) {
 +        is->frame_timer += av_gettime() / 1000000.0 + is->video_current_pts_drift - is->video_current_pts;
 +        if (is->read_pause_return != AVERROR(ENOSYS)) {
 +            is->video_current_pts = is->video_current_pts_drift + av_gettime() / 1000000.0;
 +        }
 +        is->video_current_pts_drift = is->video_current_pts - av_gettime() / 1000000.0;
 +    }
 +    is->paused = !is->paused;
 +}
 +
 +static double compute_target_delay(double delay, VideoState *is)
 +{
 +    double sync_threshold, diff;
 +
 +    /* update delay to follow master synchronisation source */
 +    if (((is->av_sync_type == AV_SYNC_AUDIO_MASTER && is->audio_st) ||
 +         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
 +        /* if video is slave, we try to correct big delays by
 +           duplicating or deleting a frame */
 +        diff = get_video_clock(is) - get_master_clock(is);
 +
 +        /* skip or repeat frame. We take into account the
 +           delay to compute the threshold. I still don't know
 +           if it is the best guess */
 +        sync_threshold = FFMAX(AV_SYNC_THRESHOLD, delay);
 +        if (fabs(diff) < AV_NOSYNC_THRESHOLD) {
 +            if (diff <= -sync_threshold)
 +                delay = 0;
 +            else if (diff >= sync_threshold)
 +                delay = 2 * delay;
 +        }
 +    }
 +
 +    av_dlog(NULL, "video: delay=%0.3f A-V=%f\n",
 +            delay, -diff);
 +
 +    return delay;
 +}
 +
 +static void pictq_next_picture(VideoState *is) {
 +    /* update queue size and signal for next picture */
 +    if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE)
 +        is->pictq_rindex = 0;
 +
 +    SDL_LockMutex(is->pictq_mutex);
 +    is->pictq_size--;
 +    SDL_CondSignal(is->pictq_cond);
 +    SDL_UnlockMutex(is->pictq_mutex);
 +}
 +
 +static void update_video_pts(VideoState *is, double pts, int64_t pos) {
 +    double time = av_gettime() / 1000000.0;
 +    /* update current video pts */
 +    is->video_current_pts = pts;
 +    is->video_current_pts_drift = is->video_current_pts - time;
 +    is->video_current_pos = pos;
 +    is->frame_last_pts = pts;
 +}
 +
 +/* called to display each frame */
 +static void video_refresh(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +    double time;
 +
 +    SubPicture *sp, *sp2;
 +
 +    if (is->video_st) {
 +retry:
 +        if (is->pictq_size == 0) {
 +            SDL_LockMutex(is->pictq_mutex);
 +            if (is->frame_last_dropped_pts != AV_NOPTS_VALUE && is->frame_last_dropped_pts > is->frame_last_pts) {
 +                update_video_pts(is, is->frame_last_dropped_pts, is->frame_last_dropped_pos);
 +                is->frame_last_dropped_pts = AV_NOPTS_VALUE;
 +            }
 +            SDL_UnlockMutex(is->pictq_mutex);
 +            // nothing to do, no picture to display in the que
 +        } else {
 +            double last_duration, duration, delay;
 +            /* dequeue the picture */
 +            vp = &is->pictq[is->pictq_rindex];
 +
 +            if (vp->skip) {
 +                pictq_next_picture(is);
 +                goto retry;
 +            }
 +
 +            /* compute nominal last_duration */
 +            last_duration = vp->pts - is->frame_last_pts;
 +            if (last_duration > 0 && last_duration < 10.0) {
 +                /* if duration of the last frame was sane, update last_duration in video state */
 +                is->frame_last_duration = last_duration;
 +            }
 +            delay = compute_target_delay(is->frame_last_duration, is);
 +
 +            time= av_gettime()/1000000.0;
 +            if (time < is->frame_timer + delay)
 +                return;
 +
 +            if (delay > 0)
 +                is->frame_timer += delay * FFMAX(1, floor((time-is->frame_timer) / delay));
 +
 +            SDL_LockMutex(is->pictq_mutex);
 +            update_video_pts(is, vp->pts, vp->pos);
 +            SDL_UnlockMutex(is->pictq_mutex);
 +
 +            if (is->pictq_size > 1) {
 +                VideoPicture *nextvp = &is->pictq[(is->pictq_rindex + 1) % VIDEO_PICTURE_QUEUE_SIZE];
 +                duration = nextvp->pts - vp->pts; // More accurate this way, 1/time_base is often not reflecting FPS
 +            } else {
 +                duration = vp->duration;
 +            }
 +
 +            if((framedrop>0 || (framedrop && is->audio_st)) && time > is->frame_timer + duration){
 +                if(is->pictq_size > 1){
 +                    is->frame_drops_late++;
 +                    pictq_next_picture(is);
 +                    goto retry;
 +                }
 +            }
 +
 +            if (is->subtitle_st) {
 +                if (is->subtitle_stream_changed) {
 +                    SDL_LockMutex(is->subpq_mutex);
 +
 +                    while (is->subpq_size) {
 +                        free_subpicture(&is->subpq[is->subpq_rindex]);
 +
 +                        /* update queue size and signal for next picture */
 +                        if (++is->subpq_rindex == SUBPICTURE_QUEUE_SIZE)
 +                            is->subpq_rindex = 0;
 +
 +                        is->subpq_size--;
 +                    }
 +                    is->subtitle_stream_changed = 0;
 +
 +                    SDL_CondSignal(is->subpq_cond);
 +                    SDL_UnlockMutex(is->subpq_mutex);
 +                } else {
 +                    if (is->subpq_size > 0) {
 +                        sp = &is->subpq[is->subpq_rindex];
 +
 +                        if (is->subpq_size > 1)
 +                            sp2 = &is->subpq[(is->subpq_rindex + 1) % SUBPICTURE_QUEUE_SIZE];
 +                        else
 +                            sp2 = NULL;
 +
 +                        if ((is->video_current_pts > (sp->pts + ((float) sp->sub.end_display_time / 1000)))
 +                                || (sp2 && is->video_current_pts > (sp2->pts + ((float) sp2->sub.start_display_time / 1000))))
 +                        {
 +                            free_subpicture(sp);
 +
 +                            /* update queue size and signal for next picture */
 +                            if (++is->subpq_rindex == SUBPICTURE_QUEUE_SIZE)
 +                                is->subpq_rindex = 0;
 +
 +                            SDL_LockMutex(is->subpq_mutex);
 +                            is->subpq_size--;
 +                            SDL_CondSignal(is->subpq_cond);
 +                            SDL_UnlockMutex(is->subpq_mutex);
 +                        }
 +                    }
 +                }
 +            }
 +
 +            /* display picture */
 +            if (!display_disable)
 +                video_display(is);
 +
 +            pictq_next_picture(is);
 +        }
 +    } else if (is->audio_st) {
 +        /* draw the next audio frame */
 +
 +        /* if only audio stream, then display the audio bars (better
 +           than nothing, just to test the implementation */
 +
 +        /* display picture */
 +        if (!display_disable)
 +            video_display(is);
 +    }
 +    if (show_status) {
 +        static int64_t last_time;
 +        int64_t cur_time;
 +        int aqsize, vqsize, sqsize;
 +        double av_diff;
 +
 +        cur_time = av_gettime();
 +        if (!last_time || (cur_time - last_time) >= 30000) {
 +            aqsize = 0;
 +            vqsize = 0;
 +            sqsize = 0;
 +            if (is->audio_st)
 +                aqsize = is->audioq.size;
 +            if (is->video_st)
 +                vqsize = is->videoq.size;
 +            if (is->subtitle_st)
 +                sqsize = is->subtitleq.size;
 +            av_diff = 0;
 +            if (is->audio_st && is->video_st)
 +                av_diff = get_audio_clock(is) - get_video_clock(is);
 +            printf("%7.2f A-V:%7.3f fd=%4d aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64"   \r",
 +                   get_master_clock(is),
 +                   av_diff,
 +                   is->frame_drops_early + is->frame_drops_late,
 +                   aqsize / 1024,
 +                   vqsize / 1024,
 +                   sqsize,
 +                   is->video_st ? is->video_st->codec->pts_correction_num_faulty_dts : 0,
 +                   is->video_st ? is->video_st->codec->pts_correction_num_faulty_pts : 0);
 +            fflush(stdout);
 +            last_time = cur_time;
 +        }
 +    }
 +}
 +
 +/* allocate a picture (needs to do that in main thread to avoid
 +   potential locking problems */
 +static void alloc_picture(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +
 +    vp = &is->pictq[is->pictq_windex];
 +
 +    if (vp->bmp)
 +        SDL_FreeYUVOverlay(vp->bmp);
 +
 +#if CONFIG_AVFILTER
 +    if (vp->picref)
 +        avfilter_unref_buffer(vp->picref);
 +    vp->picref = NULL;
 +
 +    vp->width   = is->out_video_filter->inputs[0]->w;
 +    vp->height  = is->out_video_filter->inputs[0]->h;
 +    vp->pix_fmt = is->out_video_filter->inputs[0]->format;
 +#else
 +    vp->width   = is->video_st->codec->width;
 +    vp->height  = is->video_st->codec->height;
 +    vp->pix_fmt = is->video_st->codec->pix_fmt;
 +#endif
 +
 +    vp->bmp = SDL_CreateYUVOverlay(vp->width, vp->height,
 +                                   SDL_YV12_OVERLAY,
 +                                   screen);
 +    if (!vp->bmp || vp->bmp->pitches[0] < vp->width) {
 +        /* SDL allocates a buffer smaller than requested if the video
 +         * overlay hardware is unable to support the requested size. */
 +        fprintf(stderr, "Error: the video system does not support an image\n"
 +                        "size of %dx%d pixels. Try using -lowres or -vf \"scale=w:h\"\n"
 +                        "to reduce the image size.\n", vp->width, vp->height );
 +        do_exit(is);
 +    }
 +
 +    SDL_LockMutex(is->pictq_mutex);
 +    vp->allocated = 1;
 +    SDL_CondSignal(is->pictq_cond);
 +    SDL_UnlockMutex(is->pictq_mutex);
 +}
 +
 +static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_t pos)
 +{
 +    VideoPicture *vp;
 +    double frame_delay, pts = pts1;
 +
 +    /* compute the exact PTS for the picture if it is omitted in the stream
 +     * pts1 is the dts of the pkt / pts of the frame */
 +    if (pts != 0) {
 +        /* update video clock with pts, if present */
 +        is->video_clock = pts;
 +    } else {
 +        pts = is->video_clock;
 +    }
 +    /* update video clock for next frame */
 +    frame_delay = av_q2d(is->video_st->codec->time_base);
 +    /* for MPEG2, the frame can be repeated, so we update the
 +       clock accordingly */
 +    frame_delay += src_frame->repeat_pict * (frame_delay * 0.5);
 +    is->video_clock += frame_delay;
 +
 +#if defined(DEBUG_SYNC) && 0
 +    printf("frame_type=%c clock=%0.3f pts=%0.3f\n",
 +           av_get_picture_type_char(src_frame->pict_type), pts, pts1);
 +#endif
 +
 +    /* wait until we have space to put a new picture */
 +    SDL_LockMutex(is->pictq_mutex);
 +
 +    while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE &&
 +           !is->videoq.abort_request) {
 +        SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +    }
 +    SDL_UnlockMutex(is->pictq_mutex);
 +
 +    if (is->videoq.abort_request)
 +        return -1;
 +
 +    vp = &is->pictq[is->pictq_windex];
 +
 +    vp->duration = frame_delay;
 +
 +    /* alloc or resize hardware picture buffer */
 +    if (!vp->bmp || vp->reallocate ||
 +#if CONFIG_AVFILTER
 +        vp->width  != is->out_video_filter->inputs[0]->w ||
 +        vp->height != is->out_video_filter->inputs[0]->h) {
 +#else
 +        vp->width != is->video_st->codec->width ||
 +        vp->height != is->video_st->codec->height) {
 +#endif
 +        SDL_Event event;
 +
 +        vp->allocated  = 0;
 +        vp->reallocate = 0;
 +
 +        /* the allocation must be done in the main thread to avoid
 +           locking problems */
 +        event.type = FF_ALLOC_EVENT;
 +        event.user.data1 = is;
 +        SDL_PushEvent(&event);
 +
 +        /* wait until the picture is allocated */
 +        SDL_LockMutex(is->pictq_mutex);
 +        while (!vp->allocated && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        /* if the queue is aborted, we have to pop the pending ALLOC event or wait for the allocation to complete */
 +        if (is->videoq.abort_request && SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_EVENTMASK(FF_ALLOC_EVENT)) != 1) {
 +            while (!vp->allocated) {
 +                SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +            }
 +        }
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        if (is->videoq.abort_request)
 +            return -1;
 +    }
 +
 +    /* if the frame is not skipped, then display it */
 +    if (vp->bmp) {
 +        AVPicture pict;
 +#if CONFIG_AVFILTER
 +        if (vp->picref)
 +            avfilter_unref_buffer(vp->picref);
 +        vp->picref = src_frame->opaque;
 +#endif
 +
 +        /* get a pointer on the bitmap */
 +        SDL_LockYUVOverlay (vp->bmp);
 +
 +        memset(&pict, 0, sizeof(AVPicture));
 +        pict.data[0] = vp->bmp->pixels[0];
 +        pict.data[1] = vp->bmp->pixels[2];
 +        pict.data[2] = vp->bmp->pixels[1];
 +
 +        pict.linesize[0] = vp->bmp->pitches[0];
 +        pict.linesize[1] = vp->bmp->pitches[2];
 +        pict.linesize[2] = vp->bmp->pitches[1];
 +
 +#if CONFIG_AVFILTER
 +        // FIXME use direct rendering
 +        av_picture_copy(&pict, (AVPicture *)src_frame,
 +                        vp->pix_fmt, vp->width, vp->height);
 +#else
 +        sws_flags = av_get_int(sws_opts, "sws_flags", NULL);
 +        is->img_convert_ctx = sws_getCachedContext(is->img_convert_ctx,
 +            vp->width, vp->height, vp->pix_fmt, vp->width, vp->height,
 +            PIX_FMT_YUV420P, sws_flags, NULL, NULL, NULL);
 +        if (is->img_convert_ctx == NULL) {
 +            fprintf(stderr, "Cannot initialize the conversion context\n");
 +            exit(1);
 +        }
 +        sws_scale(is->img_convert_ctx, src_frame->data, src_frame->linesize,
 +                  0, vp->height, pict.data, pict.linesize);
 +#endif
 +        /* update the bitmap content */
 +        SDL_UnlockYUVOverlay(vp->bmp);
 +
 +        vp->pts = pts;
 +        vp->pos = pos;
 +        vp->skip = 0;
 +
 +        /* now we can update the picture count */
 +        if (++is->pictq_windex == VIDEO_PICTURE_QUEUE_SIZE)
 +            is->pictq_windex = 0;
 +        SDL_LockMutex(is->pictq_mutex);
 +        is->pictq_size++;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +    }
 +    return 0;
 +}
 +
 +static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacket *pkt)
 +{
 +    int got_picture, i;
 +
 +    if (packet_queue_get(&is->videoq, pkt, 1) < 0)
 +        return -1;
 +
 +    if (pkt->data == flush_pkt.data) {
 +        avcodec_flush_buffers(is->video_st->codec);
 +
 +        SDL_LockMutex(is->pictq_mutex);
 +        // Make sure there are no long delay timers (ideally we should just flush the que but thats harder)
 +        for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +            is->pictq[i].skip = 1;
 +        }
 +        while (is->pictq_size && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        is->video_current_pos = -1;
 +        is->frame_last_pts = AV_NOPTS_VALUE;
 +        is->frame_last_duration = 0;
 +        is->frame_timer = (double)av_gettime() / 1000000.0;
 +        is->frame_last_dropped_pts = AV_NOPTS_VALUE;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        return 0;
 +    }
 +
 +    avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt);
 +
 +    if (got_picture) {
 +        int ret = 1;
 +
 +        if (decoder_reorder_pts == -1) {
 +            *pts = *(int64_t*)av_opt_ptr(avcodec_get_frame_class(), frame, "best_effort_timestamp");
 +        } else if (decoder_reorder_pts) {
 +            *pts = frame->pkt_pts;
 +        } else {
 +            *pts = frame->pkt_dts;
 +        }
 +
 +        if (*pts == AV_NOPTS_VALUE) {
 +            *pts = 0;
 +        }
 +
 +        if (((is->av_sync_type == AV_SYNC_AUDIO_MASTER && is->audio_st) || is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK) &&
 +             (framedrop>0 || (framedrop && is->audio_st))) {
 +            SDL_LockMutex(is->pictq_mutex);
 +            if (is->frame_last_pts != AV_NOPTS_VALUE && *pts) {
 +                double clockdiff = get_video_clock(is) - get_master_clock(is);
 +                double dpts = av_q2d(is->video_st->time_base) * *pts;
 +                double ptsdiff = dpts - is->frame_last_pts;
 +                if (fabs(clockdiff) < AV_NOSYNC_THRESHOLD &&
 +                     ptsdiff > 0 && ptsdiff < AV_NOSYNC_THRESHOLD &&
 +                     clockdiff + ptsdiff - is->frame_last_filter_delay < 0) {
 +                    is->frame_last_dropped_pos = pkt->pos;
 +                    is->frame_last_dropped_pts = dpts;
 +                    is->frame_drops_early++;
 +                    ret = 0;
 +                }
 +            }
 +            SDL_UnlockMutex(is->pictq_mutex);
 +        }
 +
 +        if (ret)
 +            is->frame_last_returned_time = av_gettime() / 1000000.0;
 +
 +        return ret;
 +    }
 +    return 0;
 +}
 +
 +#if CONFIG_AVFILTER
 +typedef struct {
 +    VideoState *is;
 +    AVFrame *frame;
 +    int use_dr1;
 +} FilterPriv;
 +
 +static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    AVFilterContext *ctx = codec->opaque;
 +    AVFilterBufferRef  *ref;
 +    int perms = AV_PERM_WRITE;
 +    int i, w, h, stride[4];
 +    unsigned edge;
 +    int pixel_size;
 +
 +    av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE);
 +
 +    if (codec->codec->capabilities & CODEC_CAP_NEG_LINESIZES)
 +        perms |= AV_PERM_NEG_LINESIZES;
 +
 +    if (pic->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 (codec->pix_fmt != ctx->outputs[0]->format) {
 +        av_log(codec, AV_LOG_ERROR, "Pixel format mismatches %d %d\n", codec->pix_fmt, ctx->outputs[0]->format);
 +        return -1;
 +    }
 +    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->type   = FF_BUFFER_TYPE_USER;
 +    pic->reordered_opaque = codec->reordered_opaque;
 +    if (codec->pkt) pic->pkt_pts = codec->pkt->pts;
 +    else            pic->pkt_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +static void input_release_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    memset(pic->data, 0, sizeof(pic->data));
 +    avfilter_unref_buffer(pic->opaque);
 +}
 +
 +static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    AVFilterBufferRef *ref = pic->opaque;
 +
 +    if (pic->data[0] == NULL) {
 +        pic->buffer_hints |= FF_BUFFER_HINTS_READABLE;
 +        return codec->get_buffer(codec, pic);
 +    }
 +
 +    if ((codec->width != ref->video->w) || (codec->height != ref->video->h) ||
 +        (codec->pix_fmt != ref->format)) {
 +        av_log(codec, AV_LOG_ERROR, "Picture properties changed.\n");
 +        return -1;
 +    }
 +
 +    pic->reordered_opaque = codec->reordered_opaque;
 +    if (codec->pkt) pic->pkt_pts = codec->pkt->pts;
 +    else            pic->pkt_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +static int input_init(AVFilterContext *ctx, const char *args, void *opaque)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    AVCodecContext *codec;
 +    if (!opaque) return -1;
 +
 +    priv->is = opaque;
 +    codec    = priv->is->video_st->codec;
 +    codec->opaque = ctx;
 +    if (codec->codec->capabilities & CODEC_CAP_DR1) {
 +        av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE);
 +        priv->use_dr1 = 1;
 +        codec->get_buffer     = input_get_buffer;
 +        codec->release_buffer = input_release_buffer;
 +        codec->reget_buffer   = input_reget_buffer;
 +        codec->thread_safe_callbacks = 1;
 +    }
 +
 +    priv->frame = avcodec_alloc_frame();
 +
 +    return 0;
 +}
 +
 +static void input_uninit(AVFilterContext *ctx)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    av_free(priv->frame);
 +}
 +
 +static int input_request_frame(AVFilterLink *link)
 +{
 +    FilterPriv *priv = link->src->priv;
 +    AVFilterBufferRef *picref;
 +    int64_t pts = 0;
 +    AVPacket pkt;
 +    int ret;
 +
 +    while (!(ret = get_video_frame(priv->is, priv->frame, &pts, &pkt)))
 +        av_free_packet(&pkt);
 +    if (ret < 0)
 +        return -1;
 +
 +    if (priv->use_dr1 && priv->frame->opaque) {
 +        picref = avfilter_ref_buffer(priv->frame->opaque, ~0);
 +    } else {
 +        picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h);
 +        av_image_copy(picref->data, picref->linesize,
 +                      priv->frame->data, priv->frame->linesize,
 +                      picref->format, link->w, link->h);
 +    }
 +    av_free_packet(&pkt);
 +
 +    avfilter_copy_frame_props(picref, priv->frame);
 +    picref->pts = pts;
 +
 +    avfilter_start_frame(link, picref);
 +    avfilter_draw_slice(link, 0, link->h, 1);
 +    avfilter_end_frame(link);
 +
 +    return 0;
 +}
 +
 +static int input_query_formats(AVFilterContext *ctx)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    enum PixelFormat pix_fmts[] = {
 +        priv->is->video_st->codec->pix_fmt, PIX_FMT_NONE
 +    };
 +
 +    avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts));
 +    return 0;
 +}
 +
 +static int input_config_props(AVFilterLink *link)
 +{
 +    FilterPriv *priv  = link->src->priv;
 +    AVStream *s = priv->is->video_st;
 +
 +    link->w = s->codec->width;
 +    link->h = s->codec->height;
 +    link->sample_aspect_ratio = s->sample_aspect_ratio.num ?
 +        s->sample_aspect_ratio : s->codec->sample_aspect_ratio;
 +    link->time_base = s->time_base;
 +
 +    return 0;
 +}
 +
 +static AVFilter input_filter =
 +{
 +    .name      = "ffplay_input",
 +
 +    .priv_size = sizeof(FilterPriv),
 +
 +    .init      = input_init,
 +    .uninit    = input_uninit,
 +
 +    .query_formats = input_query_formats,
 +
 +    .inputs    = (AVFilterPad[]) {{ .name = NULL }},
 +    .outputs   = (AVFilterPad[]) {{ .name = "default",
 +                                    .type = AVMEDIA_TYPE_VIDEO,
 +                                    .request_frame = input_request_frame,
 +                                    .config_props  = input_config_props, },
 +                                  { .name = NULL }},
 +};
 +
 +static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const char *vfilters)
 +{
 +    char sws_flags_str[128];
 +    int ret;
 +    enum PixelFormat pix_fmts[] = { PIX_FMT_YUV420P, PIX_FMT_NONE };
 +    AVBufferSinkParams *buffersink_params = av_buffersink_params_alloc();
 +    AVFilterContext *filt_src = NULL, *filt_out = NULL;
 +    snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags);
 +    graph->scale_sws_opts = av_strdup(sws_flags_str);
 +
 +    if ((ret = avfilter_graph_create_filter(&filt_src, &input_filter, "src",
 +                                            NULL, is, graph)) < 0)
 +        return ret;
 +#if FF_API_OLD_VSINK_API
 +    ret = avfilter_graph_create_filter(&filt_out, avfilter_get_by_name("buffersink"), "out",
 +                                       NULL, pix_fmts, graph);
 +#else
 +    buffersink_params->pixel_fmts = pix_fmts;
 +    ret = avfilter_graph_create_filter(&filt_out, avfilter_get_by_name("buffersink"), "out",
 +                                       NULL, buffersink_params, graph);
 +#endif
 +    av_freep(&buffersink_params);
 +    if (ret < 0)
 +        return ret;
 +
 +    if (vfilters) {
 +        AVFilterInOut *outputs = avfilter_inout_alloc();
 +        AVFilterInOut *inputs  = avfilter_inout_alloc();
 +
 +        outputs->name    = av_strdup("in");
 +        outputs->filter_ctx = filt_src;
 +        outputs->pad_idx = 0;
 +        outputs->next    = NULL;
 +
 +        inputs->name    = av_strdup("out");
 +        inputs->filter_ctx = filt_out;
 +        inputs->pad_idx = 0;
 +        inputs->next    = NULL;
 +
 +        if ((ret = avfilter_graph_parse(graph, vfilters, &inputs, &outputs, NULL)) < 0)
 +            return ret;
 +    } else {
 +        if ((ret = avfilter_link(filt_src, 0, filt_out, 0)) < 0)
 +            return ret;
 +    }
 +
 +    if ((ret = avfilter_graph_config(graph, NULL)) < 0)
 +        return ret;
 +
 +    is->out_video_filter = filt_out;
 +
 +    return ret;
 +}
 +
 +#endif  /* CONFIG_AVFILTER */
 +
 +static int video_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    AVFrame *frame = avcodec_alloc_frame();
 +    int64_t pts_int = AV_NOPTS_VALUE, pos = -1;
 +    double pts;
 +    int ret;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterGraph *graph = avfilter_graph_alloc();
 +    AVFilterContext *filt_out = NULL;
 +    int last_w = is->video_st->codec->width;
 +    int last_h = is->video_st->codec->height;
 +
 +    if ((ret = configure_video_filters(graph, is, vfilters)) < 0)
 +        goto the_end;
 +    filt_out = is->out_video_filter;
 +#endif
 +
 +    for (;;) {
 +#if !CONFIG_AVFILTER
 +        AVPacket pkt;
 +#else
 +        AVFilterBufferRef *picref;
 +        AVRational tb = filt_out->inputs[0]->time_base;
 +#endif
 +        while (is->paused && !is->videoq.abort_request)
 +            SDL_Delay(10);
 +#if CONFIG_AVFILTER
 +        if (   last_w != is->video_st->codec->width
 +            || last_h != is->video_st->codec->height) {
 +            av_log(NULL, AV_LOG_INFO, "Frame changed from size:%dx%d to size:%dx%d\n",
 +                   last_w, last_h, is->video_st->codec->width, is->video_st->codec->height);
 +            avfilter_graph_free(&graph);
 +            graph = avfilter_graph_alloc();
 +            if ((ret = configure_video_filters(graph, is, vfilters)) < 0)
 +                goto the_end;
 +            filt_out = is->out_video_filter;
 +            last_w = is->video_st->codec->width;
 +            last_h = is->video_st->codec->height;
 +        }
 +        ret = av_buffersink_get_buffer_ref(filt_out, &picref, 0);
 +        if (picref) {
 +            avfilter_fill_frame_from_video_buffer_ref(frame, picref);
 +            pts_int = picref->pts;
 +            pos     = picref->pos;
 +            frame->opaque = picref;
 +        }
 +
 +        if (av_cmp_q(tb, is->video_st->time_base)) {
 +            av_unused int64_t pts1 = pts_int;
 +            pts_int = av_rescale_q(pts_int, tb, is->video_st->time_base);
 +            av_dlog(NULL, "video_thread(): "
 +                    "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n",
 +                    tb.num, tb.den, pts1,
 +                    is->video_st->time_base.num, is->video_st->time_base.den, pts_int);
 +        }
 +#else
 +        ret = get_video_frame(is, frame, &pts_int, &pkt);
 +        pos = pkt.pos;
 +        av_free_packet(&pkt);
 +#endif
 +
 +        if (ret < 0)
 +            goto the_end;
 +
 +        is->frame_last_filter_delay = av_gettime() / 1000000.0 - is->frame_last_returned_time;
 +        if (fabs(is->frame_last_filter_delay) > AV_NOSYNC_THRESHOLD / 10.0)
 +            is->frame_last_filter_delay = 0;
 +
 +#if CONFIG_AVFILTER
 +        if (!picref)
 +            continue;
 +#endif
 +
 +        pts = pts_int * av_q2d(is->video_st->time_base);
 +
 +        ret = queue_picture(is, frame, pts, pos);
 +
 +        if (ret < 0)
 +            goto the_end;
 +
 +        if (is->step)
 +            stream_toggle_pause(is);
 +    }
 + the_end:
 +#if CONFIG_AVFILTER
 +    avfilter_graph_free(&graph);
 +#endif
 +    av_free(frame);
 +    return 0;
 +}
 +
 +static int subtitle_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    SubPicture *sp;
 +    AVPacket pkt1, *pkt = &pkt1;
 +    int got_subtitle;
 +    double pts;
 +    int i, j;
 +    int r, g, b, y, u, v, a;
 +
 +    for (;;) {
 +        while (is->paused && !is->subtitleq.abort_request) {
 +            SDL_Delay(10);
 +        }
 +        if (packet_queue_get(&is->subtitleq, pkt, 1) < 0)
 +            break;
 +
 +        if (pkt->data == flush_pkt.data) {
 +            avcodec_flush_buffers(is->subtitle_st->codec);
 +            continue;
 +        }
 +        SDL_LockMutex(is->subpq_mutex);
 +        while (is->subpq_size >= SUBPICTURE_QUEUE_SIZE &&
 +               !is->subtitleq.abort_request) {
 +            SDL_CondWait(is->subpq_cond, is->subpq_mutex);
 +        }
 +        SDL_UnlockMutex(is->subpq_mutex);
 +
 +        if (is->subtitleq.abort_request)
 +            return 0;
 +
 +        sp = &is->subpq[is->subpq_windex];
 +
 +       /* NOTE: ipts is the PTS of the _first_ picture beginning in
 +           this packet, if any */
 +        pts = 0;
 +        if (pkt->pts != AV_NOPTS_VALUE)
 +            pts = av_q2d(is->subtitle_st->time_base) * pkt->pts;
 +
 +        avcodec_decode_subtitle2(is->subtitle_st->codec, &sp->sub,
 +                                 &got_subtitle, pkt);
 +
 +        if (got_subtitle && sp->sub.format == 0) {
 +            sp->pts = pts;
 +
 +            for (i = 0; i < sp->sub.num_rects; i++)
 +            {
 +                for (j = 0; j < sp->sub.rects[i]->nb_colors; j++)
 +                {
 +                    RGBA_IN(r, g, b, a, (uint32_t*)sp->sub.rects[i]->pict.data[1] + j);
 +                    y = RGB_TO_Y_CCIR(r, g, b);
 +                    u = RGB_TO_U_CCIR(r, g, b, 0);
 +                    v = RGB_TO_V_CCIR(r, g, b, 0);
 +                    YUVA_OUT((uint32_t*)sp->sub.rects[i]->pict.data[1] + j, y, u, v, a);
 +                }
 +            }
 +
 +            /* now we can update the picture count */
 +            if (++is->subpq_windex == SUBPICTURE_QUEUE_SIZE)
 +                is->subpq_windex = 0;
 +            SDL_LockMutex(is->subpq_mutex);
 +            is->subpq_size++;
 +            SDL_UnlockMutex(is->subpq_mutex);
 +        }
 +        av_free_packet(pkt);
 +    }
 +    return 0;
 +}
 +
 +/* copy samples for viewing in editor window */
 +static void update_sample_display(VideoState *is, short *samples, int samples_size)
 +{
 +    int size, len;
 +
 +    size = samples_size / sizeof(short);
 +    while (size > 0) {
 +        len = SAMPLE_ARRAY_SIZE - is->sample_array_index;
 +        if (len > size)
 +            len = size;
 +        memcpy(is->sample_array + is->sample_array_index, samples, len * sizeof(short));
 +        samples += len;
 +        is->sample_array_index += len;
 +        if (is->sample_array_index >= SAMPLE_ARRAY_SIZE)
 +            is->sample_array_index = 0;
 +        size -= len;
 +    }
 +}
 +
 +/* return the wanted number of samples to get better sync if sync_type is video
 + * or external master clock */
 +static int synchronize_audio(VideoState *is, int nb_samples)
 +{
 +    int wanted_nb_samples = nb_samples;
 +
 +    /* 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 min_nb_samples, max_nb_samples;
 +
 +        diff = get_audio_clock(is) - get_master_clock(is);
 +
 +        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_nb_samples = nb_samples + (int)(diff * is->audio_src_freq);
 +                    min_nb_samples = ((nb_samples * (100 - SAMPLE_CORRECTION_PERCENT_MAX) / 100));
 +                    max_nb_samples = ((nb_samples * (100 + SAMPLE_CORRECTION_PERCENT_MAX) / 100));
 +                    wanted_nb_samples = FFMIN(FFMAX(wanted_nb_samples, min_nb_samples), max_nb_samples);
 +                }
 +                av_dlog(NULL, "diff=%f adiff=%f sample_diff=%d apts=%0.3f vpts=%0.3f %f\n",
 +                        diff, avg_diff, wanted_nb_samples - nb_samples,
 +                        is->audio_clock, is->video_clock, is->audio_diff_threshold);
 +            }
 +        } else {
 +            /* too big difference : may be initial PTS errors, so
 +               reset A-V filter */
 +            is->audio_diff_avg_count = 0;
 +            is->audio_diff_cum       = 0;
 +        }
 +    }
 +
 +    return wanted_nb_samples;
 +}
 +
 +/* decode one audio frame and returns its uncompressed size */
 +static int audio_decode_frame(VideoState *is, double *pts_ptr)
 +{
 +    AVPacket *pkt_temp = &is->audio_pkt_temp;
 +    AVPacket *pkt = &is->audio_pkt;
 +    AVCodecContext *dec = is->audio_st->codec;
 +    int len1, len2, data_size, resampled_data_size;
 +    int64_t dec_channel_layout;
 +    int got_frame;
 +    double pts;
 +    int new_packet = 0;
 +    int flush_complete = 0;
 +    int wanted_nb_samples;
 +
 +    for (;;) {
 +        /* NOTE: the audio packet can contain several frames */
 +        while (pkt_temp->size > 0 || (!pkt_temp->data && new_packet)) {
 +            if (!is->frame) {
 +                if (!(is->frame = avcodec_alloc_frame()))
 +                    return AVERROR(ENOMEM);
 +            } else
 +                avcodec_get_frame_defaults(is->frame);
 +
 +            if (flush_complete)
 +                break;
 +            new_packet = 0;
 +            len1 = avcodec_decode_audio4(dec, is->frame, &got_frame, pkt_temp);
 +            if (len1 < 0) {
 +                /* if error, we skip the frame */
 +                pkt_temp->size = 0;
 +                break;
 +            }
 +
 +            pkt_temp->data += len1;
 +            pkt_temp->size -= len1;
 +
 +            if (!got_frame) {
 +                /* stop sending empty packets if the decoder is finished */
 +                if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY)
 +                    flush_complete = 1;
 +                continue;
 +            }
 +            data_size = av_samples_get_buffer_size(NULL, dec->channels,
 +                                                   is->frame->nb_samples,
 +                                                   dec->sample_fmt, 1);
 +
 +            dec_channel_layout = (dec->channel_layout && dec->channels == av_get_channel_layout_nb_channels(dec->channel_layout)) ? dec->channel_layout : av_get_default_channel_layout(dec->channels);
 +            wanted_nb_samples = synchronize_audio(is, is->frame->nb_samples);
 +
 +            if (dec->sample_fmt != is->audio_src_fmt ||
 +                dec_channel_layout != is->audio_src_channel_layout ||
 +                dec->sample_rate != is->audio_src_freq ||
 +                (wanted_nb_samples != is->frame->nb_samples && !is->swr_ctx)) {
 +                if (is->swr_ctx)
 +                    swr_free(&is->swr_ctx);
 +                is->swr_ctx = swr_alloc_set_opts(NULL,
 +                                                 is->audio_tgt_channel_layout, is->audio_tgt_fmt, is->audio_tgt_freq,
 +                                                 dec_channel_layout,           dec->sample_fmt,   dec->sample_rate,
 +                                                 0, NULL);
 +                if (!is->swr_ctx || swr_init(is->swr_ctx) < 0) {
 +                    fprintf(stderr, "Cannot create sample rate converter for conversion of %d Hz %s %d channels to %d Hz %s %d channels!\n",
 +                        dec->sample_rate,
 +                        av_get_sample_fmt_name(dec->sample_fmt),
 +                        dec->channels,
 +                        is->audio_tgt_freq,
 +                        av_get_sample_fmt_name(is->audio_tgt_fmt),
 +                        is->audio_tgt_channels);
 +                    break;
 +                }
 +                is->audio_src_channel_layout = dec_channel_layout;
 +                is->audio_src_channels = dec->channels;
 +                is->audio_src_freq = dec->sample_rate;
 +                is->audio_src_fmt = dec->sample_fmt;
 +            }
 +
 +            resampled_data_size = data_size;
 +            if (is->swr_ctx) {
 +                const uint8_t *in[] = { is->frame->data[0] };
 +                uint8_t *out[] = {is->audio_buf2};
 +                if (wanted_nb_samples != is->frame->nb_samples) {
 +                    if (swr_set_compensation(is->swr_ctx, (wanted_nb_samples - is->frame->nb_samples) * is->audio_tgt_freq / dec->sample_rate,
 +                                                wanted_nb_samples * is->audio_tgt_freq / dec->sample_rate) < 0) {
 +                        fprintf(stderr, "swr_set_compensation() failed\n");
 +                        break;
 +                    }
 +                }
 +                len2 = swr_convert(is->swr_ctx, out, sizeof(is->audio_buf2) / is->audio_tgt_channels / av_get_bytes_per_sample(is->audio_tgt_fmt),
 +                                                in, is->frame->nb_samples);
 +                if (len2 < 0) {
 +                    fprintf(stderr, "audio_resample() failed\n");
 +                    break;
 +                }
 +                if (len2 == sizeof(is->audio_buf2) / is->audio_tgt_channels / av_get_bytes_per_sample(is->audio_tgt_fmt)) {
 +                    fprintf(stderr, "warning: audio buffer is probably too small\n");
 +                    swr_init(is->swr_ctx);
 +                }
 +                is->audio_buf = is->audio_buf2;
 +                resampled_data_size = len2 * is->audio_tgt_channels * av_get_bytes_per_sample(is->audio_tgt_fmt);
 +            } else {
 +                is->audio_buf = is->frame->data[0];
 +            }
 +
 +            /* if no pts, then compute it */
 +            pts = is->audio_clock;
 +            *pts_ptr = pts;
 +            is->audio_clock += (double)data_size / (dec->channels * dec->sample_rate * av_get_bytes_per_sample(dec->sample_fmt));
 +#ifdef DEBUG
 +            {
 +                static double last_clock;
 +                printf("audio: delay=%0.3f clock=%0.3f pts=%0.3f\n",
 +                       is->audio_clock - last_clock,
 +                       is->audio_clock, pts);
 +                last_clock = is->audio_clock;
 +            }
 +#endif
 +            return resampled_data_size;
 +        }
 +
 +        /* free the current packet */
 +        if (pkt->data)
 +            av_free_packet(pkt);
 +        memset(pkt_temp, 0, sizeof(*pkt_temp));
 +
 +        if (is->paused || is->audioq.abort_request) {
 +            return -1;
 +        }
 +
 +        /* read next packet */
 +        if ((new_packet = packet_queue_get(&is->audioq, pkt, 1)) < 0)
 +            return -1;
 +
 +        if (pkt->data == flush_pkt.data)
 +            avcodec_flush_buffers(dec);
 +
 +        *pkt_temp = *pkt;
 +
 +        /* if update the audio clock with the pts */
 +        if (pkt->pts != AV_NOPTS_VALUE) {
 +            is->audio_clock = av_q2d(is->audio_st->time_base)*pkt->pts;
 +        }
 +    }
 +}
 +
 +/* prepare a new audio buffer */
 +static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
 +{
 +    VideoState *is = opaque;
 +    int audio_size, len1;
 +    int bytes_per_sec;
 +    int frame_size = av_samples_get_buffer_size(NULL, is->audio_tgt_channels, 1, is->audio_tgt_fmt, 1);
 +    double pts;
 +
 +    audio_callback_time = av_gettime();
 +
 +    while (len > 0) {
 +        if (is->audio_buf_index >= is->audio_buf_size) {
 +           audio_size = audio_decode_frame(is, &pts);
 +           if (audio_size < 0) {
 +                /* if error, just output silence */
 +               is->audio_buf      = is->silence_buf;
 +               is->audio_buf_size = sizeof(is->silence_buf) / frame_size * frame_size;
 +           } else {
 +               if (is->show_mode != SHOW_MODE_VIDEO)
 +                   update_sample_display(is, (int16_t *)is->audio_buf, audio_size);
 +               is->audio_buf_size = audio_size;
 +           }
 +           is->audio_buf_index = 0;
 +        }
 +        len1 = is->audio_buf_size - is->audio_buf_index;
 +        if (len1 > len)
 +            len1 = len;
 +        memcpy(stream, (uint8_t *)is->audio_buf + is->audio_buf_index, len1);
 +        len -= len1;
 +        stream += len1;
 +        is->audio_buf_index += len1;
 +    }
 +    bytes_per_sec = is->audio_tgt_freq * is->audio_tgt_channels * av_get_bytes_per_sample(is->audio_tgt_fmt);
 +    is->audio_write_buf_size = is->audio_buf_size - is->audio_buf_index;
 +    /* Let's assume the audio driver that is used by SDL has two periods. */
 +    is->audio_current_pts = is->audio_clock - (double)(2 * is->audio_hw_buf_size + is->audio_write_buf_size) / bytes_per_sec;
 +    is->audio_current_pts_drift = is->audio_current_pts - audio_callback_time / 1000000.0;
 +}
 +
 +/* open a given stream. Return 0 if OK */
 +static int stream_component_open(VideoState *is, int stream_index)
 +{
 +    AVFormatContext *ic = is->ic;
 +    AVCodecContext *avctx;
 +    AVCodec *codec;
 +    SDL_AudioSpec wanted_spec, spec;
 +    AVDictionary *opts;
 +    AVDictionaryEntry *t = NULL;
 +    int64_t wanted_channel_layout = 0;
 +    int wanted_nb_channels;
 +    const char *env;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return -1;
 +    avctx = ic->streams[stream_index]->codec;
 +
 +    codec = avcodec_find_decoder(avctx->codec_id);
 +    opts = filter_codec_opts(codec_opts, codec, ic, ic->streams[stream_index]);
 +
 +    switch(avctx->codec_type){
 +        case AVMEDIA_TYPE_AUDIO   : if(audio_codec_name   ) codec= avcodec_find_decoder_by_name(   audio_codec_name); break;
 +        case AVMEDIA_TYPE_SUBTITLE: if(subtitle_codec_name) codec= avcodec_find_decoder_by_name(subtitle_codec_name); break;
 +        case AVMEDIA_TYPE_VIDEO   : if(video_codec_name   ) codec= avcodec_find_decoder_by_name(   video_codec_name); break;
 +    }
 +    if (!codec)
 +        return -1;
 +
 +    avctx->workaround_bugs   = workaround_bugs;
 +    avctx->lowres            = lowres;
 +    if(avctx->lowres > codec->max_lowres){
 +        av_log(avctx, AV_LOG_WARNING, "The maximum value for lowres supported by the decoder is %d\n",
 +                codec->max_lowres);
 +        avctx->lowres= codec->max_lowres;
 +    }
 +    avctx->idct_algo         = idct;
 +    avctx->skip_frame        = skip_frame;
 +    avctx->skip_idct         = skip_idct;
 +    avctx->skip_loop_filter  = skip_loop_filter;
 +    avctx->error_recognition = error_recognition;
 +    avctx->error_concealment = error_concealment;
 +
 +    if(avctx->lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +    if (fast)   avctx->flags2 |= CODEC_FLAG2_FAST;
 +    if(codec->capabilities & CODEC_CAP_DR1)
 +        avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        env = SDL_getenv("SDL_AUDIO_CHANNELS");
 +        if (env)
 +            wanted_channel_layout = av_get_default_channel_layout(SDL_atoi(env));
 +        if (!wanted_channel_layout) {
 +            wanted_channel_layout = (avctx->channel_layout && avctx->channels == av_get_channel_layout_nb_channels(avctx->channel_layout)) ? avctx->channel_layout : av_get_default_channel_layout(avctx->channels);
 +            wanted_channel_layout &= ~AV_CH_LAYOUT_STEREO_DOWNMIX;
 +            wanted_nb_channels = av_get_channel_layout_nb_channels(wanted_channel_layout);
 +            /* SDL only supports 1, 2, 4 or 6 channels at the moment, so we have to make sure not to request anything else. */
 +            while (wanted_nb_channels > 0 && (wanted_nb_channels == 3 || wanted_nb_channels == 5 || wanted_nb_channels > 6)) {
 +                wanted_nb_channels--;
 +                wanted_channel_layout = av_get_default_channel_layout(wanted_nb_channels);
 +            }
 +        }
 +        wanted_spec.channels = av_get_channel_layout_nb_channels(wanted_channel_layout);
 +        wanted_spec.freq = avctx->sample_rate;
 +        if (wanted_spec.freq <= 0 || wanted_spec.channels <= 0) {
 +            fprintf(stderr, "Invalid sample rate or channel count!\n");
 +            return -1;
 +        }
 +    }
 +
++    if (!av_dict_get(opts, "threads", NULL, 0))
++        av_dict_set(&opts, "threads", "auto", 0);
 +    if (!codec ||
 +        avcodec_open2(avctx, codec, &opts) < 0)
 +        return -1;
 +    if ((t = av_dict_get(opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        return AVERROR_OPTION_NOT_FOUND;
 +    }
 +
 +    /* prepare audio output */
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        wanted_spec.format = AUDIO_S16SYS;
 +        wanted_spec.silence = 0;
 +        wanted_spec.samples = SDL_AUDIO_BUFFER_SIZE;
 +        wanted_spec.callback = sdl_audio_callback;
 +        wanted_spec.userdata = is;
 +        if (SDL_OpenAudio(&wanted_spec, &spec) < 0) {
 +            fprintf(stderr, "SDL_OpenAudio: %s\n", SDL_GetError());
 +            return -1;
 +        }
 +        is->audio_hw_buf_size = spec.size;
 +        if (spec.format != AUDIO_S16SYS) {
 +            fprintf(stderr, "SDL advised audio format %d is not supported!\n", spec.format);
 +            return -1;
 +        }
 +        if (spec.channels != wanted_spec.channels) {
 +            wanted_channel_layout = av_get_default_channel_layout(spec.channels);
 +            if (!wanted_channel_layout) {
 +                fprintf(stderr, "SDL advised channel count %d is not supported!\n", spec.channels);
 +                return -1;
 +            }
 +        }
 +        is->audio_src_fmt = is->audio_tgt_fmt = AV_SAMPLE_FMT_S16;
 +        is->audio_src_freq = is->audio_tgt_freq = spec.freq;
 +        is->audio_src_channel_layout = is->audio_tgt_channel_layout = wanted_channel_layout;
 +        is->audio_src_channels = is->audio_tgt_channels = spec.channels;
 +    }
 +
 +    ic->streams[stream_index]->discard = AVDISCARD_DEFAULT;
 +    switch (avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        is->audio_stream = stream_index;
 +        is->audio_st = ic->streams[stream_index];
 +        is->audio_buf_size  = 0;
 +        is->audio_buf_index = 0;
 +
 +        /* init averaging filter */
 +        is->audio_diff_avg_coef  = exp(log(0.01) / AUDIO_DIFF_AVG_NB);
 +        is->audio_diff_avg_count = 0;
 +        /* since we do not have a precise anough audio fifo fullness,
 +           we correct audio sync only if larger than this threshold */
 +        is->audio_diff_threshold = 2.0 * SDL_AUDIO_BUFFER_SIZE / wanted_spec.freq;
 +
 +        memset(&is->audio_pkt, 0, sizeof(is->audio_pkt));
 +        packet_queue_init(&is->audioq);
 +        SDL_PauseAudio(0);
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_stream = stream_index;
 +        is->video_st = ic->streams[stream_index];
 +
 +        packet_queue_init(&is->videoq);
 +        is->video_tid = SDL_CreateThread(video_thread, is);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_stream = stream_index;
 +        is->subtitle_st = ic->streams[stream_index];
 +        packet_queue_init(&is->subtitleq);
 +
 +        is->subtitle_tid = SDL_CreateThread(subtitle_thread, is);
 +        break;
 +    default:
 +        break;
 +    }
 +    return 0;
 +}
 +
 +static void stream_component_close(VideoState *is, int stream_index)
 +{
 +    AVFormatContext *ic = is->ic;
 +    AVCodecContext *avctx;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return;
 +    avctx = ic->streams[stream_index]->codec;
 +
 +    switch (avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        packet_queue_abort(&is->audioq);
 +
 +        SDL_CloseAudio();
 +
 +        packet_queue_end(&is->audioq);
 +        if (is->swr_ctx)
 +            swr_free(&is->swr_ctx);
 +        av_free_packet(&is->audio_pkt);
 +        av_freep(&is->audio_buf1);
 +        is->audio_buf = NULL;
 +        av_freep(&is->frame);
 +
 +        if (is->rdft) {
 +            av_rdft_end(is->rdft);
 +            av_freep(&is->rdft_data);
 +            is->rdft = NULL;
 +            is->rdft_bits = 0;
 +        }
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        packet_queue_abort(&is->videoq);
 +
 +        /* note: we also signal this mutex to make sure we deblock the
 +           video thread in all cases */
 +        SDL_LockMutex(is->pictq_mutex);
 +        SDL_CondSignal(is->pictq_cond);
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        SDL_WaitThread(is->video_tid, NULL);
 +
 +        packet_queue_end(&is->videoq);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        packet_queue_abort(&is->subtitleq);
 +
 +        /* note: we also signal this mutex to make sure we deblock the
 +           video thread in all cases */
 +        SDL_LockMutex(is->subpq_mutex);
 +        is->subtitle_stream_changed = 1;
 +
 +        SDL_CondSignal(is->subpq_cond);
 +        SDL_UnlockMutex(is->subpq_mutex);
 +
 +        SDL_WaitThread(is->subtitle_tid, NULL);
 +
 +        packet_queue_end(&is->subtitleq);
 +        break;
 +    default:
 +        break;
 +    }
 +
 +    ic->streams[stream_index]->discard = AVDISCARD_ALL;
 +    avcodec_close(avctx);
 +    switch (avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        is->audio_st = NULL;
 +        is->audio_stream = -1;
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_st = NULL;
 +        is->video_stream = -1;
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_st = NULL;
 +        is->subtitle_stream = -1;
 +        break;
 +    default:
 +        break;
 +    }
 +}
 +
 +static int decode_interrupt_cb(void *ctx)
 +{
 +    VideoState *is = ctx;
 +    return is->abort_request;
 +}
 +
 +/* this thread gets the stream from the disk or the network */
 +static int read_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    AVFormatContext *ic = NULL;
 +    int err, i, ret;
 +    int st_index[AVMEDIA_TYPE_NB];
 +    AVPacket pkt1, *pkt = &pkt1;
 +    int eof = 0;
 +    int pkt_in_play_range = 0;
 +    AVDictionaryEntry *t;
 +    AVDictionary **opts;
 +    int orig_nb_streams;
 +
 +    memset(st_index, -1, sizeof(st_index));
 +    is->video_stream = -1;
 +    is->audio_stream = -1;
 +    is->subtitle_stream = -1;
 +
 +    ic = avformat_alloc_context();
 +    ic->interrupt_callback.callback = decode_interrupt_cb;
 +    ic->interrupt_callback.opaque = is;
 +    err = avformat_open_input(&ic, is->filename, is->iformat, &format_opts);
 +    if (err < 0) {
 +        print_error(is->filename, err);
 +        ret = -1;
 +        goto fail;
 +    }
 +    if ((t = av_dict_get(format_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        ret = AVERROR_OPTION_NOT_FOUND;
 +        goto fail;
 +    }
 +    is->ic = ic;
 +
 +    if (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 || CONFIG_MMSH_PROTOCOL
 +        if (is->paused &&
 +                (!strcmp(ic->iformat->name, "rtsp") ||
 +                 (ic->pb && !strncmp(input_filename, "mmsh:", 5)))) {
 +            /* wait 10 ms to avoid trying to get another packet */
 +            /* XXX: horrible */
 +            SDL_Delay(10);
 +            continue;
 +        }
 +#endif
 +        if (is->seek_req) {
 +            int64_t seek_target = is->seek_pos;
 +            int64_t seek_min    = is->seek_rel > 0 ? seek_target - is->seek_rel + 2: INT64_MIN;
 +            int64_t seek_max    = is->seek_rel < 0 ? seek_target - is->seek_rel - 2: INT64_MAX;
 +// FIXME the +-2 is due to rounding being not done in the correct direction in generation
 +//      of the seek_pos/seek_rel variables
 +
 +            ret = avformat_seek_file(is->ic, -1, seek_min, seek_target, seek_max, is->seek_flags);
 +            if (ret < 0) {
 +                fprintf(stderr, "%s: error while seeking\n", is->ic->filename);
 +            } else {
 +                if (is->audio_stream >= 0) {
 +                    packet_queue_flush(&is->audioq);
 +                    packet_queue_put(&is->audioq, &flush_pkt);
 +                }
 +                if (is->subtitle_stream >= 0) {
 +                    packet_queue_flush(&is->subtitleq);
 +                    packet_queue_put(&is->subtitleq, &flush_pkt);
 +                }
 +                if (is->video_stream >= 0) {
 +                    packet_queue_flush(&is->videoq);
 +                    packet_queue_put(&is->videoq, &flush_pkt);
 +                }
 +            }
 +            is->seek_req = 0;
 +            eof = 0;
 +        }
 +
 +        /* if the queue are full, no need to read more */
 +        if (   is->audioq.size + is->videoq.size + is->subtitleq.size > MAX_QUEUE_SIZE
 +            || (   (is->audioq   .size  > MIN_AUDIOQ_SIZE || is->audio_stream < 0)
 +                && (is->videoq   .nb_packets > MIN_FRAMES || is->video_stream < 0)
 +                && (is->subtitleq.nb_packets > MIN_FRAMES || is->subtitle_stream < 0))) {
 +            /* wait 10 ms */
 +            SDL_Delay(10);
 +            continue;
 +        }
 +        if (eof) {
 +            if (is->video_stream >= 0) {
 +                av_init_packet(pkt);
 +                pkt->data = NULL;
 +                pkt->size = 0;
 +                pkt->stream_index = is->video_stream;
 +                packet_queue_put(&is->videoq, pkt);
 +            }
 +            if (is->audio_stream >= 0 &&
 +                is->audio_st->codec->codec->capabilities & CODEC_CAP_DELAY) {
 +                av_init_packet(pkt);
 +                pkt->data = NULL;
 +                pkt->size = 0;
 +                pkt->stream_index = is->audio_stream;
 +                packet_queue_put(&is->audioq, pkt);
 +            }
 +            SDL_Delay(10);
 +            if (is->audioq.size + is->videoq.size + is->subtitleq.size == 0) {
 +                if (loop != 1 && (!loop || --loop)) {
 +                    stream_seek(is, start_time != AV_NOPTS_VALUE ? start_time : 0, 0, 0);
 +                } else if (autoexit) {
 +                    ret = AVERROR_EOF;
 +                    goto fail;
 +                }
 +            }
 +            eof=0;
 +            continue;
 +        }
 +        ret = av_read_frame(ic, pkt);
 +        if (ret < 0) {
 +            if (ret == AVERROR_EOF || url_feof(ic->pb))
 +                eof = 1;
 +            if (ic->pb && ic->pb->error)
 +                break;
 +            SDL_Delay(100); /* wait for user event */
 +            continue;
 +        }
 +        /* check if packet is in play range specified by user, then queue, otherwise discard */
 +        pkt_in_play_range = duration == AV_NOPTS_VALUE ||
 +                (pkt->pts - ic->streams[pkt->stream_index]->start_time) *
 +                av_q2d(ic->streams[pkt->stream_index]->time_base) -
 +                (double)(start_time != AV_NOPTS_VALUE ? start_time : 0) / 1000000
 +                <= ((double)duration / 1000000);
 +        if (pkt->stream_index == is->audio_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->audioq, pkt);
 +        } else if (pkt->stream_index == is->video_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->videoq, pkt);
 +        } else if (pkt->stream_index == is->subtitle_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->subtitleq, pkt);
 +        } else {
 +            av_free_packet(pkt);
 +        }
 +    }
 +    /* wait until the end */
 +    while (!is->abort_request) {
 +        SDL_Delay(100);
 +    }
 +
 +    ret = 0;
 + fail:
 +    /* close each stream */
 +    if (is->audio_stream >= 0)
 +        stream_component_close(is, is->audio_stream);
 +    if (is->video_stream >= 0)
 +        stream_component_close(is, is->video_stream);
 +    if (is->subtitle_stream >= 0)
 +        stream_component_close(is, is->subtitle_stream);
 +    if (is->ic) {
 +        avformat_close_input(&is->ic);
 +    }
 +
 +    if (ret != 0) {
 +        SDL_Event event;
 +
 +        event.type = FF_QUIT_EVENT;
 +        event.user.data1 = is;
 +        SDL_PushEvent(&event);
 +    }
 +    return 0;
 +}
 +
 +static VideoState *stream_open(const char *filename, AVInputFormat *iformat)
 +{
 +    VideoState *is;
 +
 +    is = av_mallocz(sizeof(VideoState));
 +    if (!is)
 +        return NULL;
 +    av_strlcpy(is->filename, filename, sizeof(is->filename));
 +    is->iformat = iformat;
 +    is->ytop    = 0;
 +    is->xleft   = 0;
 +
 +    /* start video display */
 +    is->pictq_mutex = SDL_CreateMutex();
 +    is->pictq_cond  = SDL_CreateCond();
 +
 +    is->subpq_mutex = SDL_CreateMutex();
 +    is->subpq_cond  = SDL_CreateCond();
 +
 +    is->av_sync_type = av_sync_type;
 +    is->read_tid     = SDL_CreateThread(read_thread, is);
 +    if (!is->read_tid) {
 +        av_free(is);
 +        return NULL;
 +    }
 +    return is;
 +}
 +
 +static void stream_cycle_channel(VideoState *is, int codec_type)
 +{
 +    AVFormatContext *ic = is->ic;
 +    int start_index, stream_index;
 +    AVStream *st;
 +
 +    if (codec_type == AVMEDIA_TYPE_VIDEO)
 +        start_index = is->video_stream;
 +    else if (codec_type == AVMEDIA_TYPE_AUDIO)
 +        start_index = is->audio_stream;
 +    else
 +        start_index = is->subtitle_stream;
 +    if (start_index < (codec_type == AVMEDIA_TYPE_SUBTITLE ? -1 : 0))
 +        return;
 +    stream_index = start_index;
 +    for (;;) {
 +        if (++stream_index >= is->ic->nb_streams)
 +        {
 +            if (codec_type == AVMEDIA_TYPE_SUBTITLE)
 +            {
 +                stream_index = -1;
 +                goto the_end;
 +            } else
 +                stream_index = 0;
 +        }
 +        if (stream_index == start_index)
 +            return;
 +        st = ic->streams[stream_index];
 +        if (st->codec->codec_type == codec_type) {
 +            /* check that parameters are OK */
 +            switch (codec_type) {
 +            case AVMEDIA_TYPE_AUDIO:
 +                if (st->codec->sample_rate != 0 &&
 +                    st->codec->channels != 0)
 +                    goto the_end;
 +                break;
 +            case AVMEDIA_TYPE_VIDEO:
 +            case AVMEDIA_TYPE_SUBTITLE:
 +                goto the_end;
 +            default:
 +                break;
 +            }
 +        }
 +    }
 + the_end:
 +    stream_component_close(is, start_index);
 +    stream_component_open(is, stream_index);
 +}
 +
 +
 +static void toggle_full_screen(VideoState *is)
 +{
 +    av_unused int i;
 +    is_full_screen = !is_full_screen;
 +#if defined(__APPLE__) && SDL_VERSION_ATLEAST(1, 2, 14)
 +    /* OS X needs to reallocate the SDL overlays */
 +    for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +        is->pictq[i].reallocate = 1;
 +    }
 +#endif
 +    video_open(is, 1);
 +}
 +
 +static void toggle_pause(VideoState *is)
 +{
 +    stream_toggle_pause(is);
 +    is->step = 0;
 +}
 +
 +static void step_to_next_frame(VideoState *is)
 +{
 +    /* if the stream is paused unpause it, then step */
 +    if (is->paused)
 +        stream_toggle_pause(is);
 +    is->step = 1;
 +}
 +
 +static void toggle_audio_display(VideoState *is)
 +{
 +    int bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +    is->show_mode = (is->show_mode + 1) % SHOW_MODE_NB;
 +    fill_rectangle(screen,
 +                is->xleft, is->ytop, is->width, is->height,
 +                bgcolor);
 +    SDL_UpdateRect(screen, is->xleft, is->ytop, is->width, is->height);
 +}
 +
 +/* handle an event sent by the GUI */
 +static void event_loop(VideoState *cur_stream)
 +{
 +    SDL_Event event;
 +    double incr, pos, frac;
 +
 +    for (;;) {
 +        double x;
 +        SDL_WaitEvent(&event);
 +        switch (event.type) {
 +        case SDL_KEYDOWN:
 +            if (exit_on_keydown) {
 +                do_exit(cur_stream);
 +                break;
 +            }
 +            switch (event.key.keysym.sym) {
 +            case SDLK_ESCAPE:
 +            case SDLK_q:
 +                do_exit(cur_stream);
 +                break;
 +            case SDLK_f:
 +                toggle_full_screen(cur_stream);
 +                break;
 +            case SDLK_p:
 +            case SDLK_SPACE:
 +                toggle_pause(cur_stream);
 +                break;
 +            case SDLK_s: // S: Step to next frame
 +                step_to_next_frame(cur_stream);
 +                break;
 +            case SDLK_a:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_AUDIO);
 +                break;
 +            case SDLK_v:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_VIDEO);
 +                break;
 +            case SDLK_t:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_SUBTITLE);
 +                break;
 +            case SDLK_w:
 +                toggle_audio_display(cur_stream);
 +                break;
 +            case SDLK_PAGEUP:
 +                incr = 600.0;
 +                goto do_seek;
 +            case SDLK_PAGEDOWN:
 +                incr = -600.0;
 +                goto do_seek;
 +            case SDLK_LEFT:
 +                incr = -10.0;
 +                goto do_seek;
 +            case SDLK_RIGHT:
 +                incr = 10.0;
 +                goto do_seek;
 +            case SDLK_UP:
 +                incr = 60.0;
 +                goto do_seek;
 +            case SDLK_DOWN:
 +                incr = -60.0;
 +            do_seek:
 +                    if (seek_by_bytes) {
 +                        if (cur_stream->video_stream >= 0 && cur_stream->video_current_pos >= 0) {
 +                            pos = cur_stream->video_current_pos;
 +                        } else if (cur_stream->audio_stream >= 0 && cur_stream->audio_pkt.pos >= 0) {
 +                            pos = cur_stream->audio_pkt.pos;
 +                        } else
 +                            pos = avio_tell(cur_stream->ic->pb);
 +                        if (cur_stream->ic->bit_rate)
 +                            incr *= cur_stream->ic->bit_rate / 8.0;
 +                        else
 +                            incr *= 180000.0;
 +                        pos += incr;
 +                        stream_seek(cur_stream, pos, incr, 1);
 +                    } else {
 +                        pos = get_master_clock(cur_stream);
 +                        pos += incr;
 +                        stream_seek(cur_stream, (int64_t)(pos * AV_TIME_BASE), (int64_t)(incr * AV_TIME_BASE), 0);
 +                    }
 +                break;
 +            default:
 +                break;
 +            }
 +            break;
 +        case SDL_MOUSEBUTTONDOWN:
 +            if (exit_on_mousedown) {
 +                do_exit(cur_stream);
 +                break;
 +            }
 +        case SDL_MOUSEMOTION:
 +            if (event.type == SDL_MOUSEBUTTONDOWN) {
 +                x = event.button.x;
 +            } else {
 +                if (event.motion.state != SDL_PRESSED)
 +                    break;
 +                x = event.motion.x;
 +            }
 +                if (seek_by_bytes || cur_stream->ic->duration <= 0) {
 +                    uint64_t size =  avio_size(cur_stream->ic->pb);
 +                    stream_seek(cur_stream, size*x/cur_stream->width, 0, 1);
 +                } else {
 +                    int64_t ts;
 +                    int ns, hh, mm, ss;
 +                    int tns, thh, tmm, tss;
 +                    tns  = cur_stream->ic->duration / 1000000LL;
 +                    thh  = tns / 3600;
 +                    tmm  = (tns % 3600) / 60;
 +                    tss  = (tns % 60);
 +                    frac = x / cur_stream->width;
 +                    ns   = frac * tns;
 +                    hh   = ns / 3600;
 +                    mm   = (ns % 3600) / 60;
 +                    ss   = (ns % 60);
 +                    fprintf(stderr, "Seek to %2.0f%% (%2d:%02d:%02d) of total duration (%2d:%02d:%02d)       \n", frac*100,
 +                            hh, mm, ss, thh, tmm, tss);
 +                    ts = frac * cur_stream->ic->duration;
 +                    if (cur_stream->ic->start_time != AV_NOPTS_VALUE)
 +                        ts += cur_stream->ic->start_time;
 +                    stream_seek(cur_stream, ts, 0, 0);
 +                }
 +            break;
 +        case SDL_VIDEORESIZE:
 +                screen = SDL_SetVideoMode(event.resize.w, event.resize.h, 0,
 +                                          SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL);
 +                screen_width  = cur_stream->width  = event.resize.w;
 +                screen_height = cur_stream->height = event.resize.h;
 +            break;
 +        case SDL_QUIT:
 +        case FF_QUIT_EVENT:
 +            do_exit(cur_stream);
 +            break;
 +        case FF_ALLOC_EVENT:
 +            video_open(event.user.data1, 0);
 +            alloc_picture(event.user.data1);
 +            break;
 +        case FF_REFRESH_EVENT:
 +            video_refresh(event.user.data1);
 +            cur_stream->refresh = 0;
 +            break;
 +        default:
 +            break;
 +        }
 +    }
 +}
 +
 +static int opt_frame_size(const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "Option -s is deprecated, use -video_size.\n");
 +    return opt_default("video_size", arg);
 +}
 +
 +static int opt_width(const char *opt, const char *arg)
 +{
 +    screen_width = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX);
 +    return 0;
 +}
 +
 +static int opt_height(const char *opt, const char *arg)
 +{
 +    screen_height = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX);
 +    return 0;
 +}
 +
 +static int opt_format(const char *opt, const char *arg)
 +{
 +    file_iformat = av_find_input_format(arg);
 +    if (!file_iformat) {
 +        fprintf(stderr, "Unknown input format: %s\n", arg);
 +        return AVERROR(EINVAL);
 +    }
 +    return 0;
 +}
 +
 +static int opt_frame_pix_fmt(const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "Option -pix_fmt is deprecated, use -pixel_format.\n");
 +    return opt_default("pixel_format", arg);
 +}
 +
 +static int opt_sync(const char *opt, const char *arg)
 +{
 +    if (!strcmp(arg, "audio"))
 +        av_sync_type = AV_SYNC_AUDIO_MASTER;
 +    else if (!strcmp(arg, "video"))
 +        av_sync_type = AV_SYNC_VIDEO_MASTER;
 +    else if (!strcmp(arg, "ext"))
 +        av_sync_type = AV_SYNC_EXTERNAL_CLOCK;
 +    else {
 +        fprintf(stderr, "Unknown value for %s: %s\n", opt, arg);
 +        exit(1);
 +    }
 +    return 0;
 +}
 +
 +static int opt_seek(const char *opt, const char *arg)
 +{
 +    start_time = parse_time_or_die(opt, arg, 1);
 +    return 0;
 +}
 +
 +static int opt_duration(const char *opt, const char *arg)
 +{
 +    duration = parse_time_or_die(opt, arg, 1);
 +    return 0;
 +}
 +
 +static int opt_show_mode(const char *opt, const char *arg)
 +{
 +    show_mode = !strcmp(arg, "video") ? SHOW_MODE_VIDEO :
 +                !strcmp(arg, "waves") ? SHOW_MODE_WAVES :
 +                !strcmp(arg, "rdft" ) ? SHOW_MODE_RDFT  :
 +                parse_number_or_die(opt, arg, OPT_INT, 0, SHOW_MODE_NB-1);
 +    return 0;
 +}
 +
 +static void opt_input_file(void *optctx, const char *filename)
 +{
 +    if (input_filename) {
 +        fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
 +                filename, input_filename);
 +        exit_program(1);
 +    }
 +    if (!strcmp(filename, "-"))
 +        filename = "pipe:";
 +    input_filename = filename;
 +}
 +
 +static int opt_codec(void *o, const char *opt, const char *arg)
 +{
 +    switch(opt[strlen(opt)-1]){
 +    case 'a' :    audio_codec_name = arg; break;
 +    case 's' : subtitle_codec_name = arg; break;
 +    case 'v' :    video_codec_name = arg; break;
 +    }
 +    return 0;
 +}
 +
 +static int dummy;
 +
 +static const OptionDef options[] = {
 +#include "cmdutils_common_opts.h"
 +    { "x", HAS_ARG, { (void*)opt_width }, "force displayed width", "width" },
 +    { "y", HAS_ARG, { (void*)opt_height }, "force displayed height", "height" },
 +    { "s", HAS_ARG | OPT_VIDEO, { (void*)opt_frame_size }, "set frame size (WxH or abbreviation)", "size" },
 +    { "fs", OPT_BOOL, { (void*)&is_full_screen }, "force full screen" },
 +    { "an", OPT_BOOL, { (void*)&audio_disable }, "disable audio" },
 +    { "vn", OPT_BOOL, { (void*)&video_disable }, "disable video" },
 +    { "ast", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&wanted_stream[AVMEDIA_TYPE_AUDIO] }, "select desired audio stream", "stream_number" },
 +    { "vst", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&wanted_stream[AVMEDIA_TYPE_VIDEO] }, "select desired video stream", "stream_number" },
 +    { "sst", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&wanted_stream[AVMEDIA_TYPE_SUBTITLE] }, "select desired subtitle stream", "stream_number" },
 +    { "ss", HAS_ARG, { (void*)&opt_seek }, "seek to a given position in seconds", "pos" },
 +    { "t", HAS_ARG, { (void*)&opt_duration }, "play  \"duration\" seconds of audio/video", "duration" },
 +    { "bytes", OPT_INT | HAS_ARG, { (void*)&seek_by_bytes }, "seek by bytes 0=off 1=on -1=auto", "val" },
 +    { "nodisp", OPT_BOOL, { (void*)&display_disable }, "disable graphical display" },
 +    { "f", HAS_ARG, { (void*)opt_format }, "force format", "fmt" },
 +    { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { (void*)opt_frame_pix_fmt }, "set pixel format", "format" },
 +    { "stats", OPT_BOOL | OPT_EXPERT, { (void*)&show_status }, "show status", "" },
 +    { "bug", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&workaround_bugs }, "workaround bugs", "" },
 +    { "fast", OPT_BOOL | OPT_EXPERT, { (void*)&fast }, "non spec compliant optimizations", "" },
 +    { "genpts", OPT_BOOL | OPT_EXPERT, { (void*)&genpts }, "generate pts", "" },
 +    { "drp", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&decoder_reorder_pts }, "let decoder reorder pts 0=off 1=on -1=auto", ""},
 +    { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&lowres }, "", "" },
 +    { "skiploop", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_loop_filter }, "", "" },
 +    { "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_frame }, "", "" },
 +    { "skipidct", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_idct }, "", "" },
 +    { "idct", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&idct }, "set idct algo",  "algo" },
 +    { "er", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&error_recognition }, "set error detection threshold (0-4)",  "threshold" },
 +    { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&error_concealment }, "set error concealment options",  "bit_mask" },
 +    { "sync", HAS_ARG | OPT_EXPERT, { (void*)opt_sync }, "set audio-video sync. type (type=audio/video/ext)", "type" },
 +    { "autoexit", OPT_BOOL | OPT_EXPERT, { (void*)&autoexit }, "exit at the end", "" },
 +    { "exitonkeydown", OPT_BOOL | OPT_EXPERT, { (void*)&exit_on_keydown }, "exit on key down", "" },
 +    { "exitonmousedown", OPT_BOOL | OPT_EXPERT, { (void*)&exit_on_mousedown }, "exit on mouse down", "" },
 +    { "loop", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&loop }, "set number of times the playback shall be looped", "loop count" },
 +    { "framedrop", OPT_BOOL | OPT_EXPERT, { (void*)&framedrop }, "drop frames when cpu is too slow", "" },
 +    { "window_title", OPT_STRING | HAS_ARG, { (void*)&window_title }, "set window title", "window title" },
 +#if CONFIG_AVFILTER
 +    { "vf", OPT_STRING | HAS_ARG, { (void*)&vfilters }, "video filters", "filter list" },
 +#endif
 +    { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, { (void*)&rdftspeed }, "rdft speed", "msecs" },
 +    { "showmode", HAS_ARG, {(void*)opt_show_mode}, "select show mode (0 = video, 1 = waves, 2 = RDFT)", "mode" },
 +    { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, { (void*)opt_default }, "generic catch all option", "" },
 +    { "i", OPT_BOOL, {(void *)&dummy}, "read specified file", "input_file"},
 +    { "codec", HAS_ARG | OPT_FUNC2, {(void*)opt_codec}, "force decoder", "decoder" },
 +    { NULL, },
 +};
 +
 +static void show_usage(void)
 +{
 +    av_log(NULL, AV_LOG_INFO, "Simple media player\n");
 +    av_log(NULL, AV_LOG_INFO, "usage: %s [options] input_file\n", program_name);
 +    av_log(NULL, AV_LOG_INFO, "\n");
 +}
 +
 +static int opt_help(const char *opt, const char *arg)
 +{
 +    av_log_set_callback(log_callback_help);
 +    show_usage();
 +    show_help_options(options, "Main options:\n",
 +                      OPT_EXPERT, 0);
 +    show_help_options(options, "\nAdvanced options:\n",
 +                      OPT_EXPERT, OPT_EXPERT);
 +    printf("\n");
 +    show_help_children(avcodec_get_class(), AV_OPT_FLAG_DECODING_PARAM);
 +    show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);
 +#if !CONFIG_AVFILTER
 +    show_help_children(sws_get_class(), AV_OPT_FLAG_ENCODING_PARAM);
 +#endif
 +    printf("\nWhile playing:\n"
 +           "q, ESC              quit\n"
 +           "f                   toggle full screen\n"
 +           "p, SPC              pause\n"
 +           "a                   cycle audio channel\n"
 +           "v                   cycle video channel\n"
 +           "t                   cycle subtitle channel\n"
 +           "w                   show audio waves\n"
 +           "s                   activate frame-step mode\n"
 +           "left/right          seek backward/forward 10 seconds\n"
 +           "down/up             seek backward/forward 1 minute\n"
 +           "page down/page up   seek backward/forward 10 minutes\n"
 +           "mouse click         seek to percentage in file corresponding to fraction of width\n"
 +           );
 +    return 0;
 +}
 +
 +static int lockmgr(void **mtx, enum AVLockOp op)
 +{
 +   switch(op) {
 +      case AV_LOCK_CREATE:
 +          *mtx = SDL_CreateMutex();
 +          if(!*mtx)
 +              return 1;
 +          return 0;
 +      case AV_LOCK_OBTAIN:
 +          return !!SDL_LockMutex(*mtx);
 +      case AV_LOCK_RELEASE:
 +          return !!SDL_UnlockMutex(*mtx);
 +      case AV_LOCK_DESTROY:
 +          SDL_DestroyMutex(*mtx);
 +          return 0;
 +   }
 +   return 1;
 +}
 +
 +/* Called from the main */
 +int main(int argc, char **argv)
 +{
 +    int flags;
 +    VideoState *is;
 +
 +    av_log_set_flags(AV_LOG_SKIP_REPEATED);
 +    parse_loglevel(argc, argv, options);
 +
 +    /* register all codecs, demux and protocols */
 +    avcodec_register_all();
 +#if CONFIG_AVDEVICE
 +    avdevice_register_all();
 +#endif
 +#if CONFIG_AVFILTER
 +    avfilter_register_all();
 +#endif
 +    av_register_all();
 +    avformat_network_init();
 +
 +    init_opts();
 +
 +    signal(SIGINT , sigterm_handler); /* Interrupt (ANSI).    */
 +    signal(SIGTERM, sigterm_handler); /* Termination (ANSI).  */
 +
 +    show_banner(argc, argv, options);
 +
 +    parse_options(NULL, argc, argv, options, opt_input_file);
 +
 +    if (!input_filename) {
 +        show_usage();
 +        fprintf(stderr, "An input file must be specified\n");
 +        fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
 +        exit(1);
 +    }
 +
 +    if (display_disable) {
 +        video_disable = 1;
 +    }
 +    flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
 +    if (audio_disable)
 +        flags &= ~SDL_INIT_AUDIO;
 +#if !defined(__MINGW32__) && !defined(__APPLE__)
 +    flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */
 +#endif
 +    if (SDL_Init (flags)) {
 +        fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError());
 +        fprintf(stderr, "(Did you set the DISPLAY variable?)\n");
 +        exit(1);
 +    }
 +
 +    if (!display_disable) {
 +#if HAVE_SDL_VIDEO_SIZE
 +        const SDL_VideoInfo *vi = SDL_GetVideoInfo();
 +        fs_screen_width = vi->current_w;
 +        fs_screen_height = vi->current_h;
 +#endif
 +    }
 +
 +    SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
 +    SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
 +    SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
 +
 +    if (av_lockmgr_register(lockmgr)) {
 +        fprintf(stderr, "Could not initialize lock manager!\n");
 +        do_exit(NULL);
 +    }
 +
 +    av_init_packet(&flush_pkt);
 +    flush_pkt.data = "FLUSH";
 +
 +    is = stream_open(input_filename, file_iformat);
 +    if (!is) {
 +        fprintf(stderr, "Failed to initialize VideoState!\n");
 +        do_exit(NULL);
 +    }
 +
 +    event_loop(is);
 +
 +    /* never returns */
 +
 +    return 0;
 +}
diff --cc ffserver.c
index 79463c0,0000000..c225a94
mode 100644,000000..100644
--- /dev/null
@@@ -1,4739 -1,0 +1,4737 @@@
- // FIXME those are internal headers, avserver _really_ shouldn't use them
 +/*
 + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
 + *
 + * FFmpeg is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with FFmpeg; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 + */
 +
 +/**
 + * @file
 + * multiple format streaming server based on the FFmpeg libraries
 + */
 +
 +#include "config.h"
 +#if !HAVE_CLOSESOCKET
 +#define closesocket close
 +#endif
 +#include <string.h>
 +#include <stdlib.h>
 +#include "libavformat/avformat.h"
- #include "libavformat/internal.h"
- #include "libavformat/url.h"
 +#include "libavformat/ffm.h"
 +#include "libavformat/network.h"
 +#include "libavformat/os_support.h"
 +#include "libavformat/rtpdec.h"
 +#include "libavformat/rtsp.h"
++// XXX for ffio_open_dyn_packet_buffer, to be removed
 +#include "libavformat/avio_internal.h"
-             ffurl_close(h);
 +#include "libavutil/avstring.h"
 +#include "libavutil/lfg.h"
 +#include "libavutil/dict.h"
 +#include "libavutil/mathematics.h"
 +#include "libavutil/random_seed.h"
 +#include "libavutil/parseutils.h"
 +#include "libavutil/opt.h"
 +#include <stdarg.h>
 +#include <unistd.h>
 +#include <fcntl.h>
 +#include <sys/ioctl.h>
 +#if HAVE_POLL_H
 +#include <poll.h>
 +#endif
 +#include <errno.h>
 +#include <sys/time.h>
 +#include <time.h>
 +#include <sys/wait.h>
 +#include <signal.h>
 +#if HAVE_DLFCN_H
 +#include <dlfcn.h>
 +#endif
 +
 +#include "cmdutils.h"
 +
 +const char program_name[] = "ffserver";
 +const int program_birth_year = 2000;
 +
 +static const OptionDef options[];
 +
 +enum HTTPState {
 +    HTTPSTATE_WAIT_REQUEST,
 +    HTTPSTATE_SEND_HEADER,
 +    HTTPSTATE_SEND_DATA_HEADER,
 +    HTTPSTATE_SEND_DATA,          /* sending TCP or UDP data */
 +    HTTPSTATE_SEND_DATA_TRAILER,
 +    HTTPSTATE_RECEIVE_DATA,
 +    HTTPSTATE_WAIT_FEED,          /* wait for data from the feed */
 +    HTTPSTATE_READY,
 +
 +    RTSPSTATE_WAIT_REQUEST,
 +    RTSPSTATE_SEND_REPLY,
 +    RTSPSTATE_SEND_PACKET,
 +};
 +
 +static const char *http_state[] = {
 +    "HTTP_WAIT_REQUEST",
 +    "HTTP_SEND_HEADER",
 +
 +    "SEND_DATA_HEADER",
 +    "SEND_DATA",
 +    "SEND_DATA_TRAILER",
 +    "RECEIVE_DATA",
 +    "WAIT_FEED",
 +    "READY",
 +
 +    "RTSP_WAIT_REQUEST",
 +    "RTSP_SEND_REPLY",
 +    "RTSP_SEND_PACKET",
 +};
 +
 +#define MAX_STREAMS 20
 +
 +#define IOBUFFER_INIT_SIZE 8192
 +
 +/* timeouts are in ms */
 +#define HTTP_REQUEST_TIMEOUT (15 * 1000)
 +#define RTSP_REQUEST_TIMEOUT (3600 * 24 * 1000)
 +
 +#define SYNC_TIMEOUT (10 * 1000)
 +
 +typedef struct RTSPActionServerSetup {
 +    uint32_t ipaddr;
 +    char transport_option[512];
 +} RTSPActionServerSetup;
 +
 +typedef struct {
 +    int64_t count1, count2;
 +    int64_t time1, time2;
 +} DataRateData;
 +
 +/* context associated with one connection */
 +typedef struct HTTPContext {
 +    enum HTTPState state;
 +    int fd; /* socket file descriptor */
 +    struct sockaddr_in from_addr; /* origin */
 +    struct pollfd *poll_entry; /* used when polling */
 +    int64_t timeout;
 +    uint8_t *buffer_ptr, *buffer_end;
 +    int http_error;
 +    int post;
 +    int chunked_encoding;
 +    int chunk_size;               /* 0 if it needs to be read */
 +    struct HTTPContext *next;
 +    int got_key_frame; /* stream 0 => 1, stream 1 => 2, stream 2=> 4 */
 +    int64_t data_count;
 +    /* feed input */
 +    int feed_fd;
 +    /* input format handling */
 +    AVFormatContext *fmt_in;
 +    int64_t start_time;            /* In milliseconds - this wraps fairly often */
 +    int64_t first_pts;            /* initial pts value */
 +    int64_t cur_pts;             /* current pts value from the stream in us */
 +    int64_t cur_frame_duration;  /* duration of the current frame in us */
 +    int cur_frame_bytes;       /* output frame size, needed to compute
 +                                  the time at which we send each
 +                                  packet */
 +    int pts_stream_index;        /* stream we choose as clock reference */
 +    int64_t cur_clock;           /* current clock reference value in us */
 +    /* output format handling */
 +    struct FFStream *stream;
 +    /* -1 is invalid stream */
 +    int feed_streams[MAX_STREAMS]; /* index of streams in the feed */
 +    int switch_feed_streams[MAX_STREAMS]; /* index of streams in the feed */
 +    int switch_pending;
 +    AVFormatContext fmt_ctx; /* instance of FFStream for one user */
 +    int last_packet_sent; /* true if last data packet was sent */
 +    int suppress_log;
 +    DataRateData datarate;
 +    int wmp_client_id;
 +    char protocol[16];
 +    char method[16];
 +    char url[128];
 +    int buffer_size;
 +    uint8_t *buffer;
 +    int is_packetized; /* if true, the stream is packetized */
 +    int packet_stream_index; /* current stream for output in state machine */
 +
 +    /* RTSP state specific */
 +    uint8_t *pb_buffer; /* XXX: use that in all the code */
 +    AVIOContext *pb;
 +    int seq; /* RTSP sequence number */
 +
 +    /* RTP state specific */
 +    enum RTSPLowerTransport rtp_protocol;
 +    char session_id[32]; /* session id */
 +    AVFormatContext *rtp_ctx[MAX_STREAMS];
 +
 +    /* RTP/UDP specific */
 +    URLContext *rtp_handles[MAX_STREAMS];
 +
 +    /* RTP/TCP specific */
 +    struct HTTPContext *rtsp_c;
 +    uint8_t *packet_buffer, *packet_buffer_ptr, *packet_buffer_end;
 +} HTTPContext;
 +
 +/* each generated stream is described here */
 +enum StreamType {
 +    STREAM_TYPE_LIVE,
 +    STREAM_TYPE_STATUS,
 +    STREAM_TYPE_REDIRECT,
 +};
 +
 +enum IPAddressAction {
 +    IP_ALLOW = 1,
 +    IP_DENY,
 +};
 +
 +typedef struct IPAddressACL {
 +    struct IPAddressACL *next;
 +    enum IPAddressAction action;
 +    /* These are in host order */
 +    struct in_addr first;
 +    struct in_addr last;
 +} IPAddressACL;
 +
 +/* description of each stream of the ffserver.conf file */
 +typedef struct FFStream {
 +    enum StreamType stream_type;
 +    char filename[1024];     /* stream filename */
 +    struct FFStream *feed;   /* feed we are using (can be null if
 +                                coming from file) */
 +    AVDictionary *in_opts;   /* input parameters */
 +    AVInputFormat *ifmt;       /* if non NULL, force input format */
 +    AVOutputFormat *fmt;
 +    IPAddressACL *acl;
 +    char dynamic_acl[1024];
 +    int nb_streams;
 +    int prebuffer;      /* Number of millseconds early to start */
 +    int64_t max_time;      /* Number of milliseconds to run */
 +    int send_on_key;
 +    AVStream *streams[MAX_STREAMS];
 +    int feed_streams[MAX_STREAMS]; /* index of streams in the feed */
 +    char feed_filename[1024]; /* file name of the feed storage, or
 +                                 input file name for a stream */
 +    char author[512];
 +    char title[512];
 +    char copyright[512];
 +    char comment[512];
 +    pid_t pid;  /* Of ffmpeg process */
 +    time_t pid_start;  /* Of ffmpeg process */
 +    char **child_argv;
 +    struct FFStream *next;
 +    unsigned bandwidth; /* bandwidth, in kbits/s */
 +    /* RTSP options */
 +    char *rtsp_option;
 +    /* multicast specific */
 +    int is_multicast;
 +    struct in_addr multicast_ip;
 +    int multicast_port; /* first port used for multicast */
 +    int multicast_ttl;
 +    int loop; /* if true, send the stream in loops (only meaningful if file) */
 +
 +    /* feed specific */
 +    int feed_opened;     /* true if someone is writing to the feed */
 +    int is_feed;         /* true if it is a feed */
 +    int readonly;        /* True if writing is prohibited to the file */
 +    int truncate;        /* True if feeder connection truncate the feed file */
 +    int conns_served;
 +    int64_t bytes_served;
 +    int64_t feed_max_size;      /* maximum storage size, zero means unlimited */
 +    int64_t feed_write_index;   /* current write position in feed (it wraps around) */
 +    int64_t feed_size;          /* current size of feed */
 +    struct FFStream *next_feed;
 +} FFStream;
 +
 +typedef struct FeedData {
 +    long long data_count;
 +    float avg_frame_size;   /* frame size averaged over last frames with exponential mean */
 +} FeedData;
 +
 +static struct sockaddr_in my_http_addr;
 +static struct sockaddr_in my_rtsp_addr;
 +
 +static char logfilename[1024];
 +static HTTPContext *first_http_ctx;
 +static FFStream *first_feed;   /* contains only feeds */
 +static FFStream *first_stream; /* contains all streams, including feeds */
 +
 +static void new_connection(int server_fd, int is_rtsp);
 +static void close_connection(HTTPContext *c);
 +
 +/* HTTP handling */
 +static int handle_connection(HTTPContext *c);
 +static int http_parse_request(HTTPContext *c);
 +static int http_send_data(HTTPContext *c);
 +static void compute_status(HTTPContext *c);
 +static int open_input_stream(HTTPContext *c, const char *info);
 +static int http_start_receive_data(HTTPContext *c);
 +static int http_receive_data(HTTPContext *c);
 +
 +/* RTSP handling */
 +static int rtsp_parse_request(HTTPContext *c);
 +static void rtsp_cmd_describe(HTTPContext *c, const char *url);
 +static void rtsp_cmd_options(HTTPContext *c, const char *url);
 +static void rtsp_cmd_setup(HTTPContext *c, const char *url, RTSPMessageHeader *h);
 +static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPMessageHeader *h);
 +static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h);
 +static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader *h);
 +
 +/* SDP handling */
 +static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
 +                                   struct in_addr my_ip);
 +
 +/* RTP handling */
 +static HTTPContext *rtp_new_connection(struct sockaddr_in *from_addr,
 +                                       FFStream *stream, const char *session_id,
 +                                       enum RTSPLowerTransport rtp_protocol);
 +static int rtp_new_av_stream(HTTPContext *c,
 +                             int stream_index, struct sockaddr_in *dest_addr,
 +                             HTTPContext *rtsp_c);
 +
 +static const char *my_program_name;
 +static const char *my_program_dir;
 +
 +static const char *config_filename = "/etc/ffserver.conf";
 +
 +static int ffserver_debug;
 +static int ffserver_daemon;
 +static int no_launch;
 +static int need_to_start_children;
 +
 +/* maximum number of simultaneous HTTP connections */
 +static unsigned int nb_max_http_connections = 2000;
 +static unsigned int nb_max_connections = 5;
 +static unsigned int nb_connections;
 +
 +static uint64_t max_bandwidth = 1000;
 +static uint64_t current_bandwidth;
 +
 +static int64_t cur_time;           // Making this global saves on passing it around everywhere
 +
 +static AVLFG random_state;
 +
 +static FILE *logfile = NULL;
 +
 +/* FIXME: make ffserver work with IPv6 */
 +void av_noreturn exit_program(int ret)
 +{
 +    exit(ret);
 +}
 +
 +/* resolve host with also IP address parsing */
 +static int resolve_host(struct in_addr *sin_addr, const char *hostname)
 +{
 +
 +    if (!ff_inet_aton(hostname, sin_addr)) {
 +#if HAVE_GETADDRINFO
 +        struct addrinfo *ai, *cur;
 +        struct addrinfo hints;
 +        memset(&hints, 0, sizeof(hints));
 +        hints.ai_family = AF_INET;
 +        if (getaddrinfo(hostname, NULL, &hints, &ai))
 +            return -1;
 +        /* getaddrinfo returns a linked list of addrinfo structs.
 +         * Even if we set ai_family = AF_INET above, make sure
 +         * that the returned one actually is of the correct type. */
 +        for (cur = ai; cur; cur = cur->ai_next) {
 +            if (cur->ai_family == AF_INET) {
 +                *sin_addr = ((struct sockaddr_in *)cur->ai_addr)->sin_addr;
 +                freeaddrinfo(ai);
 +                return 0;
 +            }
 +        }
 +        freeaddrinfo(ai);
 +        return -1;
 +#else
 +        struct hostent *hp;
 +        hp = gethostbyname(hostname);
 +        if (!hp)
 +            return -1;
 +        memcpy(sin_addr, hp->h_addr_list[0], sizeof(struct in_addr));
 +#endif
 +    }
 +    return 0;
 +}
 +
 +static char *ctime1(char *buf2)
 +{
 +    time_t ti;
 +    char *p;
 +
 +    ti = time(NULL);
 +    p = ctime(&ti);
 +    strcpy(buf2, p);
 +    p = buf2 + strlen(p) - 1;
 +    if (*p == '\n')
 +        *p = '\0';
 +    return buf2;
 +}
 +
 +static void http_vlog(const char *fmt, va_list vargs)
 +{
 +    static int print_prefix = 1;
 +    if (logfile) {
 +        if (print_prefix) {
 +            char buf[32];
 +            ctime1(buf);
 +            fprintf(logfile, "%s ", buf);
 +        }
 +        print_prefix = strstr(fmt, "\n") != NULL;
 +        vfprintf(logfile, fmt, vargs);
 +        fflush(logfile);
 +    }
 +}
 +
 +#ifdef __GNUC__
 +__attribute__ ((format (printf, 1, 2)))
 +#endif
 +static void http_log(const char *fmt, ...)
 +{
 +    va_list vargs;
 +    va_start(vargs, fmt);
 +    http_vlog(fmt, vargs);
 +    va_end(vargs);
 +}
 +
 +static void http_av_log(void *ptr, int level, const char *fmt, va_list vargs)
 +{
 +    static int print_prefix = 1;
 +    AVClass *avc = ptr ? *(AVClass**)ptr : NULL;
 +    if (level > av_log_get_level())
 +        return;
 +    if (print_prefix && avc)
 +        http_log("[%s @ %p]", avc->item_name(ptr), ptr);
 +    print_prefix = strstr(fmt, "\n") != NULL;
 +    http_vlog(fmt, vargs);
 +}
 +
 +static void log_connection(HTTPContext *c)
 +{
 +    if (c->suppress_log)
 +        return;
 +
 +    http_log("%s - - [%s] \"%s %s\" %d %"PRId64"\n",
 +             inet_ntoa(c->from_addr.sin_addr), c->method, c->url,
 +             c->protocol, (c->http_error ? c->http_error : 200), c->data_count);
 +}
 +
 +static void update_datarate(DataRateData *drd, int64_t count)
 +{
 +    if (!drd->time1 && !drd->count1) {
 +        drd->time1 = drd->time2 = cur_time;
 +        drd->count1 = drd->count2 = count;
 +    } else if (cur_time - drd->time2 > 5000) {
 +        drd->time1 = drd->time2;
 +        drd->count1 = drd->count2;
 +        drd->time2 = cur_time;
 +        drd->count2 = count;
 +    }
 +}
 +
 +/* In bytes per second */
 +static int compute_datarate(DataRateData *drd, int64_t count)
 +{
 +    if (cur_time == drd->time1)
 +        return 0;
 +
 +    return ((count - drd->count1) * 1000) / (cur_time - drd->time1);
 +}
 +
 +
 +static void start_children(FFStream *feed)
 +{
 +    if (no_launch)
 +        return;
 +
 +    for (; feed; feed = feed->next) {
 +        if (feed->child_argv && !feed->pid) {
 +            feed->pid_start = time(0);
 +
 +            feed->pid = fork();
 +
 +            if (feed->pid < 0) {
 +                http_log("Unable to create children\n");
 +                exit(1);
 +            }
 +            if (!feed->pid) {
 +                /* In child */
 +                char pathname[1024];
 +                char *slash;
 +                int i;
 +
 +                av_strlcpy(pathname, my_program_name, sizeof(pathname));
 +
 +                slash = strrchr(pathname, '/');
 +                if (!slash)
 +                    slash = pathname;
 +                else
 +                    slash++;
 +                strcpy(slash, "ffmpeg");
 +
 +                http_log("Launch command line: ");
 +                http_log("%s ", pathname);
 +                for (i = 1; feed->child_argv[i] && feed->child_argv[i][0]; i++)
 +                    http_log("%s ", feed->child_argv[i]);
 +                http_log("\n");
 +
 +                for (i = 3; i < 256; i++)
 +                    close(i);
 +
 +                if (!ffserver_debug) {
 +                    i = open("/dev/null", O_RDWR);
 +                    if (i != -1) {
 +                        dup2(i, 0);
 +                        dup2(i, 1);
 +                        dup2(i, 2);
 +                        close(i);
 +                    }
 +                }
 +
 +                /* This is needed to make relative pathnames work */
 +                if (chdir(my_program_dir) < 0) {
 +                    http_log("chdir failed\n");
 +                    exit(1);
 +                }
 +
 +                signal(SIGPIPE, SIG_DFL);
 +
 +                execvp(pathname, feed->child_argv);
 +
 +                _exit(1);
 +            }
 +        }
 +    }
 +}
 +
 +/* open a listening socket */
 +static int socket_open_listen(struct sockaddr_in *my_addr)
 +{
 +    int server_fd, tmp;
 +
 +    server_fd = socket(AF_INET,SOCK_STREAM,0);
 +    if (server_fd < 0) {
 +        perror ("socket");
 +        return -1;
 +    }
 +
 +    tmp = 1;
 +    setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof(tmp));
 +
 +    my_addr->sin_family = AF_INET;
 +    if (bind (server_fd, (struct sockaddr *) my_addr, sizeof (*my_addr)) < 0) {
 +        char bindmsg[32];
 +        snprintf(bindmsg, sizeof(bindmsg), "bind(port %d)", ntohs(my_addr->sin_port));
 +        perror (bindmsg);
 +        closesocket(server_fd);
 +        return -1;
 +    }
 +
 +    if (listen (server_fd, 5) < 0) {
 +        perror ("listen");
 +        closesocket(server_fd);
 +        return -1;
 +    }
 +    ff_socket_nonblock(server_fd, 1);
 +
 +    return server_fd;
 +}
 +
 +/* start all multicast streams */
 +static void start_multicast(void)
 +{
 +    FFStream *stream;
 +    char session_id[32];
 +    HTTPContext *rtp_c;
 +    struct sockaddr_in dest_addr;
 +    int default_port, stream_index;
 +
 +    default_port = 6000;
 +    for(stream = first_stream; stream != NULL; stream = stream->next) {
 +        if (stream->is_multicast) {
 +            /* open the RTP connection */
 +            snprintf(session_id, sizeof(session_id), "%08x%08x",
 +                     av_lfg_get(&random_state), av_lfg_get(&random_state));
 +
 +            /* choose a port if none given */
 +            if (stream->multicast_port == 0) {
 +                stream->multicast_port = default_port;
 +                default_port += 100;
 +            }
 +
 +            dest_addr.sin_family = AF_INET;
 +            dest_addr.sin_addr = stream->multicast_ip;
 +            dest_addr.sin_port = htons(stream->multicast_port);
 +
 +            rtp_c = rtp_new_connection(&dest_addr, stream, session_id,
 +                                       RTSP_LOWER_TRANSPORT_UDP_MULTICAST);
 +            if (!rtp_c)
 +                continue;
 +
 +            if (open_input_stream(rtp_c, "") < 0) {
 +                http_log("Could not open input stream for stream '%s'\n",
 +                         stream->filename);
 +                continue;
 +            }
 +
 +            /* open each RTP stream */
 +            for(stream_index = 0; stream_index < stream->nb_streams;
 +                stream_index++) {
 +                dest_addr.sin_port = htons(stream->multicast_port +
 +                                           2 * stream_index);
 +                if (rtp_new_av_stream(rtp_c, stream_index, &dest_addr, NULL) < 0) {
 +                    http_log("Could not open output stream '%s/streamid=%d'\n",
 +                             stream->filename, stream_index);
 +                    exit(1);
 +                }
 +            }
 +
 +            /* change state to send data */
 +            rtp_c->state = HTTPSTATE_SEND_DATA;
 +        }
 +    }
 +}
 +
 +/* main loop of the http server */
 +static int http_server(void)
 +{
 +    int server_fd = 0, rtsp_server_fd = 0;
 +    int ret, delay, delay1;
 +    struct pollfd *poll_table, *poll_entry;
 +    HTTPContext *c, *c_next;
 +
 +    if(!(poll_table = av_mallocz((nb_max_http_connections + 2)*sizeof(*poll_table)))) {
 +        http_log("Impossible to allocate a poll table handling %d connections.\n", nb_max_http_connections);
 +        return -1;
 +    }
 +
 +    if (my_http_addr.sin_port) {
 +        server_fd = socket_open_listen(&my_http_addr);
 +        if (server_fd < 0)
 +            return -1;
 +    }
 +
 +    if (my_rtsp_addr.sin_port) {
 +        rtsp_server_fd = socket_open_listen(&my_rtsp_addr);
 +        if (rtsp_server_fd < 0)
 +            return -1;
 +    }
 +
 +    if (!rtsp_server_fd && !server_fd) {
 +        http_log("HTTP and RTSP disabled.\n");
 +        return -1;
 +    }
 +
 +    http_log("FFserver started.\n");
 +
 +    start_children(first_feed);
 +
 +    start_multicast();
 +
 +    for(;;) {
 +        poll_entry = poll_table;
 +        if (server_fd) {
 +            poll_entry->fd = server_fd;
 +            poll_entry->events = POLLIN;
 +            poll_entry++;
 +        }
 +        if (rtsp_server_fd) {
 +            poll_entry->fd = rtsp_server_fd;
 +            poll_entry->events = POLLIN;
 +            poll_entry++;
 +        }
 +
 +        /* wait for events on each HTTP handle */
 +        c = first_http_ctx;
 +        delay = 1000;
 +        while (c != NULL) {
 +            int fd;
 +            fd = c->fd;
 +            switch(c->state) {
 +            case HTTPSTATE_SEND_HEADER:
 +            case RTSPSTATE_SEND_REPLY:
 +            case RTSPSTATE_SEND_PACKET:
 +                c->poll_entry = poll_entry;
 +                poll_entry->fd = fd;
 +                poll_entry->events = POLLOUT;
 +                poll_entry++;
 +                break;
 +            case HTTPSTATE_SEND_DATA_HEADER:
 +            case HTTPSTATE_SEND_DATA:
 +            case HTTPSTATE_SEND_DATA_TRAILER:
 +                if (!c->is_packetized) {
 +                    /* for TCP, we output as much as we can (may need to put a limit) */
 +                    c->poll_entry = poll_entry;
 +                    poll_entry->fd = fd;
 +                    poll_entry->events = POLLOUT;
 +                    poll_entry++;
 +                } else {
 +                    /* when ffserver is doing the timing, we work by
 +                       looking at which packet need to be sent every
 +                       10 ms */
 +                    delay1 = 10; /* one tick wait XXX: 10 ms assumed */
 +                    if (delay1 < delay)
 +                        delay = delay1;
 +                }
 +                break;
 +            case HTTPSTATE_WAIT_REQUEST:
 +            case HTTPSTATE_RECEIVE_DATA:
 +            case HTTPSTATE_WAIT_FEED:
 +            case RTSPSTATE_WAIT_REQUEST:
 +                /* need to catch errors */
 +                c->poll_entry = poll_entry;
 +                poll_entry->fd = fd;
 +                poll_entry->events = POLLIN;/* Maybe this will work */
 +                poll_entry++;
 +                break;
 +            default:
 +                c->poll_entry = NULL;
 +                break;
 +            }
 +            c = c->next;
 +        }
 +
 +        /* wait for an event on one connection. We poll at least every
 +           second to handle timeouts */
 +        do {
 +            ret = poll(poll_table, poll_entry - poll_table, delay);
 +            if (ret < 0 && ff_neterrno() != AVERROR(EAGAIN) &&
 +                ff_neterrno() != AVERROR(EINTR))
 +                return -1;
 +        } while (ret < 0);
 +
 +        cur_time = av_gettime() / 1000;
 +
 +        if (need_to_start_children) {
 +            need_to_start_children = 0;
 +            start_children(first_feed);
 +        }
 +
 +        /* now handle the events */
 +        for(c = first_http_ctx; c != NULL; c = c_next) {
 +            c_next = c->next;
 +            if (handle_connection(c) < 0) {
 +                /* close and free the connection */
 +                log_connection(c);
 +                close_connection(c);
 +            }
 +        }
 +
 +        poll_entry = poll_table;
 +        if (server_fd) {
 +            /* new HTTP connection request ? */
 +            if (poll_entry->revents & POLLIN)
 +                new_connection(server_fd, 0);
 +            poll_entry++;
 +        }
 +        if (rtsp_server_fd) {
 +            /* new RTSP connection request ? */
 +            if (poll_entry->revents & POLLIN)
 +                new_connection(rtsp_server_fd, 1);
 +        }
 +    }
 +}
 +
 +/* start waiting for a new HTTP/RTSP request */
 +static void start_wait_request(HTTPContext *c, int is_rtsp)
 +{
 +    c->buffer_ptr = c->buffer;
 +    c->buffer_end = c->buffer + c->buffer_size - 1; /* leave room for '\0' */
 +
 +    if (is_rtsp) {
 +        c->timeout = cur_time + RTSP_REQUEST_TIMEOUT;
 +        c->state = RTSPSTATE_WAIT_REQUEST;
 +    } else {
 +        c->timeout = cur_time + HTTP_REQUEST_TIMEOUT;
 +        c->state = HTTPSTATE_WAIT_REQUEST;
 +    }
 +}
 +
 +static void http_send_too_busy_reply(int fd)
 +{
 +    char buffer[300];
 +    int len = snprintf(buffer, sizeof(buffer),
 +                       "HTTP/1.0 503 Server too busy\r\n"
 +                       "Content-type: text/html\r\n"
 +                       "\r\n"
 +                       "<html><head><title>Too busy</title></head><body>\r\n"
 +                       "<p>The server is too busy to serve your request at this time.</p>\r\n"
 +                       "<p>The number of current connections is %d, and this exceeds the limit of %d.</p>\r\n"
 +                       "</body></html>\r\n",
 +                       nb_connections, nb_max_connections);
 +    send(fd, buffer, len, 0);
 +}
 +
 +
 +static void new_connection(int server_fd, int is_rtsp)
 +{
 +    struct sockaddr_in from_addr;
 +    int fd, len;
 +    HTTPContext *c = NULL;
 +
 +    len = sizeof(from_addr);
 +    fd = accept(server_fd, (struct sockaddr *)&from_addr,
 +                &len);
 +    if (fd < 0) {
 +        http_log("error during accept %s\n", strerror(errno));
 +        return;
 +    }
 +    ff_socket_nonblock(fd, 1);
 +
 +    if (nb_connections >= nb_max_connections) {
 +        http_send_too_busy_reply(fd);
 +        goto fail;
 +    }
 +
 +    /* add a new connection */
 +    c = av_mallocz(sizeof(HTTPContext));
 +    if (!c)
 +        goto fail;
 +
 +    c->fd = fd;
 +    c->poll_entry = NULL;
 +    c->from_addr = from_addr;
 +    c->buffer_size = IOBUFFER_INIT_SIZE;
 +    c->buffer = av_malloc(c->buffer_size);
 +    if (!c->buffer)
 +        goto fail;
 +
 +    c->next = first_http_ctx;
 +    first_http_ctx = c;
 +    nb_connections++;
 +
 +    start_wait_request(c, is_rtsp);
 +
 +    return;
 +
 + fail:
 +    if (c) {
 +        av_free(c->buffer);
 +        av_free(c);
 +    }
 +    closesocket(fd);
 +}
 +
 +static void close_connection(HTTPContext *c)
 +{
 +    HTTPContext **cp, *c1;
 +    int i, nb_streams;
 +    AVFormatContext *ctx;
 +    URLContext *h;
 +    AVStream *st;
 +
 +    /* remove connection from list */
 +    cp = &first_http_ctx;
 +    while ((*cp) != NULL) {
 +        c1 = *cp;
 +        if (c1 == c)
 +            *cp = c->next;
 +        else
 +            cp = &c1->next;
 +    }
 +
 +    /* remove references, if any (XXX: do it faster) */
 +    for(c1 = first_http_ctx; c1 != NULL; c1 = c1->next) {
 +        if (c1->rtsp_c == c)
 +            c1->rtsp_c = NULL;
 +    }
 +
 +    /* remove connection associated resources */
 +    if (c->fd >= 0)
 +        closesocket(c->fd);
 +    if (c->fmt_in) {
 +        /* close each frame parser */
 +        for(i=0;i<c->fmt_in->nb_streams;i++) {
 +            st = c->fmt_in->streams[i];
 +            if (st->codec->codec)
 +                avcodec_close(st->codec);
 +        }
 +        avformat_close_input(&c->fmt_in);
 +    }
 +
 +    /* free RTP output streams if any */
 +    nb_streams = 0;
 +    if (c->stream)
 +        nb_streams = c->stream->nb_streams;
 +
 +    for(i=0;i<nb_streams;i++) {
 +        ctx = c->rtp_ctx[i];
 +        if (ctx) {
 +            av_write_trailer(ctx);
 +            av_dict_free(&ctx->metadata);
 +            av_free(ctx->streams[0]);
 +            av_free(ctx);
 +        }
 +        h = c->rtp_handles[i];
 +        if (h)
-                             max_packet_size = c->rtp_handles[c->packet_stream_index]->max_packet_size;
++            url_close(h);
 +    }
 +
 +    ctx = &c->fmt_ctx;
 +
 +    if (!c->last_packet_sent && c->state == HTTPSTATE_SEND_DATA_TRAILER) {
 +        if (ctx->oformat) {
 +            /* prepare header */
 +            if (avio_open_dyn_buf(&ctx->pb) >= 0) {
 +                av_write_trailer(ctx);
 +                av_freep(&c->pb_buffer);
 +                avio_close_dyn_buf(ctx->pb, &c->pb_buffer);
 +            }
 +        }
 +    }
 +
 +    for(i=0; i<ctx->nb_streams; i++)
 +        av_free(ctx->streams[i]);
 +
 +    if (c->stream && !c->post && c->stream->stream_type == STREAM_TYPE_LIVE)
 +        current_bandwidth -= c->stream->bandwidth;
 +
 +    /* signal that there is no feed if we are the feeder socket */
 +    if (c->state == HTTPSTATE_RECEIVE_DATA && c->stream) {
 +        c->stream->feed_opened = 0;
 +        close(c->feed_fd);
 +    }
 +
 +    av_freep(&c->pb_buffer);
 +    av_freep(&c->packet_buffer);
 +    av_free(c->buffer);
 +    av_free(c);
 +    nb_connections--;
 +}
 +
 +static int handle_connection(HTTPContext *c)
 +{
 +    int len, ret;
 +
 +    switch(c->state) {
 +    case HTTPSTATE_WAIT_REQUEST:
 +    case RTSPSTATE_WAIT_REQUEST:
 +        /* timeout ? */
 +        if ((c->timeout - cur_time) < 0)
 +            return -1;
 +        if (c->poll_entry->revents & (POLLERR | POLLHUP))
 +            return -1;
 +
 +        /* no need to read if no events */
 +        if (!(c->poll_entry->revents & POLLIN))
 +            return 0;
 +        /* read the data */
 +    read_loop:
 +        len = recv(c->fd, c->buffer_ptr, 1, 0);
 +        if (len < 0) {
 +            if (ff_neterrno() != AVERROR(EAGAIN) &&
 +                ff_neterrno() != AVERROR(EINTR))
 +                return -1;
 +        } else if (len == 0) {
 +            return -1;
 +        } else {
 +            /* search for end of request. */
 +            uint8_t *ptr;
 +            c->buffer_ptr += len;
 +            ptr = c->buffer_ptr;
 +            if ((ptr >= c->buffer + 2 && !memcmp(ptr-2, "\n\n", 2)) ||
 +                (ptr >= c->buffer + 4 && !memcmp(ptr-4, "\r\n\r\n", 4))) {
 +                /* request found : parse it and reply */
 +                if (c->state == HTTPSTATE_WAIT_REQUEST) {
 +                    ret = http_parse_request(c);
 +                } else {
 +                    ret = rtsp_parse_request(c);
 +                }
 +                if (ret < 0)
 +                    return -1;
 +            } else if (ptr >= c->buffer_end) {
 +                /* request too long: cannot do anything */
 +                return -1;
 +            } else goto read_loop;
 +        }
 +        break;
 +
 +    case HTTPSTATE_SEND_HEADER:
 +        if (c->poll_entry->revents & (POLLERR | POLLHUP))
 +            return -1;
 +
 +        /* no need to write if no events */
 +        if (!(c->poll_entry->revents & POLLOUT))
 +            return 0;
 +        len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0);
 +        if (len < 0) {
 +            if (ff_neterrno() != AVERROR(EAGAIN) &&
 +                ff_neterrno() != AVERROR(EINTR)) {
 +                /* error : close connection */
 +                av_freep(&c->pb_buffer);
 +                return -1;
 +            }
 +        } else {
 +            c->buffer_ptr += len;
 +            if (c->stream)
 +                c->stream->bytes_served += len;
 +            c->data_count += len;
 +            if (c->buffer_ptr >= c->buffer_end) {
 +                av_freep(&c->pb_buffer);
 +                /* if error, exit */
 +                if (c->http_error)
 +                    return -1;
 +                /* all the buffer was sent : synchronize to the incoming stream */
 +                c->state = HTTPSTATE_SEND_DATA_HEADER;
 +                c->buffer_ptr = c->buffer_end = c->buffer;
 +            }
 +        }
 +        break;
 +
 +    case HTTPSTATE_SEND_DATA:
 +    case HTTPSTATE_SEND_DATA_HEADER:
 +    case HTTPSTATE_SEND_DATA_TRAILER:
 +        /* for packetized output, we consider we can always write (the
 +           input streams sets the speed). It may be better to verify
 +           that we do not rely too much on the kernel queues */
 +        if (!c->is_packetized) {
 +            if (c->poll_entry->revents & (POLLERR | POLLHUP))
 +                return -1;
 +
 +            /* no need to read if no events */
 +            if (!(c->poll_entry->revents & POLLOUT))
 +                return 0;
 +        }
 +        if (http_send_data(c) < 0)
 +            return -1;
 +        /* close connection if trailer sent */
 +        if (c->state == HTTPSTATE_SEND_DATA_TRAILER)
 +            return -1;
 +        break;
 +    case HTTPSTATE_RECEIVE_DATA:
 +        /* no need to read if no events */
 +        if (c->poll_entry->revents & (POLLERR | POLLHUP))
 +            return -1;
 +        if (!(c->poll_entry->revents & POLLIN))
 +            return 0;
 +        if (http_receive_data(c) < 0)
 +            return -1;
 +        break;
 +    case HTTPSTATE_WAIT_FEED:
 +        /* no need to read if no events */
 +        if (c->poll_entry->revents & (POLLIN | POLLERR | POLLHUP))
 +            return -1;
 +
 +        /* nothing to do, we'll be waken up by incoming feed packets */
 +        break;
 +
 +    case RTSPSTATE_SEND_REPLY:
 +        if (c->poll_entry->revents & (POLLERR | POLLHUP)) {
 +            av_freep(&c->pb_buffer);
 +            return -1;
 +        }
 +        /* no need to write if no events */
 +        if (!(c->poll_entry->revents & POLLOUT))
 +            return 0;
 +        len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0);
 +        if (len < 0) {
 +            if (ff_neterrno() != AVERROR(EAGAIN) &&
 +                ff_neterrno() != AVERROR(EINTR)) {
 +                /* error : close connection */
 +                av_freep(&c->pb_buffer);
 +                return -1;
 +            }
 +        } else {
 +            c->buffer_ptr += len;
 +            c->data_count += len;
 +            if (c->buffer_ptr >= c->buffer_end) {
 +                /* all the buffer was sent : wait for a new request */
 +                av_freep(&c->pb_buffer);
 +                start_wait_request(c, 1);
 +            }
 +        }
 +        break;
 +    case RTSPSTATE_SEND_PACKET:
 +        if (c->poll_entry->revents & (POLLERR | POLLHUP)) {
 +            av_freep(&c->packet_buffer);
 +            return -1;
 +        }
 +        /* no need to write if no events */
 +        if (!(c->poll_entry->revents & POLLOUT))
 +            return 0;
 +        len = send(c->fd, c->packet_buffer_ptr,
 +                    c->packet_buffer_end - c->packet_buffer_ptr, 0);
 +        if (len < 0) {
 +            if (ff_neterrno() != AVERROR(EAGAIN) &&
 +                ff_neterrno() != AVERROR(EINTR)) {
 +                /* error : close connection */
 +                av_freep(&c->packet_buffer);
 +                return -1;
 +            }
 +        } else {
 +            c->packet_buffer_ptr += len;
 +            if (c->packet_buffer_ptr >= c->packet_buffer_end) {
 +                /* all the buffer was sent : wait for a new request */
 +                av_freep(&c->packet_buffer);
 +                c->state = RTSPSTATE_WAIT_REQUEST;
 +            }
 +        }
 +        break;
 +    case HTTPSTATE_READY:
 +        /* nothing to do */
 +        break;
 +    default:
 +        return -1;
 +    }
 +    return 0;
 +}
 +
 +static int extract_rates(char *rates, int ratelen, const char *request)
 +{
 +    const char *p;
 +
 +    for (p = request; *p && *p != '\r' && *p != '\n'; ) {
 +        if (av_strncasecmp(p, "Pragma:", 7) == 0) {
 +            const char *q = p + 7;
 +
 +            while (*q && *q != '\n' && isspace(*q))
 +                q++;
 +
 +            if (av_strncasecmp(q, "stream-switch-entry=", 20) == 0) {
 +                int stream_no;
 +                int rate_no;
 +
 +                q += 20;
 +
 +                memset(rates, 0xff, ratelen);
 +
 +                while (1) {
 +                    while (*q && *q != '\n' && *q != ':')
 +                        q++;
 +
 +                    if (sscanf(q, ":%d:%d", &stream_no, &rate_no) != 2)
 +                        break;
 +
 +                    stream_no--;
 +                    if (stream_no < ratelen && stream_no >= 0)
 +                        rates[stream_no] = rate_no;
 +
 +                    while (*q && *q != '\n' && !isspace(*q))
 +                        q++;
 +                }
 +
 +                return 1;
 +            }
 +        }
 +        p = strchr(p, '\n');
 +        if (!p)
 +            break;
 +
 +        p++;
 +    }
 +
 +    return 0;
 +}
 +
 +static int find_stream_in_feed(FFStream *feed, AVCodecContext *codec, int bit_rate)
 +{
 +    int i;
 +    int best_bitrate = 100000000;
 +    int best = -1;
 +
 +    for (i = 0; i < feed->nb_streams; i++) {
 +        AVCodecContext *feed_codec = feed->streams[i]->codec;
 +
 +        if (feed_codec->codec_id != codec->codec_id ||
 +            feed_codec->sample_rate != codec->sample_rate ||
 +            feed_codec->width != codec->width ||
 +            feed_codec->height != codec->height)
 +            continue;
 +
 +        /* Potential stream */
 +
 +        /* We want the fastest stream less than bit_rate, or the slowest
 +         * faster than bit_rate
 +         */
 +
 +        if (feed_codec->bit_rate <= bit_rate) {
 +            if (best_bitrate > bit_rate || feed_codec->bit_rate > best_bitrate) {
 +                best_bitrate = feed_codec->bit_rate;
 +                best = i;
 +            }
 +        } else {
 +            if (feed_codec->bit_rate < best_bitrate) {
 +                best_bitrate = feed_codec->bit_rate;
 +                best = i;
 +            }
 +        }
 +    }
 +
 +    return best;
 +}
 +
 +static int modify_current_stream(HTTPContext *c, char *rates)
 +{
 +    int i;
 +    FFStream *req = c->stream;
 +    int action_required = 0;
 +
 +    /* Not much we can do for a feed */
 +    if (!req->feed)
 +        return 0;
 +
 +    for (i = 0; i < req->nb_streams; i++) {
 +        AVCodecContext *codec = req->streams[i]->codec;
 +
 +        switch(rates[i]) {
 +            case 0:
 +                c->switch_feed_streams[i] = req->feed_streams[i];
 +                break;
 +            case 1:
 +                c->switch_feed_streams[i] = find_stream_in_feed(req->feed, codec, codec->bit_rate / 2);
 +                break;
 +            case 2:
 +                /* Wants off or slow */
 +                c->switch_feed_streams[i] = find_stream_in_feed(req->feed, codec, codec->bit_rate / 4);
 +#ifdef WANTS_OFF
 +                /* This doesn't work well when it turns off the only stream! */
 +                c->switch_feed_streams[i] = -2;
 +                c->feed_streams[i] = -2;
 +#endif
 +                break;
 +        }
 +
 +        if (c->switch_feed_streams[i] >= 0 && c->switch_feed_streams[i] != c->feed_streams[i])
 +            action_required = 1;
 +    }
 +
 +    return action_required;
 +}
 +
 +/* XXX: factorize in utils.c ? */
 +/* XXX: take care with different space meaning */
 +static void skip_spaces(const char **pp)
 +{
 +    const char *p;
 +    p = *pp;
 +    while (*p == ' ' || *p == '\t')
 +        p++;
 +    *pp = p;
 +}
 +
 +static void get_word(char *buf, int buf_size, const char **pp)
 +{
 +    const char *p;
 +    char *q;
 +
 +    p = *pp;
 +    skip_spaces(&p);
 +    q = buf;
 +    while (!isspace(*p) && *p != '\0') {
 +        if ((q - buf) < buf_size - 1)
 +            *q++ = *p;
 +        p++;
 +    }
 +    if (buf_size > 0)
 +        *q = '\0';
 +    *pp = p;
 +}
 +
 +static void get_arg(char *buf, int buf_size, const char **pp)
 +{
 +    const char *p;
 +    char *q;
 +    int quote;
 +
 +    p = *pp;
 +    while (isspace(*p)) p++;
 +    q = buf;
 +    quote = 0;
 +    if (*p == '\"' || *p == '\'')
 +        quote = *p++;
 +    for(;;) {
 +        if (quote) {
 +            if (*p == quote)
 +                break;
 +        } else {
 +            if (isspace(*p))
 +                break;
 +        }
 +        if (*p == '\0')
 +            break;
 +        if ((q - buf) < buf_size - 1)
 +            *q++ = *p;
 +        p++;
 +    }
 +    *q = '\0';
 +    if (quote && *p == quote)
 +        p++;
 +    *pp = p;
 +}
 +
 +static void parse_acl_row(FFStream *stream, FFStream* feed, IPAddressACL *ext_acl,
 +                         const char *p, const char *filename, int line_num)
 +{
 +    char arg[1024];
 +    IPAddressACL acl;
 +    int errors = 0;
 +
 +    get_arg(arg, sizeof(arg), &p);
 +    if (av_strcasecmp(arg, "allow") == 0)
 +        acl.action = IP_ALLOW;
 +    else if (av_strcasecmp(arg, "deny") == 0)
 +        acl.action = IP_DENY;
 +    else {
 +        fprintf(stderr, "%s:%d: ACL action '%s' is not ALLOW or DENY\n",
 +                filename, line_num, arg);
 +        errors++;
 +    }
 +
 +    get_arg(arg, sizeof(arg), &p);
 +
 +    if (resolve_host(&acl.first, arg) != 0) {
 +        fprintf(stderr, "%s:%d: ACL refers to invalid host or ip address '%s'\n",
 +                filename, line_num, arg);
 +        errors++;
 +    } else
 +        acl.last = acl.first;
 +
 +    get_arg(arg, sizeof(arg), &p);
 +
 +    if (arg[0]) {
 +        if (resolve_host(&acl.last, arg) != 0) {
 +            fprintf(stderr, "%s:%d: ACL refers to invalid host or ip address '%s'\n",
 +                    filename, line_num, arg);
 +            errors++;
 +        }
 +    }
 +
 +    if (!errors) {
 +        IPAddressACL *nacl = av_mallocz(sizeof(*nacl));
 +        IPAddressACL **naclp = 0;
 +
 +        acl.next = 0;
 +        *nacl = acl;
 +
 +        if (stream)
 +            naclp = &stream->acl;
 +        else if (feed)
 +            naclp = &feed->acl;
 +        else if (ext_acl)
 +            naclp = &ext_acl;
 +        else {
 +            fprintf(stderr, "%s:%d: ACL found not in <stream> or <feed>\n",
 +                    filename, line_num);
 +            errors++;
 +        }
 +
 +        if (naclp) {
 +            while (*naclp)
 +                naclp = &(*naclp)->next;
 +
 +            *naclp = nacl;
 +        }
 +    }
 +}
 +
 +
 +static IPAddressACL* parse_dynamic_acl(FFStream *stream, HTTPContext *c)
 +{
 +    FILE* f;
 +    char line[1024];
 +    char  cmd[1024];
 +    IPAddressACL *acl = NULL;
 +    int line_num = 0;
 +    const char *p;
 +
 +    f = fopen(stream->dynamic_acl, "r");
 +    if (!f) {
 +        perror(stream->dynamic_acl);
 +        return NULL;
 +    }
 +
 +    acl = av_mallocz(sizeof(IPAddressACL));
 +
 +    /* Build ACL */
 +    for(;;) {
 +        if (fgets(line, sizeof(line), f) == NULL)
 +            break;
 +        line_num++;
 +        p = line;
 +        while (isspace(*p))
 +            p++;
 +        if (*p == '\0' || *p == '#')
 +            continue;
 +        get_arg(cmd, sizeof(cmd), &p);
 +
 +        if (!av_strcasecmp(cmd, "ACL"))
 +            parse_acl_row(NULL, NULL, acl, p, stream->dynamic_acl, line_num);
 +    }
 +    fclose(f);
 +    return acl;
 +}
 +
 +
 +static void free_acl_list(IPAddressACL *in_acl)
 +{
 +    IPAddressACL *pacl,*pacl2;
 +
 +    pacl = in_acl;
 +    while(pacl) {
 +        pacl2 = pacl;
 +        pacl = pacl->next;
 +        av_freep(pacl2);
 +    }
 +}
 +
 +static int validate_acl_list(IPAddressACL *in_acl, HTTPContext *c)
 +{
 +    enum IPAddressAction last_action = IP_DENY;
 +    IPAddressACL *acl;
 +    struct in_addr *src = &c->from_addr.sin_addr;
 +    unsigned long src_addr = src->s_addr;
 +
 +    for (acl = in_acl; acl; acl = acl->next) {
 +        if (src_addr >= acl->first.s_addr && src_addr <= acl->last.s_addr)
 +            return (acl->action == IP_ALLOW) ? 1 : 0;
 +        last_action = acl->action;
 +    }
 +
 +    /* Nothing matched, so return not the last action */
 +    return (last_action == IP_DENY) ? 1 : 0;
 +}
 +
 +static int validate_acl(FFStream *stream, HTTPContext *c)
 +{
 +    int ret = 0;
 +    IPAddressACL *acl;
 +
 +
 +    /* if stream->acl is null validate_acl_list will return 1 */
 +    ret = validate_acl_list(stream->acl, c);
 +
 +    if (stream->dynamic_acl[0]) {
 +        acl = parse_dynamic_acl(stream, c);
 +
 +        ret = validate_acl_list(acl, c);
 +
 +        free_acl_list(acl);
 +    }
 +
 +    return ret;
 +}
 +
 +/* compute the real filename of a file by matching it without its
 +   extensions to all the stream filenames */
 +static void compute_real_filename(char *filename, int max_size)
 +{
 +    char file1[1024];
 +    char file2[1024];
 +    char *p;
 +    FFStream *stream;
 +
 +    /* compute filename by matching without the file extensions */
 +    av_strlcpy(file1, filename, sizeof(file1));
 +    p = strrchr(file1, '.');
 +    if (p)
 +        *p = '\0';
 +    for(stream = first_stream; stream != NULL; stream = stream->next) {
 +        av_strlcpy(file2, stream->filename, sizeof(file2));
 +        p = strrchr(file2, '.');
 +        if (p)
 +            *p = '\0';
 +        if (!strcmp(file1, file2)) {
 +            av_strlcpy(filename, stream->filename, max_size);
 +            break;
 +        }
 +    }
 +}
 +
 +enum RedirType {
 +    REDIR_NONE,
 +    REDIR_ASX,
 +    REDIR_RAM,
 +    REDIR_ASF,
 +    REDIR_RTSP,
 +    REDIR_SDP,
 +};
 +
 +/* parse http request and prepare header */
 +static int http_parse_request(HTTPContext *c)
 +{
 +    char *p;
 +    enum RedirType redir_type;
 +    char cmd[32];
 +    char info[1024], filename[1024];
 +    char url[1024], *q;
 +    char protocol[32];
 +    char msg[1024];
 +    const char *mime_type;
 +    FFStream *stream;
 +    int i;
 +    char ratebuf[32];
 +    char *useragent = 0;
 +
 +    p = c->buffer;
 +    get_word(cmd, sizeof(cmd), (const char **)&p);
 +    av_strlcpy(c->method, cmd, sizeof(c->method));
 +
 +    if (!strcmp(cmd, "GET"))
 +        c->post = 0;
 +    else if (!strcmp(cmd, "POST"))
 +        c->post = 1;
 +    else
 +        return -1;
 +
 +    get_word(url, sizeof(url), (const char **)&p);
 +    av_strlcpy(c->url, url, sizeof(c->url));
 +
 +    get_word(protocol, sizeof(protocol), (const char **)&p);
 +    if (strcmp(protocol, "HTTP/1.0") && strcmp(protocol, "HTTP/1.1"))
 +        return -1;
 +
 +    av_strlcpy(c->protocol, protocol, sizeof(c->protocol));
 +
 +    if (ffserver_debug)
 +        http_log("%s - - New connection: %s %s\n", inet_ntoa(c->from_addr.sin_addr), cmd, url);
 +
 +    /* find the filename and the optional info string in the request */
 +    p = strchr(url, '?');
 +    if (p) {
 +        av_strlcpy(info, p, sizeof(info));
 +        *p = '\0';
 +    } else
 +        info[0] = '\0';
 +
 +    av_strlcpy(filename, url + ((*url == '/') ? 1 : 0), sizeof(filename)-1);
 +
 +    for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) {
 +        if (av_strncasecmp(p, "User-Agent:", 11) == 0) {
 +            useragent = p + 11;
 +            if (*useragent && *useragent != '\n' && isspace(*useragent))
 +                useragent++;
 +            break;
 +        }
 +        p = strchr(p, '\n');
 +        if (!p)
 +            break;
 +
 +        p++;
 +    }
 +
 +    redir_type = REDIR_NONE;
 +    if (av_match_ext(filename, "asx")) {
 +        redir_type = REDIR_ASX;
 +        filename[strlen(filename)-1] = 'f';
 +    } else if (av_match_ext(filename, "asf") &&
 +        (!useragent || av_strncasecmp(useragent, "NSPlayer", 8) != 0)) {
 +        /* if this isn't WMP or lookalike, return the redirector file */
 +        redir_type = REDIR_ASF;
 +    } else if (av_match_ext(filename, "rpm,ram")) {
 +        redir_type = REDIR_RAM;
 +        strcpy(filename + strlen(filename)-2, "m");
 +    } else if (av_match_ext(filename, "rtsp")) {
 +        redir_type = REDIR_RTSP;
 +        compute_real_filename(filename, sizeof(filename) - 1);
 +    } else if (av_match_ext(filename, "sdp")) {
 +        redir_type = REDIR_SDP;
 +        compute_real_filename(filename, sizeof(filename) - 1);
 +    }
 +
 +    // "redirect" / request to index.html
 +    if (!strlen(filename))
 +        av_strlcpy(filename, "index.html", sizeof(filename) - 1);
 +
 +    stream = first_stream;
 +    while (stream != NULL) {
 +        if (!strcmp(stream->filename, filename) && validate_acl(stream, c))
 +            break;
 +        stream = stream->next;
 +    }
 +    if (stream == NULL) {
 +        snprintf(msg, sizeof(msg), "File '%s' not found", url);
 +        http_log("File '%s' not found\n", url);
 +        goto send_error;
 +    }
 +
 +    c->stream = stream;
 +    memcpy(c->feed_streams, stream->feed_streams, sizeof(c->feed_streams));
 +    memset(c->switch_feed_streams, -1, sizeof(c->switch_feed_streams));
 +
 +    if (stream->stream_type == STREAM_TYPE_REDIRECT) {
 +        c->http_error = 301;
 +        q = c->buffer;
 +        q += snprintf(q, c->buffer_size,
 +                      "HTTP/1.0 301 Moved\r\n"
 +                      "Location: %s\r\n"
 +                      "Content-type: text/html\r\n"
 +                      "\r\n"
 +                      "<html><head><title>Moved</title></head><body>\r\n"
 +                      "You should be <a href=\"%s\">redirected</a>.\r\n"
 +                      "</body></html>\r\n", stream->feed_filename, stream->feed_filename);
 +        /* prepare output buffer */
 +        c->buffer_ptr = c->buffer;
 +        c->buffer_end = q;
 +        c->state = HTTPSTATE_SEND_HEADER;
 +        return 0;
 +    }
 +
 +    /* If this is WMP, get the rate information */
 +    if (extract_rates(ratebuf, sizeof(ratebuf), c->buffer)) {
 +        if (modify_current_stream(c, ratebuf)) {
 +            for (i = 0; i < FF_ARRAY_ELEMS(c->feed_streams); i++) {
 +                if (c->switch_feed_streams[i] >= 0)
 +                    c->switch_feed_streams[i] = -1;
 +            }
 +        }
 +    }
 +
 +    if (c->post == 0 && stream->stream_type == STREAM_TYPE_LIVE)
 +        current_bandwidth += stream->bandwidth;
 +
 +    /* If already streaming this feed, do not let start another feeder. */
 +    if (stream->feed_opened) {
 +        snprintf(msg, sizeof(msg), "This feed is already being received.");
 +        http_log("Feed '%s' already being received\n", stream->feed_filename);
 +        goto send_error;
 +    }
 +
 +    if (c->post == 0 && max_bandwidth < current_bandwidth) {
 +        c->http_error = 503;
 +        q = c->buffer;
 +        q += snprintf(q, c->buffer_size,
 +                      "HTTP/1.0 503 Server too busy\r\n"
 +                      "Content-type: text/html\r\n"
 +                      "\r\n"
 +                      "<html><head><title>Too busy</title></head><body>\r\n"
 +                      "<p>The server is too busy to serve your request at this time.</p>\r\n"
 +                      "<p>The bandwidth being served (including your stream) is %"PRIu64"kbit/sec, "
 +                      "and this exceeds the limit of %"PRIu64"kbit/sec.</p>\r\n"
 +                      "</body></html>\r\n", current_bandwidth, max_bandwidth);
 +        /* prepare output buffer */
 +        c->buffer_ptr = c->buffer;
 +        c->buffer_end = q;
 +        c->state = HTTPSTATE_SEND_HEADER;
 +        return 0;
 +    }
 +
 +    if (redir_type != REDIR_NONE) {
 +        char *hostinfo = 0;
 +
 +        for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) {
 +            if (av_strncasecmp(p, "Host:", 5) == 0) {
 +                hostinfo = p + 5;
 +                break;
 +            }
 +            p = strchr(p, '\n');
 +            if (!p)
 +                break;
 +
 +            p++;
 +        }
 +
 +        if (hostinfo) {
 +            char *eoh;
 +            char hostbuf[260];
 +
 +            while (isspace(*hostinfo))
 +                hostinfo++;
 +
 +            eoh = strchr(hostinfo, '\n');
 +            if (eoh) {
 +                if (eoh[-1] == '\r')
 +                    eoh--;
 +
 +                if (eoh - hostinfo < sizeof(hostbuf) - 1) {
 +                    memcpy(hostbuf, hostinfo, eoh - hostinfo);
 +                    hostbuf[eoh - hostinfo] = 0;
 +
 +                    c->http_error = 200;
 +                    q = c->buffer;
 +                    switch(redir_type) {
 +                    case REDIR_ASX:
 +                        q += snprintf(q, c->buffer_size,
 +                                      "HTTP/1.0 200 ASX Follows\r\n"
 +                                      "Content-type: video/x-ms-asf\r\n"
 +                                      "\r\n"
 +                                      "<ASX Version=\"3\">\r\n"
 +                                      //"<!-- Autogenerated by ffserver -->\r\n"
 +                                      "<ENTRY><REF HREF=\"http://%s/%s%s\"/></ENTRY>\r\n"
 +                                      "</ASX>\r\n", hostbuf, filename, info);
 +                        break;
 +                    case REDIR_RAM:
 +                        q += snprintf(q, c->buffer_size,
 +                                      "HTTP/1.0 200 RAM Follows\r\n"
 +                                      "Content-type: audio/x-pn-realaudio\r\n"
 +                                      "\r\n"
 +                                      "# Autogenerated by ffserver\r\n"
 +                                      "http://%s/%s%s\r\n", hostbuf, filename, info);
 +                        break;
 +                    case REDIR_ASF:
 +                        q += snprintf(q, c->buffer_size,
 +                                      "HTTP/1.0 200 ASF Redirect follows\r\n"
 +                                      "Content-type: video/x-ms-asf\r\n"
 +                                      "\r\n"
 +                                      "[Reference]\r\n"
 +                                      "Ref1=http://%s/%s%s\r\n", hostbuf, filename, info);
 +                        break;
 +                    case REDIR_RTSP:
 +                        {
 +                            char hostname[256], *p;
 +                            /* extract only hostname */
 +                            av_strlcpy(hostname, hostbuf, sizeof(hostname));
 +                            p = strrchr(hostname, ':');
 +                            if (p)
 +                                *p = '\0';
 +                            q += snprintf(q, c->buffer_size,
 +                                          "HTTP/1.0 200 RTSP Redirect follows\r\n"
 +                                          /* XXX: incorrect mime type ? */
 +                                          "Content-type: application/x-rtsp\r\n"
 +                                          "\r\n"
 +                                          "rtsp://%s:%d/%s\r\n", hostname, ntohs(my_rtsp_addr.sin_port), filename);
 +                        }
 +                        break;
 +                    case REDIR_SDP:
 +                        {
 +                            uint8_t *sdp_data;
 +                            int sdp_data_size, len;
 +                            struct sockaddr_in my_addr;
 +
 +                            q += snprintf(q, c->buffer_size,
 +                                          "HTTP/1.0 200 OK\r\n"
 +                                          "Content-type: application/sdp\r\n"
 +                                          "\r\n");
 +
 +                            len = sizeof(my_addr);
 +                            getsockname(c->fd, (struct sockaddr *)&my_addr, &len);
 +
 +                            /* XXX: should use a dynamic buffer */
 +                            sdp_data_size = prepare_sdp_description(stream,
 +                                                                    &sdp_data,
 +                                                                    my_addr.sin_addr);
 +                            if (sdp_data_size > 0) {
 +                                memcpy(q, sdp_data, sdp_data_size);
 +                                q += sdp_data_size;
 +                                *q = '\0';
 +                                av_free(sdp_data);
 +                            }
 +                        }
 +                        break;
 +                    default:
 +                        abort();
 +                        break;
 +                    }
 +
 +                    /* prepare output buffer */
 +                    c->buffer_ptr = c->buffer;
 +                    c->buffer_end = q;
 +                    c->state = HTTPSTATE_SEND_HEADER;
 +                    return 0;
 +                }
 +            }
 +        }
 +
 +        snprintf(msg, sizeof(msg), "ASX/RAM file not handled");
 +        goto send_error;
 +    }
 +
 +    stream->conns_served++;
 +
 +    /* XXX: add there authenticate and IP match */
 +
 +    if (c->post) {
 +        /* if post, it means a feed is being sent */
 +        if (!stream->is_feed) {
 +            /* However it might be a status report from WMP! Let us log the
 +             * data as it might come in handy one day. */
 +            char *logline = 0;
 +            int client_id = 0;
 +
 +            for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) {
 +                if (av_strncasecmp(p, "Pragma: log-line=", 17) == 0) {
 +                    logline = p;
 +                    break;
 +                }
 +                if (av_strncasecmp(p, "Pragma: client-id=", 18) == 0)
 +                    client_id = strtol(p + 18, 0, 10);
 +                p = strchr(p, '\n');
 +                if (!p)
 +                    break;
 +
 +                p++;
 +            }
 +
 +            if (logline) {
 +                char *eol = strchr(logline, '\n');
 +
 +                logline += 17;
 +
 +                if (eol) {
 +                    if (eol[-1] == '\r')
 +                        eol--;
 +                    http_log("%.*s\n", (int) (eol - logline), logline);
 +                    c->suppress_log = 1;
 +                }
 +            }
 +
 +#ifdef DEBUG
 +            http_log("\nGot request:\n%s\n", c->buffer);
 +#endif
 +
 +            if (client_id && extract_rates(ratebuf, sizeof(ratebuf), c->buffer)) {
 +                HTTPContext *wmpc;
 +
 +                /* Now we have to find the client_id */
 +                for (wmpc = first_http_ctx; wmpc; wmpc = wmpc->next) {
 +                    if (wmpc->wmp_client_id == client_id)
 +                        break;
 +                }
 +
 +                if (wmpc && modify_current_stream(wmpc, ratebuf))
 +                    wmpc->switch_pending = 1;
 +            }
 +
 +            snprintf(msg, sizeof(msg), "POST command not handled");
 +            c->stream = 0;
 +            goto send_error;
 +        }
 +        if (http_start_receive_data(c) < 0) {
 +            snprintf(msg, sizeof(msg), "could not open feed");
 +            goto send_error;
 +        }
 +        c->http_error = 0;
 +        c->state = HTTPSTATE_RECEIVE_DATA;
 +        return 0;
 +    }
 +
 +#ifdef DEBUG
 +    if (strcmp(stream->filename + strlen(stream->filename) - 4, ".asf") == 0)
 +        http_log("\nGot request:\n%s\n", c->buffer);
 +#endif
 +
 +    if (c->stream->stream_type == STREAM_TYPE_STATUS)
 +        goto send_status;
 +
 +    /* open input stream */
 +    if (open_input_stream(c, info) < 0) {
 +        snprintf(msg, sizeof(msg), "Input stream corresponding to '%s' not found", url);
 +        goto send_error;
 +    }
 +
 +    /* prepare http header */
 +    q = c->buffer;
 +    q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "HTTP/1.0 200 OK\r\n");
 +    mime_type = c->stream->fmt->mime_type;
 +    if (!mime_type)
 +        mime_type = "application/x-octet-stream";
 +    q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Pragma: no-cache\r\n");
 +
 +    /* for asf, we need extra headers */
 +    if (!strcmp(c->stream->fmt->name,"asf_stream")) {
 +        /* Need to allocate a client id */
 +
 +        c->wmp_client_id = av_lfg_get(&random_state);
 +
 +        q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Server: Cougar 4.1.0.3923\r\nCache-Control: no-cache\r\nPragma: client-id=%d\r\nPragma: features=\"broadcast\"\r\n", c->wmp_client_id);
 +    }
 +    q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-Type: %s\r\n", mime_type);
 +    q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n");
 +
 +    /* prepare output buffer */
 +    c->http_error = 0;
 +    c->buffer_ptr = c->buffer;
 +    c->buffer_end = q;
 +    c->state = HTTPSTATE_SEND_HEADER;
 +    return 0;
 + send_error:
 +    c->http_error = 404;
 +    q = c->buffer;
 +    q += snprintf(q, c->buffer_size,
 +                  "HTTP/1.0 404 Not Found\r\n"
 +                  "Content-type: text/html\r\n"
 +                  "\r\n"
 +                  "<html>\n"
 +                  "<head><title>404 Not Found</title></head>\n"
 +                  "<body>%s</body>\n"
 +                  "</html>\n", msg);
 +    /* prepare output buffer */
 +    c->buffer_ptr = c->buffer;
 +    c->buffer_end = q;
 +    c->state = HTTPSTATE_SEND_HEADER;
 +    return 0;
 + send_status:
 +    compute_status(c);
 +    c->http_error = 200; /* horrible : we use this value to avoid
 +                            going to the send data state */
 +    c->state = HTTPSTATE_SEND_HEADER;
 +    return 0;
 +}
 +
 +static void fmt_bytecount(AVIOContext *pb, int64_t count)
 +{
 +    static const char *suffix = " kMGTP";
 +    const char *s;
 +
 +    for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++);
 +
 +    avio_printf(pb, "%"PRId64"%c", count, *s);
 +}
 +
 +static void compute_status(HTTPContext *c)
 +{
 +    HTTPContext *c1;
 +    FFStream *stream;
 +    char *p;
 +    time_t ti;
 +    int i, len;
 +    AVIOContext *pb;
 +
 +    if (avio_open_dyn_buf(&pb) < 0) {
 +        /* XXX: return an error ? */
 +        c->buffer_ptr = c->buffer;
 +        c->buffer_end = c->buffer;
 +        return;
 +    }
 +
 +    avio_printf(pb, "HTTP/1.0 200 OK\r\n");
 +    avio_printf(pb, "Content-type: %s\r\n", "text/html");
 +    avio_printf(pb, "Pragma: no-cache\r\n");
 +    avio_printf(pb, "\r\n");
 +
 +    avio_printf(pb, "<html><head><title>%s Status</title>\n", program_name);
 +    if (c->stream->feed_filename[0])
 +        avio_printf(pb, "<link rel=\"shortcut icon\" href=\"%s\">\n", c->stream->feed_filename);
 +    avio_printf(pb, "</head>\n<body>");
 +    avio_printf(pb, "<h1>%s Status</h1>\n", program_name);
 +    /* format status */
 +    avio_printf(pb, "<h2>Available Streams</h2>\n");
 +    avio_printf(pb, "<table cellspacing=0 cellpadding=4>\n");
 +    avio_printf(pb, "<tr><th valign=top>Path<th align=left>Served<br>Conns<th><br>bytes<th valign=top>Format<th>Bit rate<br>kbits/s<th align=left>Video<br>kbits/s<th><br>Codec<th align=left>Audio<br>kbits/s<th><br>Codec<th align=left valign=top>Feed\n");
 +    stream = first_stream;
 +    while (stream != NULL) {
 +        char sfilename[1024];
 +        char *eosf;
 +
 +        if (stream->feed != stream) {
 +            av_strlcpy(sfilename, stream->filename, sizeof(sfilename) - 10);
 +            eosf = sfilename + strlen(sfilename);
 +            if (eosf - sfilename >= 4) {
 +                if (strcmp(eosf - 4, ".asf") == 0)
 +                    strcpy(eosf - 4, ".asx");
 +                else if (strcmp(eosf - 3, ".rm") == 0)
 +                    strcpy(eosf - 3, ".ram");
 +                else if (stream->fmt && !strcmp(stream->fmt->name, "rtp")) {
 +                    /* generate a sample RTSP director if
 +                       unicast. Generate an SDP redirector if
 +                       multicast */
 +                    eosf = strrchr(sfilename, '.');
 +                    if (!eosf)
 +                        eosf = sfilename + strlen(sfilename);
 +                    if (stream->is_multicast)
 +                        strcpy(eosf, ".sdp");
 +                    else
 +                        strcpy(eosf, ".rtsp");
 +                }
 +            }
 +
 +            avio_printf(pb, "<tr><td><a href=\"/%s\">%s</a> ",
 +                         sfilename, stream->filename);
 +            avio_printf(pb, "<td align=right> %d <td align=right> ",
 +                        stream->conns_served);
 +            fmt_bytecount(pb, stream->bytes_served);
 +            switch(stream->stream_type) {
 +            case STREAM_TYPE_LIVE: {
 +                    int audio_bit_rate = 0;
 +                    int video_bit_rate = 0;
 +                    const char *audio_codec_name = "";
 +                    const char *video_codec_name = "";
 +                    const char *audio_codec_name_extra = "";
 +                    const char *video_codec_name_extra = "";
 +
 +                    for(i=0;i<stream->nb_streams;i++) {
 +                        AVStream *st = stream->streams[i];
 +                        AVCodec *codec = avcodec_find_encoder(st->codec->codec_id);
 +                        switch(st->codec->codec_type) {
 +                        case AVMEDIA_TYPE_AUDIO:
 +                            audio_bit_rate += st->codec->bit_rate;
 +                            if (codec) {
 +                                if (*audio_codec_name)
 +                                    audio_codec_name_extra = "...";
 +                                audio_codec_name = codec->name;
 +                            }
 +                            break;
 +                        case AVMEDIA_TYPE_VIDEO:
 +                            video_bit_rate += st->codec->bit_rate;
 +                            if (codec) {
 +                                if (*video_codec_name)
 +                                    video_codec_name_extra = "...";
 +                                video_codec_name = codec->name;
 +                            }
 +                            break;
 +                        case AVMEDIA_TYPE_DATA:
 +                            video_bit_rate += st->codec->bit_rate;
 +                            break;
 +                        default:
 +                            abort();
 +                        }
 +                    }
 +                    avio_printf(pb, "<td align=center> %s <td align=right> %d <td align=right> %d <td> %s %s <td align=right> %d <td> %s %s",
 +                                 stream->fmt->name,
 +                                 stream->bandwidth,
 +                                 video_bit_rate / 1000, video_codec_name, video_codec_name_extra,
 +                                 audio_bit_rate / 1000, audio_codec_name, audio_codec_name_extra);
 +                    if (stream->feed)
 +                        avio_printf(pb, "<td>%s", stream->feed->filename);
 +                    else
 +                        avio_printf(pb, "<td>%s", stream->feed_filename);
 +                    avio_printf(pb, "\n");
 +                }
 +                break;
 +            default:
 +                avio_printf(pb, "<td align=center> - <td align=right> - <td align=right> - <td><td align=right> - <td>\n");
 +                break;
 +            }
 +        }
 +        stream = stream->next;
 +    }
 +    avio_printf(pb, "</table>\n");
 +
 +    stream = first_stream;
 +    while (stream != NULL) {
 +        if (stream->feed == stream) {
 +            avio_printf(pb, "<h2>Feed %s</h2>", stream->filename);
 +            if (stream->pid) {
 +                avio_printf(pb, "Running as pid %d.\n", stream->pid);
 +
 +#if defined(linux) && !defined(CONFIG_NOCUTILS)
 +                {
 +                    FILE *pid_stat;
 +                    char ps_cmd[64];
 +
 +                    /* This is somewhat linux specific I guess */
 +                    snprintf(ps_cmd, sizeof(ps_cmd),
 +                             "ps -o \"%%cpu,cputime\" --no-headers %d",
 +                             stream->pid);
 +
 +                    pid_stat = popen(ps_cmd, "r");
 +                    if (pid_stat) {
 +                        char cpuperc[10];
 +                        char cpuused[64];
 +
 +                        if (fscanf(pid_stat, "%10s %64s", cpuperc,
 +                                   cpuused) == 2) {
 +                            avio_printf(pb, "Currently using %s%% of the cpu. Total time used %s.\n",
 +                                         cpuperc, cpuused);
 +                        }
 +                        fclose(pid_stat);
 +                    }
 +                }
 +#endif
 +
 +                avio_printf(pb, "<p>");
 +            }
 +            avio_printf(pb, "<table cellspacing=0 cellpadding=4><tr><th>Stream<th>type<th>kbits/s<th align=left>codec<th align=left>Parameters\n");
 +
 +            for (i = 0; i < stream->nb_streams; i++) {
 +                AVStream *st = stream->streams[i];
 +                AVCodec *codec = avcodec_find_encoder(st->codec->codec_id);
 +                const char *type = "unknown";
 +                char parameters[64];
 +
 +                parameters[0] = 0;
 +
 +                switch(st->codec->codec_type) {
 +                case AVMEDIA_TYPE_AUDIO:
 +                    type = "audio";
 +                    snprintf(parameters, sizeof(parameters), "%d channel(s), %d Hz", st->codec->channels, st->codec->sample_rate);
 +                    break;
 +                case AVMEDIA_TYPE_VIDEO:
 +                    type = "video";
 +                    snprintf(parameters, sizeof(parameters), "%dx%d, q=%d-%d, fps=%d", st->codec->width, st->codec->height,
 +                                st->codec->qmin, st->codec->qmax, st->codec->time_base.den / st->codec->time_base.num);
 +                    break;
 +                default:
 +                    abort();
 +                }
 +                avio_printf(pb, "<tr><td align=right>%d<td>%s<td align=right>%d<td>%s<td>%s\n",
 +                        i, type, st->codec->bit_rate/1000, codec ? codec->name : "", parameters);
 +            }
 +            avio_printf(pb, "</table>\n");
 +
 +        }
 +        stream = stream->next;
 +    }
 +
 +    /* connection status */
 +    avio_printf(pb, "<h2>Connection Status</h2>\n");
 +
 +    avio_printf(pb, "Number of connections: %d / %d<br>\n",
 +                 nb_connections, nb_max_connections);
 +
 +    avio_printf(pb, "Bandwidth in use: %"PRIu64"k / %"PRIu64"k<br>\n",
 +                 current_bandwidth, max_bandwidth);
 +
 +    avio_printf(pb, "<table>\n");
 +    avio_printf(pb, "<tr><th>#<th>File<th>IP<th>Proto<th>State<th>Target bits/sec<th>Actual bits/sec<th>Bytes transferred\n");
 +    c1 = first_http_ctx;
 +    i = 0;
 +    while (c1 != NULL) {
 +        int bitrate;
 +        int j;
 +
 +        bitrate = 0;
 +        if (c1->stream) {
 +            for (j = 0; j < c1->stream->nb_streams; j++) {
 +                if (!c1->stream->feed)
 +                    bitrate += c1->stream->streams[j]->codec->bit_rate;
 +                else if (c1->feed_streams[j] >= 0)
 +                    bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec->bit_rate;
 +            }
 +        }
 +
 +        i++;
 +        p = inet_ntoa(c1->from_addr.sin_addr);
 +        avio_printf(pb, "<tr><td><b>%d</b><td>%s%s<td>%s<td>%s<td>%s<td align=right>",
 +                    i,
 +                    c1->stream ? c1->stream->filename : "",
 +                    c1->state == HTTPSTATE_RECEIVE_DATA ? "(input)" : "",
 +                    p,
 +                    c1->protocol,
 +                    http_state[c1->state]);
 +        fmt_bytecount(pb, bitrate);
 +        avio_printf(pb, "<td align=right>");
 +        fmt_bytecount(pb, compute_datarate(&c1->datarate, c1->data_count) * 8);
 +        avio_printf(pb, "<td align=right>");
 +        fmt_bytecount(pb, c1->data_count);
 +        avio_printf(pb, "\n");
 +        c1 = c1->next;
 +    }
 +    avio_printf(pb, "</table>\n");
 +
 +    /* date */
 +    ti = time(NULL);
 +    p = ctime(&ti);
 +    avio_printf(pb, "<hr size=1 noshade>Generated at %s", p);
 +    avio_printf(pb, "</body>\n</html>\n");
 +
 +    len = avio_close_dyn_buf(pb, &c->pb_buffer);
 +    c->buffer_ptr = c->pb_buffer;
 +    c->buffer_end = c->pb_buffer + len;
 +}
 +
 +static int open_input_stream(HTTPContext *c, const char *info)
 +{
 +    char buf[128];
 +    char input_filename[1024];
 +    AVFormatContext *s = NULL;
 +    int i, ret;
 +    int64_t stream_pos;
 +
 +    /* find file name */
 +    if (c->stream->feed) {
 +        strcpy(input_filename, c->stream->feed->feed_filename);
 +        /* compute position (absolute time) */
 +        if (av_find_info_tag(buf, sizeof(buf), "date", info)) {
 +            if ((ret = av_parse_time(&stream_pos, buf, 0)) < 0)
 +                return ret;
 +        } else if (av_find_info_tag(buf, sizeof(buf), "buffer", info)) {
 +            int prebuffer = strtol(buf, 0, 10);
 +            stream_pos = av_gettime() - prebuffer * (int64_t)1000000;
 +        } else
 +            stream_pos = av_gettime() - c->stream->prebuffer * (int64_t)1000;
 +    } else {
 +        strcpy(input_filename, c->stream->feed_filename);
 +        /* compute position (relative time) */
 +        if (av_find_info_tag(buf, sizeof(buf), "date", info)) {
 +            if ((ret = av_parse_time(&stream_pos, buf, 1)) < 0)
 +                return ret;
 +        } else
 +            stream_pos = 0;
 +    }
 +    if (input_filename[0] == '\0')
 +        return -1;
 +
 +    /* open stream */
 +    if ((ret = avformat_open_input(&s, input_filename, c->stream->ifmt, &c->stream->in_opts)) < 0) {
 +        http_log("could not open %s: %d\n", input_filename, ret);
 +        return -1;
 +    }
 +    s->flags |= AVFMT_FLAG_GENPTS;
 +    c->fmt_in = s;
 +    if (strcmp(s->iformat->name, "ffm") && avformat_find_stream_info(c->fmt_in, NULL) < 0) {
 +        http_log("Could not find stream info '%s'\n", input_filename);
 +        avformat_close_input(&s);
 +        return -1;
 +    }
 +
 +    /* choose stream as clock source (we favorize video stream if
 +       present) for packet sending */
 +    c->pts_stream_index = 0;
 +    for(i=0;i<c->stream->nb_streams;i++) {
 +        if (c->pts_stream_index == 0 &&
 +            c->stream->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 +            c->pts_stream_index = i;
 +        }
 +    }
 +
 +    if (c->fmt_in->iformat->read_seek)
 +        av_seek_frame(c->fmt_in, -1, stream_pos, 0);
 +    /* set the start time (needed for maxtime and RTP packet timing) */
 +    c->start_time = cur_time;
 +    c->first_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +/* return the server clock (in us) */
 +static int64_t get_server_clock(HTTPContext *c)
 +{
 +    /* compute current pts value from system time */
 +    return (cur_time - c->start_time) * 1000;
 +}
 +
 +/* return the estimated time at which the current packet must be sent
 +   (in us) */
 +static int64_t get_packet_send_clock(HTTPContext *c)
 +{
 +    int bytes_left, bytes_sent, frame_bytes;
 +
 +    frame_bytes = c->cur_frame_bytes;
 +    if (frame_bytes <= 0)
 +        return c->cur_pts;
 +    else {
 +        bytes_left = c->buffer_end - c->buffer_ptr;
 +        bytes_sent = frame_bytes - bytes_left;
 +        return c->cur_pts + (c->cur_frame_duration * bytes_sent) / frame_bytes;
 +    }
 +}
 +
 +
 +static int http_prepare_data(HTTPContext *c)
 +{
 +    int i, len, ret;
 +    AVFormatContext *ctx;
 +
 +    av_freep(&c->pb_buffer);
 +    switch(c->state) {
 +    case HTTPSTATE_SEND_DATA_HEADER:
 +        memset(&c->fmt_ctx, 0, sizeof(c->fmt_ctx));
 +        av_dict_set(&c->fmt_ctx.metadata, "author"   , c->stream->author   , 0);
 +        av_dict_set(&c->fmt_ctx.metadata, "comment"  , c->stream->comment  , 0);
 +        av_dict_set(&c->fmt_ctx.metadata, "copyright", c->stream->copyright, 0);
 +        av_dict_set(&c->fmt_ctx.metadata, "title"    , c->stream->title    , 0);
 +
 +        c->fmt_ctx.streams = av_mallocz(sizeof(AVStream *) * c->stream->nb_streams);
 +
 +        for(i=0;i<c->stream->nb_streams;i++) {
 +            AVStream *src;
 +            c->fmt_ctx.streams[i] = av_mallocz(sizeof(AVStream));
 +            /* if file or feed, then just take streams from FFStream struct */
 +            if (!c->stream->feed ||
 +                c->stream->feed == c->stream)
 +                src = c->stream->streams[i];
 +            else
 +                src = c->stream->feed->streams[c->stream->feed_streams[i]];
 +
 +            *(c->fmt_ctx.streams[i]) = *src;
 +            c->fmt_ctx.streams[i]->priv_data = 0;
 +            c->fmt_ctx.streams[i]->codec->frame_number = 0; /* XXX: should be done in
 +                                           AVStream, not in codec */
 +        }
 +        /* set output format parameters */
 +        c->fmt_ctx.oformat = c->stream->fmt;
 +        c->fmt_ctx.nb_streams = c->stream->nb_streams;
 +
 +        c->got_key_frame = 0;
 +
 +        /* prepare header and save header data in a stream */
 +        if (avio_open_dyn_buf(&c->fmt_ctx.pb) < 0) {
 +            /* XXX: potential leak */
 +            return -1;
 +        }
 +        c->fmt_ctx.pb->seekable = 0;
 +
 +        /*
 +         * HACK to avoid mpeg ps muxer to spit many underflow errors
 +         * Default value from FFmpeg
 +         * Try to set it use configuration option
 +         */
++        c->fmt_ctx.preload   = (int)(0.5*AV_TIME_BASE);
 +        c->fmt_ctx.max_delay = (int)(0.7*AV_TIME_BASE);
 +
 +        if (avformat_write_header(&c->fmt_ctx, NULL) < 0) {
 +            http_log("Error writing output header\n");
 +            return -1;
 +        }
 +        av_dict_free(&c->fmt_ctx.metadata);
 +
 +        len = avio_close_dyn_buf(c->fmt_ctx.pb, &c->pb_buffer);
 +        c->buffer_ptr = c->pb_buffer;
 +        c->buffer_end = c->pb_buffer + len;
 +
 +        c->state = HTTPSTATE_SEND_DATA;
 +        c->last_packet_sent = 0;
 +        break;
 +    case HTTPSTATE_SEND_DATA:
 +        /* find a new packet */
 +        /* read a packet from the input stream */
 +        if (c->stream->feed)
 +            ffm_set_write_index(c->fmt_in,
 +                                c->stream->feed->feed_write_index,
 +                                c->stream->feed->feed_size);
 +
 +        if (c->stream->max_time &&
 +            c->stream->max_time + c->start_time - cur_time < 0)
 +            /* We have timed out */
 +            c->state = HTTPSTATE_SEND_DATA_TRAILER;
 +        else {
 +            AVPacket pkt;
 +        redo:
 +            ret = av_read_frame(c->fmt_in, &pkt);
 +            if (ret < 0) {
 +                if (c->stream->feed) {
 +                    /* if coming from feed, it means we reached the end of the
 +                       ffm file, so must wait for more data */
 +                    c->state = HTTPSTATE_WAIT_FEED;
 +                    return 1; /* state changed */
 +                } else if (ret == AVERROR(EAGAIN)) {
 +                    /* input not ready, come back later */
 +                    return 0;
 +                } else {
 +                    if (c->stream->loop) {
 +                        avformat_close_input(&c->fmt_in);
 +                        if (open_input_stream(c, "") < 0)
 +                            goto no_loop;
 +                        goto redo;
 +                    } else {
 +                    no_loop:
 +                        /* must send trailer now because eof or error */
 +                        c->state = HTTPSTATE_SEND_DATA_TRAILER;
 +                    }
 +                }
 +            } else {
 +                int source_index = pkt.stream_index;
 +                /* update first pts if needed */
 +                if (c->first_pts == AV_NOPTS_VALUE) {
 +                    c->first_pts = av_rescale_q(pkt.dts, c->fmt_in->streams[pkt.stream_index]->time_base, AV_TIME_BASE_Q);
 +                    c->start_time = cur_time;
 +                }
 +                /* send it to the appropriate stream */
 +                if (c->stream->feed) {
 +                    /* if coming from a feed, select the right stream */
 +                    if (c->switch_pending) {
 +                        c->switch_pending = 0;
 +                        for(i=0;i<c->stream->nb_streams;i++) {
 +                            if (c->switch_feed_streams[i] == pkt.stream_index)
 +                                if (pkt.flags & AV_PKT_FLAG_KEY)
 +                                    c->switch_feed_streams[i] = -1;
 +                            if (c->switch_feed_streams[i] >= 0)
 +                                c->switch_pending = 1;
 +                        }
 +                    }
 +                    for(i=0;i<c->stream->nb_streams;i++) {
 +                        if (c->stream->feed_streams[i] == pkt.stream_index) {
 +                            AVStream *st = c->fmt_in->streams[source_index];
 +                            pkt.stream_index = i;
 +                            if (pkt.flags & AV_PKT_FLAG_KEY &&
 +                                (st->codec->codec_type == AVMEDIA_TYPE_VIDEO ||
 +                                 c->stream->nb_streams == 1))
 +                                c->got_key_frame = 1;
 +                            if (!c->stream->send_on_key || c->got_key_frame)
 +                                goto send_it;
 +                        }
 +                    }
 +                } else {
 +                    AVCodecContext *codec;
 +                    AVStream *ist, *ost;
 +                send_it:
 +                    ist = c->fmt_in->streams[source_index];
 +                    /* specific handling for RTP: we use several
 +                       output stream (one for each RTP
 +                       connection). XXX: need more abstract handling */
 +                    if (c->is_packetized) {
 +                        /* compute send time and duration */
 +                        c->cur_pts = av_rescale_q(pkt.dts, ist->time_base, AV_TIME_BASE_Q);
 +                        c->cur_pts -= c->first_pts;
 +                        c->cur_frame_duration = av_rescale_q(pkt.duration, ist->time_base, AV_TIME_BASE_Q);
 +                        /* find RTP context */
 +                        c->packet_stream_index = pkt.stream_index;
 +                        ctx = c->rtp_ctx[c->packet_stream_index];
 +                        if(!ctx) {
 +                            av_free_packet(&pkt);
 +                            break;
 +                        }
 +                        codec = ctx->streams[0]->codec;
 +                        /* only one stream per RTP connection */
 +                        pkt.stream_index = 0;
 +                    } else {
 +                        ctx = &c->fmt_ctx;
 +                        /* Fudge here */
 +                        codec = ctx->streams[pkt.stream_index]->codec;
 +                    }
 +
 +                    if (c->is_packetized) {
 +                        int max_packet_size;
 +                        if (c->rtp_protocol == RTSP_LOWER_TRANSPORT_TCP)
 +                            max_packet_size = RTSP_TCP_MAX_PACKET_SIZE;
 +                        else
-                     ffurl_write(c->rtp_handles[c->packet_stream_index],
-                                 c->buffer_ptr, len);
++                            max_packet_size = url_get_max_packet_size(c->rtp_handles[c->packet_stream_index]);
 +                        ret = ffio_open_dyn_packet_buf(&ctx->pb, max_packet_size);
 +                    } else {
 +                        ret = avio_open_dyn_buf(&ctx->pb);
 +                    }
 +                    if (ret < 0) {
 +                        /* XXX: potential leak */
 +                        return -1;
 +                    }
 +                    ost = ctx->streams[pkt.stream_index];
 +
 +                    ctx->pb->seekable = 0;
 +                    if (pkt.dts != AV_NOPTS_VALUE)
 +                        pkt.dts = av_rescale_q(pkt.dts, ist->time_base, ost->time_base);
 +                    if (pkt.pts != AV_NOPTS_VALUE)
 +                        pkt.pts = av_rescale_q(pkt.pts, ist->time_base, ost->time_base);
 +                    pkt.duration = av_rescale_q(pkt.duration, ist->time_base, ost->time_base);
 +                    if (av_write_frame(ctx, &pkt) < 0) {
 +                        http_log("Error writing frame to output\n");
 +                        c->state = HTTPSTATE_SEND_DATA_TRAILER;
 +                    }
 +
 +                    len = avio_close_dyn_buf(ctx->pb, &c->pb_buffer);
 +                    c->cur_frame_bytes = len;
 +                    c->buffer_ptr = c->pb_buffer;
 +                    c->buffer_end = c->pb_buffer + len;
 +
 +                    codec->frame_number++;
 +                    if (len == 0) {
 +                        av_free_packet(&pkt);
 +                        goto redo;
 +                    }
 +                }
 +                av_free_packet(&pkt);
 +            }
 +        }
 +        break;
 +    default:
 +    case HTTPSTATE_SEND_DATA_TRAILER:
 +        /* last packet test ? */
 +        if (c->last_packet_sent || c->is_packetized)
 +            return -1;
 +        ctx = &c->fmt_ctx;
 +        /* prepare header */
 +        if (avio_open_dyn_buf(&ctx->pb) < 0) {
 +            /* XXX: potential leak */
 +            return -1;
 +        }
 +        c->fmt_ctx.pb->seekable = 0;
 +        av_write_trailer(ctx);
 +        len = avio_close_dyn_buf(ctx->pb, &c->pb_buffer);
 +        c->buffer_ptr = c->pb_buffer;
 +        c->buffer_end = c->pb_buffer + len;
 +
 +        c->last_packet_sent = 1;
 +        break;
 +    }
 +    return 0;
 +}
 +
 +/* should convert the format at the same time */
 +/* send data starting at c->buffer_ptr to the output connection
 +   (either UDP or TCP connection) */
 +static int http_send_data(HTTPContext *c)
 +{
 +    int len, ret;
 +
 +    for(;;) {
 +        if (c->buffer_ptr >= c->buffer_end) {
 +            ret = http_prepare_data(c);
 +            if (ret < 0)
 +                return -1;
 +            else if (ret != 0)
 +                /* state change requested */
 +                break;
 +        } else {
 +            if (c->is_packetized) {
 +                /* RTP data output */
 +                len = c->buffer_end - c->buffer_ptr;
 +                if (len < 4) {
 +                    /* fail safe - should never happen */
 +                fail1:
 +                    c->buffer_ptr = c->buffer_end;
 +                    return 0;
 +                }
 +                len = (c->buffer_ptr[0] << 24) |
 +                    (c->buffer_ptr[1] << 16) |
 +                    (c->buffer_ptr[2] << 8) |
 +                    (c->buffer_ptr[3]);
 +                if (len > (c->buffer_end - c->buffer_ptr))
 +                    goto fail1;
 +                if ((get_packet_send_clock(c) - get_server_clock(c)) > 0) {
 +                    /* nothing to send yet: we can wait */
 +                    return 0;
 +                }
 +
 +                c->data_count += len;
 +                update_datarate(&c->datarate, c->data_count);
 +                if (c->stream)
 +                    c->stream->bytes_served += len;
 +
 +                if (c->rtp_protocol == RTSP_LOWER_TRANSPORT_TCP) {
 +                    /* RTP packets are sent inside the RTSP TCP connection */
 +                    AVIOContext *pb;
 +                    int interleaved_index, size;
 +                    uint8_t header[4];
 +                    HTTPContext *rtsp_c;
 +
 +                    rtsp_c = c->rtsp_c;
 +                    /* if no RTSP connection left, error */
 +                    if (!rtsp_c)
 +                        return -1;
 +                    /* if already sending something, then wait. */
 +                    if (rtsp_c->state != RTSPSTATE_WAIT_REQUEST)
 +                        break;
 +                    if (avio_open_dyn_buf(&pb) < 0)
 +                        goto fail1;
 +                    interleaved_index = c->packet_stream_index * 2;
 +                    /* RTCP packets are sent at odd indexes */
 +                    if (c->buffer_ptr[1] == 200)
 +                        interleaved_index++;
 +                    /* write RTSP TCP header */
 +                    header[0] = '$';
 +                    header[1] = interleaved_index;
 +                    header[2] = len >> 8;
 +                    header[3] = len;
 +                    avio_write(pb, header, 4);
 +                    /* write RTP packet data */
 +                    c->buffer_ptr += 4;
 +                    avio_write(pb, c->buffer_ptr, len);
 +                    size = avio_close_dyn_buf(pb, &c->packet_buffer);
 +                    /* prepare asynchronous TCP sending */
 +                    rtsp_c->packet_buffer_ptr = c->packet_buffer;
 +                    rtsp_c->packet_buffer_end = c->packet_buffer + size;
 +                    c->buffer_ptr += len;
 +
 +                    /* send everything we can NOW */
 +                    len = send(rtsp_c->fd, rtsp_c->packet_buffer_ptr,
 +                                rtsp_c->packet_buffer_end - rtsp_c->packet_buffer_ptr, 0);
 +                    if (len > 0)
 +                        rtsp_c->packet_buffer_ptr += len;
 +                    if (rtsp_c->packet_buffer_ptr < rtsp_c->packet_buffer_end) {
 +                        /* if we could not send all the data, we will
 +                           send it later, so a new state is needed to
 +                           "lock" the RTSP TCP connection */
 +                        rtsp_c->state = RTSPSTATE_SEND_PACKET;
 +                        break;
 +                    } else
 +                        /* all data has been sent */
 +                        av_freep(&c->packet_buffer);
 +                } else {
 +                    /* send RTP packet directly in UDP */
 +                    c->buffer_ptr += 4;
-         if (ffurl_open(&h, ctx->filename, AVIO_FLAG_WRITE, NULL, NULL) < 0)
++                    url_write(c->rtp_handles[c->packet_stream_index],
++                              c->buffer_ptr, len);
 +                    c->buffer_ptr += len;
 +                    /* here we continue as we can send several packets per 10 ms slot */
 +                }
 +            } else {
 +                /* TCP data output */
 +                len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0);
 +                if (len < 0) {
 +                    if (ff_neterrno() != AVERROR(EAGAIN) &&
 +                        ff_neterrno() != AVERROR(EINTR))
 +                        /* error : close connection */
 +                        return -1;
 +                    else
 +                        return 0;
 +                } else
 +                    c->buffer_ptr += len;
 +
 +                c->data_count += len;
 +                update_datarate(&c->datarate, c->data_count);
 +                if (c->stream)
 +                    c->stream->bytes_served += len;
 +                break;
 +            }
 +        }
 +    } /* for(;;) */
 +    return 0;
 +}
 +
 +static int http_start_receive_data(HTTPContext *c)
 +{
 +    int fd;
 +
 +    if (c->stream->feed_opened)
 +        return -1;
 +
 +    /* Don't permit writing to this one */
 +    if (c->stream->readonly)
 +        return -1;
 +
 +    /* open feed */
 +    fd = open(c->stream->feed_filename, O_RDWR);
 +    if (fd < 0) {
 +        http_log("Error opening feeder file: %s\n", strerror(errno));
 +        return -1;
 +    }
 +    c->feed_fd = fd;
 +
 +    if (c->stream->truncate) {
 +        /* truncate feed file */
 +        ffm_write_write_index(c->feed_fd, FFM_PACKET_SIZE);
 +        ftruncate(c->feed_fd, FFM_PACKET_SIZE);
 +        http_log("Truncating feed file '%s'\n", c->stream->feed_filename);
 +    } else {
 +        if ((c->stream->feed_write_index = ffm_read_write_index(fd)) < 0) {
 +            http_log("Error reading write index from feed file: %s\n", strerror(errno));
 +            return -1;
 +        }
 +    }
 +
 +    c->stream->feed_write_index = FFMAX(ffm_read_write_index(fd), FFM_PACKET_SIZE);
 +    c->stream->feed_size = lseek(fd, 0, SEEK_END);
 +    lseek(fd, 0, SEEK_SET);
 +
 +    /* init buffer input */
 +    c->buffer_ptr = c->buffer;
 +    c->buffer_end = c->buffer + FFM_PACKET_SIZE;
 +    c->stream->feed_opened = 1;
 +    c->chunked_encoding = !!av_stristr(c->buffer, "Transfer-Encoding: chunked");
 +    return 0;
 +}
 +
 +static int http_receive_data(HTTPContext *c)
 +{
 +    HTTPContext *c1;
 +    int len, loop_run = 0;
 +
 +    while (c->chunked_encoding && !c->chunk_size &&
 +           c->buffer_end > c->buffer_ptr) {
 +        /* read chunk header, if present */
 +        len = recv(c->fd, c->buffer_ptr, 1, 0);
 +
 +        if (len < 0) {
 +            if (ff_neterrno() != AVERROR(EAGAIN) &&
 +                ff_neterrno() != AVERROR(EINTR))
 +                /* error : close connection */
 +                goto fail;
 +            return 0;
 +        } else if (len == 0) {
 +            /* end of connection : close it */
 +            goto fail;
 +        } else if (c->buffer_ptr - c->buffer >= 2 &&
 +                   !memcmp(c->buffer_ptr - 1, "\r\n", 2)) {
 +            c->chunk_size = strtol(c->buffer, 0, 16);
 +            if (c->chunk_size == 0) // end of stream
 +                goto fail;
 +            c->buffer_ptr = c->buffer;
 +            break;
 +        } else if (++loop_run > 10) {
 +            /* no chunk header, abort */
 +            goto fail;
 +        } else {
 +            c->buffer_ptr++;
 +        }
 +    }
 +
 +    if (c->buffer_end > c->buffer_ptr) {
 +        len = recv(c->fd, c->buffer_ptr,
 +                   FFMIN(c->chunk_size, c->buffer_end - c->buffer_ptr), 0);
 +        if (len < 0) {
 +            if (ff_neterrno() != AVERROR(EAGAIN) &&
 +                ff_neterrno() != AVERROR(EINTR))
 +                /* error : close connection */
 +                goto fail;
 +        } else if (len == 0)
 +            /* end of connection : close it */
 +            goto fail;
 +        else {
 +            c->chunk_size -= len;
 +            c->buffer_ptr += len;
 +            c->data_count += len;
 +            update_datarate(&c->datarate, c->data_count);
 +        }
 +    }
 +
 +    if (c->buffer_ptr - c->buffer >= 2 && c->data_count > FFM_PACKET_SIZE) {
 +        if (c->buffer[0] != 'f' ||
 +            c->buffer[1] != 'm') {
 +            http_log("Feed stream has become desynchronized -- disconnecting\n");
 +            goto fail;
 +        }
 +    }
 +
 +    if (c->buffer_ptr >= c->buffer_end) {
 +        FFStream *feed = c->stream;
 +        /* a packet has been received : write it in the store, except
 +           if header */
 +        if (c->data_count > FFM_PACKET_SIZE) {
 +
 +            //            printf("writing pos=0x%"PRIx64" size=0x%"PRIx64"\n", feed->feed_write_index, feed->feed_size);
 +            /* XXX: use llseek or url_seek */
 +            lseek(c->feed_fd, feed->feed_write_index, SEEK_SET);
 +            if (write(c->feed_fd, c->buffer, FFM_PACKET_SIZE) < 0) {
 +                http_log("Error writing to feed file: %s\n", strerror(errno));
 +                goto fail;
 +            }
 +
 +            feed->feed_write_index += FFM_PACKET_SIZE;
 +            /* update file size */
 +            if (feed->feed_write_index > c->stream->feed_size)
 +                feed->feed_size = feed->feed_write_index;
 +
 +            /* handle wrap around if max file size reached */
 +            if (c->stream->feed_max_size && feed->feed_write_index >= c->stream->feed_max_size)
 +                feed->feed_write_index = FFM_PACKET_SIZE;
 +
 +            /* write index */
 +            if (ffm_write_write_index(c->feed_fd, feed->feed_write_index) < 0) {
 +                http_log("Error writing index to feed file: %s\n", strerror(errno));
 +                goto fail;
 +            }
 +
 +            /* wake up any waiting connections */
 +            for(c1 = first_http_ctx; c1 != NULL; c1 = c1->next) {
 +                if (c1->state == HTTPSTATE_WAIT_FEED &&
 +                    c1->stream->feed == c->stream->feed)
 +                    c1->state = HTTPSTATE_SEND_DATA;
 +            }
 +        } else {
 +            /* We have a header in our hands that contains useful data */
 +            AVFormatContext *s = avformat_alloc_context();
 +            AVIOContext *pb;
 +            AVInputFormat *fmt_in;
 +            int i;
 +
 +            if (!s)
 +                goto fail;
 +
 +            /* use feed output format name to find corresponding input format */
 +            fmt_in = av_find_input_format(feed->fmt->name);
 +            if (!fmt_in)
 +                goto fail;
 +
 +            pb = avio_alloc_context(c->buffer, c->buffer_end - c->buffer,
 +                                    0, NULL, NULL, NULL, NULL);
 +            pb->seekable = 0;
 +
 +            s->pb = pb;
 +            if (avformat_open_input(&s, c->stream->feed_filename, fmt_in, NULL) < 0) {
 +                av_free(pb);
 +                goto fail;
 +            }
 +
 +            /* Now we have the actual streams */
 +            if (s->nb_streams != feed->nb_streams) {
 +                avformat_close_input(&s);
 +                av_free(pb);
 +                http_log("Feed '%s' stream number does not match registered feed\n",
 +                         c->stream->feed_filename);
 +                goto fail;
 +            }
 +
 +            for (i = 0; i < s->nb_streams; i++) {
 +                AVStream *fst = feed->streams[i];
 +                AVStream *st = s->streams[i];
 +                avcodec_copy_context(fst->codec, st->codec);
 +            }
 +
 +            avformat_close_input(&s);
 +            av_free(pb);
 +        }
 +        c->buffer_ptr = c->buffer;
 +    }
 +
 +    return 0;
 + fail:
 +    c->stream->feed_opened = 0;
 +    close(c->feed_fd);
 +    /* wake up any waiting connections to stop waiting for feed */
 +    for(c1 = first_http_ctx; c1 != NULL; c1 = c1->next) {
 +        if (c1->state == HTTPSTATE_WAIT_FEED &&
 +            c1->stream->feed == c->stream->feed)
 +            c1->state = HTTPSTATE_SEND_DATA_TRAILER;
 +    }
 +    return -1;
 +}
 +
 +/********************************************************************/
 +/* RTSP handling */
 +
 +static void rtsp_reply_header(HTTPContext *c, enum RTSPStatusCode error_number)
 +{
 +    const char *str;
 +    time_t ti;
 +    struct tm *tm;
 +    char buf2[32];
 +
 +    switch(error_number) {
 +    case RTSP_STATUS_OK:
 +        str = "OK";
 +        break;
 +    case RTSP_STATUS_METHOD:
 +        str = "Method Not Allowed";
 +        break;
 +    case RTSP_STATUS_BANDWIDTH:
 +        str = "Not Enough Bandwidth";
 +        break;
 +    case RTSP_STATUS_SESSION:
 +        str = "Session Not Found";
 +        break;
 +    case RTSP_STATUS_STATE:
 +        str = "Method Not Valid in This State";
 +        break;
 +    case RTSP_STATUS_AGGREGATE:
 +        str = "Aggregate operation not allowed";
 +        break;
 +    case RTSP_STATUS_ONLY_AGGREGATE:
 +        str = "Only aggregate operation allowed";
 +        break;
 +    case RTSP_STATUS_TRANSPORT:
 +        str = "Unsupported transport";
 +        break;
 +    case RTSP_STATUS_INTERNAL:
 +        str = "Internal Server Error";
 +        break;
 +    case RTSP_STATUS_SERVICE:
 +        str = "Service Unavailable";
 +        break;
 +    case RTSP_STATUS_VERSION:
 +        str = "RTSP Version not supported";
 +        break;
 +    default:
 +        str = "Unknown Error";
 +        break;
 +    }
 +
 +    avio_printf(c->pb, "RTSP/1.0 %d %s\r\n", error_number, str);
 +    avio_printf(c->pb, "CSeq: %d\r\n", c->seq);
 +
 +    /* output GMT time */
 +    ti = time(NULL);
 +    tm = gmtime(&ti);
 +    strftime(buf2, sizeof(buf2), "%a, %d %b %Y %H:%M:%S", tm);
 +    avio_printf(c->pb, "Date: %s GMT\r\n", buf2);
 +}
 +
 +static void rtsp_reply_error(HTTPContext *c, enum RTSPStatusCode error_number)
 +{
 +    rtsp_reply_header(c, error_number);
 +    avio_printf(c->pb, "\r\n");
 +}
 +
 +static int rtsp_parse_request(HTTPContext *c)
 +{
 +    const char *p, *p1, *p2;
 +    char cmd[32];
 +    char url[1024];
 +    char protocol[32];
 +    char line[1024];
 +    int len;
 +    RTSPMessageHeader header1, *header = &header1;
 +
 +    c->buffer_ptr[0] = '\0';
 +    p = c->buffer;
 +
 +    get_word(cmd, sizeof(cmd), &p);
 +    get_word(url, sizeof(url), &p);
 +    get_word(protocol, sizeof(protocol), &p);
 +
 +    av_strlcpy(c->method, cmd, sizeof(c->method));
 +    av_strlcpy(c->url, url, sizeof(c->url));
 +    av_strlcpy(c->protocol, protocol, sizeof(c->protocol));
 +
 +    if (avio_open_dyn_buf(&c->pb) < 0) {
 +        /* XXX: cannot do more */
 +        c->pb = NULL; /* safety */
 +        return -1;
 +    }
 +
 +    /* check version name */
 +    if (strcmp(protocol, "RTSP/1.0") != 0) {
 +        rtsp_reply_error(c, RTSP_STATUS_VERSION);
 +        goto the_end;
 +    }
 +
 +    /* parse each header line */
 +    memset(header, 0, sizeof(*header));
 +    /* skip to next line */
 +    while (*p != '\n' && *p != '\0')
 +        p++;
 +    if (*p == '\n')
 +        p++;
 +    while (*p != '\0') {
 +        p1 = memchr(p, '\n', (char *)c->buffer_ptr - p);
 +        if (!p1)
 +            break;
 +        p2 = p1;
 +        if (p2 > p && p2[-1] == '\r')
 +            p2--;
 +        /* skip empty line */
 +        if (p2 == p)
 +            break;
 +        len = p2 - p;
 +        if (len > sizeof(line) - 1)
 +            len = sizeof(line) - 1;
 +        memcpy(line, p, len);
 +        line[len] = '\0';
 +        ff_rtsp_parse_line(header, line, NULL, NULL);
 +        p = p1 + 1;
 +    }
 +
 +    /* handle sequence number */
 +    c->seq = header->seq;
 +
 +    if (!strcmp(cmd, "DESCRIBE"))
 +        rtsp_cmd_describe(c, url);
 +    else if (!strcmp(cmd, "OPTIONS"))
 +        rtsp_cmd_options(c, url);
 +    else if (!strcmp(cmd, "SETUP"))
 +        rtsp_cmd_setup(c, url, header);
 +    else if (!strcmp(cmd, "PLAY"))
 +        rtsp_cmd_play(c, url, header);
 +    else if (!strcmp(cmd, "PAUSE"))
 +        rtsp_cmd_pause(c, url, header);
 +    else if (!strcmp(cmd, "TEARDOWN"))
 +        rtsp_cmd_teardown(c, url, header);
 +    else
 +        rtsp_reply_error(c, RTSP_STATUS_METHOD);
 +
 + the_end:
 +    len = avio_close_dyn_buf(c->pb, &c->pb_buffer);
 +    c->pb = NULL; /* safety */
 +    if (len < 0) {
 +        /* XXX: cannot do more */
 +        return -1;
 +    }
 +    c->buffer_ptr = c->pb_buffer;
 +    c->buffer_end = c->pb_buffer + len;
 +    c->state = RTSPSTATE_SEND_REPLY;
 +    return 0;
 +}
 +
 +static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
 +                                   struct in_addr my_ip)
 +{
 +    AVFormatContext *avc;
 +    AVStream *avs = NULL;
 +    int i;
 +
 +    avc =  avformat_alloc_context();
 +    if (avc == NULL) {
 +        return -1;
 +    }
 +    av_dict_set(&avc->metadata, "title",
 +               stream->title[0] ? stream->title : "No Title", 0);
 +    avc->nb_streams = stream->nb_streams;
 +    if (stream->is_multicast) {
 +        snprintf(avc->filename, 1024, "rtp://%s:%d?multicast=1?ttl=%d",
 +                 inet_ntoa(stream->multicast_ip),
 +                 stream->multicast_port, stream->multicast_ttl);
 +    } else {
 +        snprintf(avc->filename, 1024, "rtp://0.0.0.0");
 +    }
 +
 +    if (avc->nb_streams >= INT_MAX/sizeof(*avc->streams) ||
 +        !(avc->streams = av_malloc(avc->nb_streams * sizeof(*avc->streams))))
 +        goto sdp_done;
 +    if (avc->nb_streams >= INT_MAX/sizeof(*avs) ||
 +        !(avs = av_malloc(avc->nb_streams * sizeof(*avs))))
 +        goto sdp_done;
 +
 +    for(i = 0; i < stream->nb_streams; i++) {
 +        avc->streams[i] = &avs[i];
 +        avc->streams[i]->codec = stream->streams[i]->codec;
 +    }
 +    *pbuffer = av_mallocz(2048);
 +    av_sdp_create(&avc, 1, *pbuffer, 2048);
 +
 + sdp_done:
 +    av_free(avc->streams);
 +    av_dict_free(&avc->metadata);
 +    av_free(avc);
 +    av_free(avs);
 +
 +    return strlen(*pbuffer);
 +}
 +
 +static void rtsp_cmd_options(HTTPContext *c, const char *url)
 +{
 +//    rtsp_reply_header(c, RTSP_STATUS_OK);
 +    avio_printf(c->pb, "RTSP/1.0 %d %s\r\n", RTSP_STATUS_OK, "OK");
 +    avio_printf(c->pb, "CSeq: %d\r\n", c->seq);
 +    avio_printf(c->pb, "Public: %s\r\n", "OPTIONS, DESCRIBE, SETUP, TEARDOWN, PLAY, PAUSE");
 +    avio_printf(c->pb, "\r\n");
 +}
 +
 +static void rtsp_cmd_describe(HTTPContext *c, const char *url)
 +{
 +    FFStream *stream;
 +    char path1[1024];
 +    const char *path;
 +    uint8_t *content;
 +    int content_length, len;
 +    struct sockaddr_in my_addr;
 +
 +    /* find which url is asked */
 +    av_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url);
 +    path = path1;
 +    if (*path == '/')
 +        path++;
 +
 +    for(stream = first_stream; stream != NULL; stream = stream->next) {
 +        if (!stream->is_feed &&
 +            stream->fmt && !strcmp(stream->fmt->name, "rtp") &&
 +            !strcmp(path, stream->filename)) {
 +            goto found;
 +        }
 +    }
 +    /* no stream found */
 +    rtsp_reply_error(c, RTSP_STATUS_SERVICE); /* XXX: right error ? */
 +    return;
 +
 + found:
 +    /* prepare the media description in sdp format */
 +
 +    /* get the host IP */
 +    len = sizeof(my_addr);
 +    getsockname(c->fd, (struct sockaddr *)&my_addr, &len);
 +    content_length = prepare_sdp_description(stream, &content, my_addr.sin_addr);
 +    if (content_length < 0) {
 +        rtsp_reply_error(c, RTSP_STATUS_INTERNAL);
 +        return;
 +    }
 +    rtsp_reply_header(c, RTSP_STATUS_OK);
 +    avio_printf(c->pb, "Content-Base: %s/\r\n", url);
 +    avio_printf(c->pb, "Content-Type: application/sdp\r\n");
 +    avio_printf(c->pb, "Content-Length: %d\r\n", content_length);
 +    avio_printf(c->pb, "\r\n");
 +    avio_write(c->pb, content, content_length);
 +    av_free(content);
 +}
 +
 +static HTTPContext *find_rtp_session(const char *session_id)
 +{
 +    HTTPContext *c;
 +
 +    if (session_id[0] == '\0')
 +        return NULL;
 +
 +    for(c = first_http_ctx; c != NULL; c = c->next) {
 +        if (!strcmp(c->session_id, session_id))
 +            return c;
 +    }
 +    return NULL;
 +}
 +
 +static RTSPTransportField *find_transport(RTSPMessageHeader *h, enum RTSPLowerTransport lower_transport)
 +{
 +    RTSPTransportField *th;
 +    int i;
 +
 +    for(i=0;i<h->nb_transports;i++) {
 +        th = &h->transports[i];
 +        if (th->lower_transport == lower_transport)
 +            return th;
 +    }
 +    return NULL;
 +}
 +
 +static void rtsp_cmd_setup(HTTPContext *c, const char *url,
 +                           RTSPMessageHeader *h)
 +{
 +    FFStream *stream;
 +    int stream_index, rtp_port, rtcp_port;
 +    char buf[1024];
 +    char path1[1024];
 +    const char *path;
 +    HTTPContext *rtp_c;
 +    RTSPTransportField *th;
 +    struct sockaddr_in dest_addr;
 +    RTSPActionServerSetup setup;
 +
 +    /* find which url is asked */
 +    av_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url);
 +    path = path1;
 +    if (*path == '/')
 +        path++;
 +
 +    /* now check each stream */
 +    for(stream = first_stream; stream != NULL; stream = stream->next) {
 +        if (!stream->is_feed &&
 +            stream->fmt && !strcmp(stream->fmt->name, "rtp")) {
 +            /* accept aggregate filenames only if single stream */
 +            if (!strcmp(path, stream->filename)) {
 +                if (stream->nb_streams != 1) {
 +                    rtsp_reply_error(c, RTSP_STATUS_AGGREGATE);
 +                    return;
 +                }
 +                stream_index = 0;
 +                goto found;
 +            }
 +
 +            for(stream_index = 0; stream_index < stream->nb_streams;
 +                stream_index++) {
 +                snprintf(buf, sizeof(buf), "%s/streamid=%d",
 +                         stream->filename, stream_index);
 +                if (!strcmp(path, buf))
 +                    goto found;
 +            }
 +        }
 +    }
 +    /* no stream found */
 +    rtsp_reply_error(c, RTSP_STATUS_SERVICE); /* XXX: right error ? */
 +    return;
 + found:
 +
 +    /* generate session id if needed */
 +    if (h->session_id[0] == '\0')
 +        snprintf(h->session_id, sizeof(h->session_id), "%08x%08x",
 +                 av_lfg_get(&random_state), av_lfg_get(&random_state));
 +
 +    /* find rtp session, and create it if none found */
 +    rtp_c = find_rtp_session(h->session_id);
 +    if (!rtp_c) {
 +        /* always prefer UDP */
 +        th = find_transport(h, RTSP_LOWER_TRANSPORT_UDP);
 +        if (!th) {
 +            th = find_transport(h, RTSP_LOWER_TRANSPORT_TCP);
 +            if (!th) {
 +                rtsp_reply_error(c, RTSP_STATUS_TRANSPORT);
 +                return;
 +            }
 +        }
 +
 +        rtp_c = rtp_new_connection(&c->from_addr, stream, h->session_id,
 +                                   th->lower_transport);
 +        if (!rtp_c) {
 +            rtsp_reply_error(c, RTSP_STATUS_BANDWIDTH);
 +            return;
 +        }
 +
 +        /* open input stream */
 +        if (open_input_stream(rtp_c, "") < 0) {
 +            rtsp_reply_error(c, RTSP_STATUS_INTERNAL);
 +            return;
 +        }
 +    }
 +
 +    /* test if stream is OK (test needed because several SETUP needs
 +       to be done for a given file) */
 +    if (rtp_c->stream != stream) {
 +        rtsp_reply_error(c, RTSP_STATUS_SERVICE);
 +        return;
 +    }
 +
 +    /* test if stream is already set up */
 +    if (rtp_c->rtp_ctx[stream_index]) {
 +        rtsp_reply_error(c, RTSP_STATUS_STATE);
 +        return;
 +    }
 +
 +    /* check transport */
 +    th = find_transport(h, rtp_c->rtp_protocol);
 +    if (!th || (th->lower_transport == RTSP_LOWER_TRANSPORT_UDP &&
 +                th->client_port_min <= 0)) {
 +        rtsp_reply_error(c, RTSP_STATUS_TRANSPORT);
 +        return;
 +    }
 +
 +    /* setup default options */
 +    setup.transport_option[0] = '\0';
 +    dest_addr = rtp_c->from_addr;
 +    dest_addr.sin_port = htons(th->client_port_min);
 +
 +    /* setup stream */
 +    if (rtp_new_av_stream(rtp_c, stream_index, &dest_addr, c) < 0) {
 +        rtsp_reply_error(c, RTSP_STATUS_TRANSPORT);
 +        return;
 +    }
 +
 +    /* now everything is OK, so we can send the connection parameters */
 +    rtsp_reply_header(c, RTSP_STATUS_OK);
 +    /* session ID */
 +    avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
 +
 +    switch(rtp_c->rtp_protocol) {
 +    case RTSP_LOWER_TRANSPORT_UDP:
 +        rtp_port = ff_rtp_get_local_rtp_port(rtp_c->rtp_handles[stream_index]);
 +        rtcp_port = ff_rtp_get_local_rtcp_port(rtp_c->rtp_handles[stream_index]);
 +        avio_printf(c->pb, "Transport: RTP/AVP/UDP;unicast;"
 +                    "client_port=%d-%d;server_port=%d-%d",
 +                    th->client_port_min, th->client_port_max,
 +                    rtp_port, rtcp_port);
 +        break;
 +    case RTSP_LOWER_TRANSPORT_TCP:
 +        avio_printf(c->pb, "Transport: RTP/AVP/TCP;interleaved=%d-%d",
 +                    stream_index * 2, stream_index * 2 + 1);
 +        break;
 +    default:
 +        break;
 +    }
 +    if (setup.transport_option[0] != '\0')
 +        avio_printf(c->pb, ";%s", setup.transport_option);
 +    avio_printf(c->pb, "\r\n");
 +
 +
 +    avio_printf(c->pb, "\r\n");
 +}
 +
 +
 +/* find an rtp connection by using the session ID. Check consistency
 +   with filename */
 +static HTTPContext *find_rtp_session_with_url(const char *url,
 +                                              const char *session_id)
 +{
 +    HTTPContext *rtp_c;
 +    char path1[1024];
 +    const char *path;
 +    char buf[1024];
 +    int s, len;
 +
 +    rtp_c = find_rtp_session(session_id);
 +    if (!rtp_c)
 +        return NULL;
 +
 +    /* find which url is asked */
 +    av_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url);
 +    path = path1;
 +    if (*path == '/')
 +        path++;
 +    if(!strcmp(path, rtp_c->stream->filename)) return rtp_c;
 +    for(s=0; s<rtp_c->stream->nb_streams; ++s) {
 +      snprintf(buf, sizeof(buf), "%s/streamid=%d",
 +        rtp_c->stream->filename, s);
 +      if(!strncmp(path, buf, sizeof(buf))) {
 +    // XXX: Should we reply with RTSP_STATUS_ONLY_AGGREGATE if nb_streams>1?
 +        return rtp_c;
 +      }
 +    }
 +    len = strlen(path);
 +    if (len > 0 && path[len - 1] == '/' &&
 +        !strncmp(path, rtp_c->stream->filename, len - 1))
 +        return rtp_c;
 +    return NULL;
 +}
 +
 +static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPMessageHeader *h)
 +{
 +    HTTPContext *rtp_c;
 +
 +    rtp_c = find_rtp_session_with_url(url, h->session_id);
 +    if (!rtp_c) {
 +        rtsp_reply_error(c, RTSP_STATUS_SESSION);
 +        return;
 +    }
 +
 +    if (rtp_c->state != HTTPSTATE_SEND_DATA &&
 +        rtp_c->state != HTTPSTATE_WAIT_FEED &&
 +        rtp_c->state != HTTPSTATE_READY) {
 +        rtsp_reply_error(c, RTSP_STATUS_STATE);
 +        return;
 +    }
 +
 +    rtp_c->state = HTTPSTATE_SEND_DATA;
 +
 +    /* now everything is OK, so we can send the connection parameters */
 +    rtsp_reply_header(c, RTSP_STATUS_OK);
 +    /* session ID */
 +    avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
 +    avio_printf(c->pb, "\r\n");
 +}
 +
 +static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h)
 +{
 +    HTTPContext *rtp_c;
 +
 +    rtp_c = find_rtp_session_with_url(url, h->session_id);
 +    if (!rtp_c) {
 +        rtsp_reply_error(c, RTSP_STATUS_SESSION);
 +        return;
 +    }
 +
 +    if (rtp_c->state != HTTPSTATE_SEND_DATA &&
 +        rtp_c->state != HTTPSTATE_WAIT_FEED) {
 +        rtsp_reply_error(c, RTSP_STATUS_STATE);
 +        return;
 +    }
 +
 +    rtp_c->state = HTTPSTATE_READY;
 +    rtp_c->first_pts = AV_NOPTS_VALUE;
 +    /* now everything is OK, so we can send the connection parameters */
 +    rtsp_reply_header(c, RTSP_STATUS_OK);
 +    /* session ID */
 +    avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
 +    avio_printf(c->pb, "\r\n");
 +}
 +
 +static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader *h)
 +{
 +    HTTPContext *rtp_c;
 +
 +    rtp_c = find_rtp_session_with_url(url, h->session_id);
 +    if (!rtp_c) {
 +        rtsp_reply_error(c, RTSP_STATUS_SESSION);
 +        return;
 +    }
 +
 +    /* now everything is OK, so we can send the connection parameters */
 +    rtsp_reply_header(c, RTSP_STATUS_OK);
 +    /* session ID */
 +    avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
 +    avio_printf(c->pb, "\r\n");
 +
 +    /* abort the session */
 +    close_connection(rtp_c);
 +}
 +
 +
 +/********************************************************************/
 +/* RTP handling */
 +
 +static HTTPContext *rtp_new_connection(struct sockaddr_in *from_addr,
 +                                       FFStream *stream, const char *session_id,
 +                                       enum RTSPLowerTransport rtp_protocol)
 +{
 +    HTTPContext *c = NULL;
 +    const char *proto_str;
 +
 +    /* XXX: should output a warning page when coming
 +       close to the connection limit */
 +    if (nb_connections >= nb_max_connections)
 +        goto fail;
 +
 +    /* add a new connection */
 +    c = av_mallocz(sizeof(HTTPContext));
 +    if (!c)
 +        goto fail;
 +
 +    c->fd = -1;
 +    c->poll_entry = NULL;
 +    c->from_addr = *from_addr;
 +    c->buffer_size = IOBUFFER_INIT_SIZE;
 +    c->buffer = av_malloc(c->buffer_size);
 +    if (!c->buffer)
 +        goto fail;
 +    nb_connections++;
 +    c->stream = stream;
 +    av_strlcpy(c->session_id, session_id, sizeof(c->session_id));
 +    c->state = HTTPSTATE_READY;
 +    c->is_packetized = 1;
 +    c->rtp_protocol = rtp_protocol;
 +
 +    /* protocol is shown in statistics */
 +    switch(c->rtp_protocol) {
 +    case RTSP_LOWER_TRANSPORT_UDP_MULTICAST:
 +        proto_str = "MCAST";
 +        break;
 +    case RTSP_LOWER_TRANSPORT_UDP:
 +        proto_str = "UDP";
 +        break;
 +    case RTSP_LOWER_TRANSPORT_TCP:
 +        proto_str = "TCP";
 +        break;
 +    default:
 +        proto_str = "???";
 +        break;
 +    }
 +    av_strlcpy(c->protocol, "RTP/", sizeof(c->protocol));
 +    av_strlcat(c->protocol, proto_str, sizeof(c->protocol));
 +
 +    current_bandwidth += stream->bandwidth;
 +
 +    c->next = first_http_ctx;
 +    first_http_ctx = c;
 +    return c;
 +
 + fail:
 +    if (c) {
 +        av_free(c->buffer);
 +        av_free(c);
 +    }
 +    return NULL;
 +}
 +
 +/* add a new RTP stream in an RTP connection (used in RTSP SETUP
 +   command). If RTP/TCP protocol is used, TCP connection 'rtsp_c' is
 +   used. */
 +static int rtp_new_av_stream(HTTPContext *c,
 +                             int stream_index, struct sockaddr_in *dest_addr,
 +                             HTTPContext *rtsp_c)
 +{
 +    AVFormatContext *ctx;
 +    AVStream *st;
 +    char *ipaddr;
 +    URLContext *h = NULL;
 +    uint8_t *dummy_buf;
 +    int max_packet_size;
 +
 +    /* now we can open the relevant output stream */
 +    ctx = avformat_alloc_context();
 +    if (!ctx)
 +        return -1;
 +    ctx->oformat = av_guess_format("rtp", NULL, NULL);
 +
 +    st = av_mallocz(sizeof(AVStream));
 +    if (!st)
 +        goto fail;
 +    ctx->nb_streams = 1;
 +    ctx->streams = av_mallocz(sizeof(AVStream *) * ctx->nb_streams);
 +    if (!ctx->streams)
 +      goto fail;
 +    ctx->streams[0] = st;
 +
 +    if (!c->stream->feed ||
 +        c->stream->feed == c->stream)
 +        memcpy(st, c->stream->streams[stream_index], sizeof(AVStream));
 +    else
 +        memcpy(st,
 +               c->stream->feed->streams[c->stream->feed_streams[stream_index]],
 +               sizeof(AVStream));
 +    st->priv_data = NULL;
 +
 +    /* build destination RTP address */
 +    ipaddr = inet_ntoa(dest_addr->sin_addr);
 +
 +    switch(c->rtp_protocol) {
 +    case RTSP_LOWER_TRANSPORT_UDP:
 +    case RTSP_LOWER_TRANSPORT_UDP_MULTICAST:
 +        /* RTP/UDP case */
 +
 +        /* XXX: also pass as parameter to function ? */
 +        if (c->stream->is_multicast) {
 +            int ttl;
 +            ttl = c->stream->multicast_ttl;
 +            if (!ttl)
 +                ttl = 16;
 +            snprintf(ctx->filename, sizeof(ctx->filename),
 +                     "rtp://%s:%d?multicast=1&ttl=%d",
 +                     ipaddr, ntohs(dest_addr->sin_port), ttl);
 +        } else {
 +            snprintf(ctx->filename, sizeof(ctx->filename),
 +                     "rtp://%s:%d", ipaddr, ntohs(dest_addr->sin_port));
 +        }
 +
-         max_packet_size = h->max_packet_size;
++        if (url_open(&h, ctx->filename, AVIO_FLAG_WRITE) < 0)
 +            goto fail;
 +        c->rtp_handles[stream_index] = h;
-             ffurl_close(h);
++        max_packet_size = url_get_max_packet_size(h);
 +        break;
 +    case RTSP_LOWER_TRANSPORT_TCP:
 +        /* RTP/TCP case */
 +        c->rtsp_c = rtsp_c;
 +        max_packet_size = RTSP_TCP_MAX_PACKET_SIZE;
 +        break;
 +    default:
 +        goto fail;
 +    }
 +
 +    http_log("%s:%d - - \"PLAY %s/streamid=%d %s\"\n",
 +             ipaddr, ntohs(dest_addr->sin_port),
 +             c->stream->filename, stream_index, c->protocol);
 +
 +    /* normally, no packets should be output here, but the packet size may be checked */
 +    if (ffio_open_dyn_packet_buf(&ctx->pb, max_packet_size) < 0) {
 +        /* XXX: close stream */
 +        goto fail;
 +    }
 +    if (avformat_write_header(ctx, NULL) < 0) {
 +    fail:
 +        if (h)
-     avpriv_set_pts_info(fst, 33, 1, 90000);
++            url_close(h);
 +        av_free(ctx);
 +        return -1;
 +    }
 +    avio_close_dyn_buf(ctx->pb, &dummy_buf);
 +    av_free(dummy_buf);
 +
 +    c->rtp_ctx[stream_index] = ctx;
 +    return 0;
 +}
 +
 +/********************************************************************/
 +/* ffserver initialization */
 +
 +static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int copy)
 +{
 +    AVStream *fst;
 +
 +    fst = av_mallocz(sizeof(AVStream));
 +    if (!fst)
 +        return NULL;
 +    if (copy) {
 +        fst->codec = avcodec_alloc_context3(NULL);
 +        memcpy(fst->codec, codec, sizeof(AVCodecContext));
 +        if (codec->extradata_size) {
 +            fst->codec->extradata = av_malloc(codec->extradata_size);
 +            memcpy(fst->codec->extradata, codec->extradata,
 +                codec->extradata_size);
 +        }
 +    } else {
 +        /* live streams must use the actual feed's codec since it may be
 +         * updated later to carry extradata needed by the streams.
 +         */
 +        fst->codec = codec;
 +    }
 +    fst->priv_data = av_mallocz(sizeof(FeedData));
 +    fst->index = stream->nb_streams;
++    av_set_pts_info(fst, 33, 1, 90000);
 +    fst->sample_aspect_ratio = codec->sample_aspect_ratio;
 +    stream->streams[stream->nb_streams++] = fst;
 +    return fst;
 +}
 +
 +/* return the stream number in the feed */
 +static int add_av_stream(FFStream *feed, AVStream *st)
 +{
 +    AVStream *fst;
 +    AVCodecContext *av, *av1;
 +    int i;
 +
 +    av = st->codec;
 +    for(i=0;i<feed->nb_streams;i++) {
 +        st = feed->streams[i];
 +        av1 = st->codec;
 +        if (av1->codec_id == av->codec_id &&
 +            av1->codec_type == av->codec_type &&
 +            av1->bit_rate == av->bit_rate) {
 +
 +            switch(av->codec_type) {
 +            case AVMEDIA_TYPE_AUDIO:
 +                if (av1->channels == av->channels &&
 +                    av1->sample_rate == av->sample_rate)
 +                    return i;
 +                break;
 +            case AVMEDIA_TYPE_VIDEO:
 +                if (av1->width == av->width &&
 +                    av1->height == av->height &&
 +                    av1->time_base.den == av->time_base.den &&
 +                    av1->time_base.num == av->time_base.num &&
 +                    av1->gop_size == av->gop_size)
 +                    return i;
 +                break;
 +            default:
 +                abort();
 +            }
 +        }
 +    }
 +
 +    fst = add_av_stream1(feed, av, 0);
 +    if (!fst)
 +        return -1;
 +    return feed->nb_streams - 1;
 +}
 +
 +static void remove_stream(FFStream *stream)
 +{
 +    FFStream **ps;
 +    ps = &first_stream;
 +    while (*ps != NULL) {
 +        if (*ps == stream)
 +            *ps = (*ps)->next;
 +        else
 +            ps = &(*ps)->next;
 +    }
 +}
 +
 +/* specific mpeg4 handling : we extract the raw parameters */
 +static void extract_mpeg4_header(AVFormatContext *infile)
 +{
 +    int mpeg4_count, i, size;
 +    AVPacket pkt;
 +    AVStream *st;
 +    const uint8_t *p;
 +
 +    mpeg4_count = 0;
 +    for(i=0;i<infile->nb_streams;i++) {
 +        st = infile->streams[i];
 +        if (st->codec->codec_id == CODEC_ID_MPEG4 &&
 +            st->codec->extradata_size == 0) {
 +            mpeg4_count++;
 +        }
 +    }
 +    if (!mpeg4_count)
 +        return;
 +
 +    printf("MPEG4 without extra data: trying to find header in %s\n", infile->filename);
 +    while (mpeg4_count > 0) {
 +        if (av_read_packet(infile, &pkt) < 0)
 +            break;
 +        st = infile->streams[pkt.stream_index];
 +        if (st->codec->codec_id == CODEC_ID_MPEG4 &&
 +            st->codec->extradata_size == 0) {
 +            av_freep(&st->codec->extradata);
 +            /* fill extradata with the header */
 +            /* XXX: we make hard suppositions here ! */
 +            p = pkt.data;
 +            while (p < pkt.data + pkt.size - 4) {
 +                /* stop when vop header is found */
 +                if (p[0] == 0x00 && p[1] == 0x00 &&
 +                    p[2] == 0x01 && p[3] == 0xb6) {
 +                    size = p - pkt.data;
 +                    //                    av_hex_dump_log(infile, AV_LOG_DEBUG, pkt.data, size);
 +                    st->codec->extradata = av_malloc(size);
 +                    st->codec->extradata_size = size;
 +                    memcpy(st->codec->extradata, pkt.data, size);
 +                    break;
 +                }
 +                p++;
 +            }
 +            mpeg4_count--;
 +        }
 +        av_free_packet(&pkt);
 +    }
 +}
 +
 +/* compute the needed AVStream for each file */
 +static void build_file_streams(void)
 +{
 +    FFStream *stream, *stream_next;
 +    int i, ret;
 +
 +    /* gather all streams */
 +    for(stream = first_stream; stream != NULL; stream = stream_next) {
 +        AVFormatContext *infile = NULL;
 +        stream_next = stream->next;
 +        if (stream->stream_type == STREAM_TYPE_LIVE &&
 +            !stream->feed) {
 +            /* the stream comes from a file */
 +            /* try to open the file */
 +            /* open stream */
 +            if (stream->fmt && !strcmp(stream->fmt->name, "rtp")) {
 +                /* specific case : if transport stream output to RTP,
 +                   we use a raw transport stream reader */
 +                av_dict_set(&stream->in_opts, "mpeg2ts_compute_pcr", "1", 0);
 +            }
 +
 +            http_log("Opening file '%s'\n", stream->feed_filename);
 +            if ((ret = avformat_open_input(&infile, stream->feed_filename, stream->ifmt, &stream->in_opts)) < 0) {
 +                http_log("Could not open '%s': %d\n", stream->feed_filename, ret);
 +                /* remove stream (no need to spend more time on it) */
 +            fail:
 +                remove_stream(stream);
 +            } else {
 +                /* find all the AVStreams inside and reference them in
 +                   'stream' */
 +                if (avformat_find_stream_info(infile, NULL) < 0) {
 +                    http_log("Could not find codec parameters from '%s'\n",
 +                             stream->feed_filename);
 +                    avformat_close_input(&infile);
 +                    goto fail;
 +                }
 +                extract_mpeg4_header(infile);
 +
 +                for(i=0;i<infile->nb_streams;i++)
 +                    add_av_stream1(stream, infile->streams[i]->codec, 1);
 +
 +                avformat_close_input(&infile);
 +            }
 +        }
 +    }
 +}
 +
 +/* compute the needed AVStream for each feed */
 +static void build_feed_streams(void)
 +{
 +    FFStream *stream, *feed;
 +    int i;
 +
 +    /* gather all streams */
 +    for(stream = first_stream; stream != NULL; stream = stream->next) {
 +        feed = stream->feed;
 +        if (feed) {
 +            if (stream->is_feed) {
 +                for(i=0;i<stream->nb_streams;i++)
 +                    stream->feed_streams[i] = i;
 +            } else {
 +                /* we handle a stream coming from a feed */
 +                for(i=0;i<stream->nb_streams;i++)
 +                    stream->feed_streams[i] = add_av_stream(feed, stream->streams[i]);
 +            }
 +        }
 +    }
 +
 +    /* create feed files if needed */
 +    for(feed = first_feed; feed != NULL; feed = feed->next_feed) {
 +        int fd;
 +
 +        if (avio_check(feed->feed_filename, AVIO_FLAG_READ) > 0) {
 +            /* See if it matches */
 +            AVFormatContext *s = NULL;
 +            int matches = 0;
 +
 +            if (avformat_open_input(&s, feed->feed_filename, NULL, NULL) >= 0) {
 +                /* Now see if it matches */
 +                if (s->nb_streams == feed->nb_streams) {
 +                    matches = 1;
 +                    for(i=0;i<s->nb_streams;i++) {
 +                        AVStream *sf, *ss;
 +                        sf = feed->streams[i];
 +                        ss = s->streams[i];
 +
 +                        if (sf->index != ss->index ||
 +                            sf->id != ss->id) {
 +                            http_log("Index & Id do not match for stream %d (%s)\n",
 +                                   i, feed->feed_filename);
 +                            matches = 0;
 +                        } else {
 +                            AVCodecContext *ccf, *ccs;
 +
 +                            ccf = sf->codec;
 +                            ccs = ss->codec;
 +#define CHECK_CODEC(x)  (ccf->x != ccs->x)
 +
 +                            if (CHECK_CODEC(codec_id) || CHECK_CODEC(codec_type)) {
 +                                http_log("Codecs do not match for stream %d\n", i);
 +                                matches = 0;
 +                            } else if (CHECK_CODEC(bit_rate) || CHECK_CODEC(flags)) {
 +                                http_log("Codec bitrates do not match for stream %d\n", i);
 +                                matches = 0;
 +                            } else if (ccf->codec_type == AVMEDIA_TYPE_VIDEO) {
 +                                if (CHECK_CODEC(time_base.den) ||
 +                                    CHECK_CODEC(time_base.num) ||
 +                                    CHECK_CODEC(width) ||
 +                                    CHECK_CODEC(height)) {
 +                                    http_log("Codec width, height and framerate do not match for stream %d\n", i);
 +                                    matches = 0;
 +                                }
 +                            } else if (ccf->codec_type == AVMEDIA_TYPE_AUDIO) {
 +                                if (CHECK_CODEC(sample_rate) ||
 +                                    CHECK_CODEC(channels) ||
 +                                    CHECK_CODEC(frame_size)) {
 +                                    http_log("Codec sample_rate, channels, frame_size do not match for stream %d\n", i);
 +                                    matches = 0;
 +                                }
 +                            } else {
 +                                http_log("Unknown codec type\n");
 +                                matches = 0;
 +                            }
 +                        }
 +                        if (!matches)
 +                            break;
 +                    }
 +                } else
 +                    http_log("Deleting feed file '%s' as stream counts differ (%d != %d)\n",
 +                        feed->feed_filename, s->nb_streams, feed->nb_streams);
 +
 +                avformat_close_input(&s);
 +            } else
 +                http_log("Deleting feed file '%s' as it appears to be corrupt\n",
 +                        feed->feed_filename);
 +
 +            if (!matches) {
 +                if (feed->readonly) {
 +                    http_log("Unable to delete feed file '%s' as it is marked readonly\n",
 +                        feed->feed_filename);
 +                    exit(1);
 +                }
 +                unlink(feed->feed_filename);
 +            }
 +        }
 +        if (avio_check(feed->feed_filename, AVIO_FLAG_WRITE) <= 0) {
 +            AVFormatContext s1 = {0}, *s = &s1;
 +
 +            if (feed->readonly) {
 +                http_log("Unable to create feed file '%s' as it is marked readonly\n",
 +                    feed->feed_filename);
 +                exit(1);
 +            }
 +
 +            /* only write the header of the ffm file */
 +            if (avio_open(&s->pb, feed->feed_filename, AVIO_FLAG_WRITE) < 0) {
 +                http_log("Could not open output feed file '%s'\n",
 +                         feed->feed_filename);
 +                exit(1);
 +            }
 +            s->oformat = feed->fmt;
 +            s->nb_streams = feed->nb_streams;
 +            s->streams = feed->streams;
 +            if (avformat_write_header(s, NULL) < 0) {
 +                http_log("Container doesn't supports the required parameters\n");
 +                exit(1);
 +            }
 +            /* XXX: need better api */
 +            av_freep(&s->priv_data);
 +            avio_close(s->pb);
 +        }
 +        /* get feed size and write index */
 +        fd = open(feed->feed_filename, O_RDONLY);
 +        if (fd < 0) {
 +            http_log("Could not open output feed file '%s'\n",
 +                    feed->feed_filename);
 +            exit(1);
 +        }
 +
 +        feed->feed_write_index = FFMAX(ffm_read_write_index(fd), FFM_PACKET_SIZE);
 +        feed->feed_size = lseek(fd, 0, SEEK_END);
 +        /* ensure that we do not wrap before the end of file */
 +        if (feed->feed_max_size && feed->feed_max_size < feed->feed_size)
 +            feed->feed_max_size = feed->feed_size;
 +
 +        close(fd);
 +    }
 +}
 +
 +/* compute the bandwidth used by each stream */
 +static void compute_bandwidth(void)
 +{
 +    unsigned bandwidth;
 +    int i;
 +    FFStream *stream;
 +
 +    for(stream = first_stream; stream != NULL; stream = stream->next) {
 +        bandwidth = 0;
 +        for(i=0;i<stream->nb_streams;i++) {
 +            AVStream *st = stream->streams[i];
 +            switch(st->codec->codec_type) {
 +            case AVMEDIA_TYPE_AUDIO:
 +            case AVMEDIA_TYPE_VIDEO:
 +                bandwidth += st->codec->bit_rate;
 +                break;
 +            default:
 +                break;
 +            }
 +        }
 +        stream->bandwidth = (bandwidth + 999) / 1000;
 +    }
 +}
 +
 +/* add a codec and set the default parameters */
 +static void add_codec(FFStream *stream, AVCodecContext *av)
 +{
 +    AVStream *st;
 +
 +    /* compute default parameters */
 +    switch(av->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        if (av->bit_rate == 0)
 +            av->bit_rate = 64000;
 +        if (av->sample_rate == 0)
 +            av->sample_rate = 22050;
 +        if (av->channels == 0)
 +            av->channels = 1;
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        if (av->bit_rate == 0)
 +            av->bit_rate = 64000;
 +        if (av->time_base.num == 0){
 +            av->time_base.den = 5;
 +            av->time_base.num = 1;
 +        }
 +        if (av->width == 0 || av->height == 0) {
 +            av->width = 160;
 +            av->height = 128;
 +        }
 +        /* Bitrate tolerance is less for streaming */
 +        if (av->bit_rate_tolerance == 0)
 +            av->bit_rate_tolerance = FFMAX(av->bit_rate / 4,
 +                      (int64_t)av->bit_rate*av->time_base.num/av->time_base.den);
 +        if (av->qmin == 0)
 +            av->qmin = 3;
 +        if (av->qmax == 0)
 +            av->qmax = 31;
 +        if (av->max_qdiff == 0)
 +            av->max_qdiff = 3;
 +        av->qcompress = 0.5;
 +        av->qblur = 0.5;
 +
 +        if (!av->nsse_weight)
 +            av->nsse_weight = 8;
 +
 +        av->frame_skip_cmp = FF_CMP_DCTMAX;
 +        if (!av->me_method)
 +            av->me_method = ME_EPZS;
 +        av->rc_buffer_aggressivity = 1.0;
 +
 +        if (!av->rc_eq)
 +            av->rc_eq = "tex^qComp";
 +        if (!av->i_quant_factor)
 +            av->i_quant_factor = -0.8;
 +        if (!av->b_quant_factor)
 +            av->b_quant_factor = 1.25;
 +        if (!av->b_quant_offset)
 +            av->b_quant_offset = 1.25;
 +        if (!av->rc_max_rate)
 +            av->rc_max_rate = av->bit_rate * 2;
 +
 +        if (av->rc_max_rate && !av->rc_buffer_size) {
 +            av->rc_buffer_size = av->rc_max_rate;
 +        }
 +
 +
 +        break;
 +    default:
 +        abort();
 +    }
 +
 +    st = av_mallocz(sizeof(AVStream));
 +    if (!st)
 +        return;
 +    st->codec = avcodec_alloc_context3(NULL);
 +    stream->streams[stream->nb_streams++] = st;
 +    memcpy(st->codec, av, sizeof(AVCodecContext));
 +}
 +
 +static enum CodecID opt_audio_codec(const char *arg)
 +{
 +    AVCodec *p= avcodec_find_encoder_by_name(arg);
 +
 +    if (p == NULL || p->type != AVMEDIA_TYPE_AUDIO)
 +        return CODEC_ID_NONE;
 +
 +    return p->id;
 +}
 +
 +static enum CodecID opt_video_codec(const char *arg)
 +{
 +    AVCodec *p= avcodec_find_encoder_by_name(arg);
 +
 +    if (p == NULL || p->type != AVMEDIA_TYPE_VIDEO)
 +        return CODEC_ID_NONE;
 +
 +    return p->id;
 +}
 +
 +/* simplistic plugin support */
 +
 +#if HAVE_DLOPEN
 +static void load_module(const char *filename)
 +{
 +    void *dll;
 +    void (*init_func)(void);
 +    dll = dlopen(filename, RTLD_NOW);
 +    if (!dll) {
 +        fprintf(stderr, "Could not load module '%s' - %s\n",
 +                filename, dlerror());
 +        return;
 +    }
 +
 +    init_func = dlsym(dll, "ffserver_module_init");
 +    if (!init_func) {
 +        fprintf(stderr,
 +                "%s: init function 'ffserver_module_init()' not found\n",
 +                filename);
 +        dlclose(dll);
 +    }
 +
 +    init_func();
 +}
 +#endif
 +
 +static int ffserver_opt_default(const char *opt, const char *arg,
 +                       AVCodecContext *avctx, int type)
 +{
 +    int ret = 0;
 +    const AVOption *o = av_opt_find(avctx, opt, NULL, type, 0);
 +    if(o)
 +        ret = av_opt_set(avctx, opt, arg, 0);
 +    return ret;
 +}
 +
 +static int ffserver_opt_preset(const char *arg,
 +                       AVCodecContext *avctx, int type,
 +                       enum CodecID *audio_id, enum CodecID *video_id)
 +{
 +    FILE *f=NULL;
 +    char filename[1000], tmp[1000], tmp2[1000], line[1000];
 +    int ret = 0;
 +    AVCodec *codec = avcodec_find_encoder(avctx->codec_id);
 +
 +    if (!(f = get_preset_file(filename, sizeof(filename), arg, 0,
 +                              codec ? codec->name : NULL))) {
 +        fprintf(stderr, "File for preset '%s' not found\n", arg);
 +        return 1;
 +    }
 +
 +    while(!feof(f)){
 +        int e= fscanf(f, "%999[^\n]\n", line) - 1;
 +        if(line[0] == '#' && !e)
 +            continue;
 +        e|= sscanf(line, "%999[^=]=%999[^\n]\n", tmp, tmp2) - 2;
 +        if(e){
 +            fprintf(stderr, "%s: Invalid syntax: '%s'\n", filename, line);
 +            ret = 1;
 +            break;
 +        }
 +        if(!strcmp(tmp, "acodec")){
 +            *audio_id = opt_audio_codec(tmp2);
 +        }else if(!strcmp(tmp, "vcodec")){
 +            *video_id = opt_video_codec(tmp2);
 +        }else if(!strcmp(tmp, "scodec")){
 +            /* opt_subtitle_codec(tmp2); */
 +        }else if(ffserver_opt_default(tmp, tmp2, avctx, type) < 0){
 +            fprintf(stderr, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n", filename, line, tmp, tmp2);
 +            ret = 1;
 +            break;
 +        }
 +    }
 +
 +    fclose(f);
 +
 +    return ret;
 +}
 +
 +static AVOutputFormat *ffserver_guess_format(const char *short_name, const char *filename,
 +                                             const char *mime_type)
 +{
 +    AVOutputFormat *fmt = av_guess_format(short_name, filename, mime_type);
 +
 +    if (fmt) {
 +        AVOutputFormat *stream_fmt;
 +        char stream_format_name[64];
 +
 +        snprintf(stream_format_name, sizeof(stream_format_name), "%s_stream", fmt->name);
 +        stream_fmt = av_guess_format(stream_format_name, NULL, NULL);
 +
 +        if (stream_fmt)
 +            fmt = stream_fmt;
 +    }
 +
 +    return fmt;
 +}
 +
 +static void report_config_error(const char *filename, int line_num, int *errors, const char *fmt, ...)
 +{
 +    va_list vl;
 +    va_start(vl, fmt);
 +    fprintf(stderr, "%s:%d: ", filename, line_num);
 +    vfprintf(stderr, fmt, vl);
 +    va_end(vl);
 +
 +    (*errors)++;
 +}
 +
 +static int parse_ffconfig(const char *filename)
 +{
 +    FILE *f;
 +    char line[1024];
 +    char cmd[64];
 +    char arg[1024];
 +    const char *p;
 +    int val, errors, line_num;
 +    FFStream **last_stream, *stream, *redirect;
 +    FFStream **last_feed, *feed, *s;
 +    AVCodecContext audio_enc, video_enc;
 +    enum CodecID audio_id, video_id;
 +
 +    f = fopen(filename, "r");
 +    if (!f) {
 +        perror(filename);
 +        return -1;
 +    }
 +
 +    errors = 0;
 +    line_num = 0;
 +    first_stream = NULL;
 +    last_stream = &first_stream;
 +    first_feed = NULL;
 +    last_feed = &first_feed;
 +    stream = NULL;
 +    feed = NULL;
 +    redirect = NULL;
 +    audio_id = CODEC_ID_NONE;
 +    video_id = CODEC_ID_NONE;
 +
 +#define ERROR(...) report_config_error(filename, line_num, &errors, __VA_ARGS__)
 +    for(;;) {
 +        if (fgets(line, sizeof(line), f) == NULL)
 +            break;
 +        line_num++;
 +        p = line;
 +        while (isspace(*p))
 +            p++;
 +        if (*p == '\0' || *p == '#')
 +            continue;
 +
 +        get_arg(cmd, sizeof(cmd), &p);
 +
 +        if (!av_strcasecmp(cmd, "Port")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            val = atoi(arg);
 +            if (val < 1 || val > 65536) {
 +                ERROR("Invalid_port: %s\n", arg);
 +            }
 +            my_http_addr.sin_port = htons(val);
 +        } else if (!av_strcasecmp(cmd, "BindAddress")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (resolve_host(&my_http_addr.sin_addr, arg) != 0) {
 +                ERROR("%s:%d: Invalid host/IP address: %s\n", arg);
 +            }
 +        } else if (!av_strcasecmp(cmd, "NoDaemon")) {
 +            ffserver_daemon = 0;
 +        } else if (!av_strcasecmp(cmd, "RTSPPort")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            val = atoi(arg);
 +            if (val < 1 || val > 65536) {
 +                ERROR("%s:%d: Invalid port: %s\n", arg);
 +            }
 +            my_rtsp_addr.sin_port = htons(atoi(arg));
 +        } else if (!av_strcasecmp(cmd, "RTSPBindAddress")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (resolve_host(&my_rtsp_addr.sin_addr, arg) != 0) {
 +                ERROR("Invalid host/IP address: %s\n", arg);
 +            }
 +        } else if (!av_strcasecmp(cmd, "MaxHTTPConnections")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            val = atoi(arg);
 +            if (val < 1 || val > 65536) {
 +                ERROR("Invalid MaxHTTPConnections: %s\n", arg);
 +            }
 +            nb_max_http_connections = val;
 +        } else if (!av_strcasecmp(cmd, "MaxClients")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            val = atoi(arg);
 +            if (val < 1 || val > nb_max_http_connections) {
 +                ERROR("Invalid MaxClients: %s\n", arg);
 +            } else {
 +                nb_max_connections = val;
 +            }
 +        } else if (!av_strcasecmp(cmd, "MaxBandwidth")) {
 +            int64_t llval;
 +            get_arg(arg, sizeof(arg), &p);
 +            llval = atoll(arg);
 +            if (llval < 10 || llval > 10000000) {
 +                ERROR("Invalid MaxBandwidth: %s\n", arg);
 +            } else
 +                max_bandwidth = llval;
 +        } else if (!av_strcasecmp(cmd, "CustomLog")) {
 +            if (!ffserver_debug)
 +                get_arg(logfilename, sizeof(logfilename), &p);
 +        } else if (!av_strcasecmp(cmd, "<Feed")) {
 +            /*********************************************/
 +            /* Feed related options */
 +            char *q;
 +            if (stream || feed) {
 +                ERROR("Already in a tag\n");
 +            } else {
 +                feed = av_mallocz(sizeof(FFStream));
 +                get_arg(feed->filename, sizeof(feed->filename), &p);
 +                q = strrchr(feed->filename, '>');
 +                if (*q)
 +                    *q = '\0';
 +
 +                for (s = first_feed; s; s = s->next) {
 +                    if (!strcmp(feed->filename, s->filename)) {
 +                        ERROR("Feed '%s' already registered\n", s->filename);
 +                    }
 +                }
 +
 +                feed->fmt = av_guess_format("ffm", NULL, NULL);
 +                /* defaut feed file */
 +                snprintf(feed->feed_filename, sizeof(feed->feed_filename),
 +                         "/tmp/%s.ffm", feed->filename);
 +                feed->feed_max_size = 5 * 1024 * 1024;
 +                feed->is_feed = 1;
 +                feed->feed = feed; /* self feeding :-) */
 +
 +                /* add in stream list */
 +                *last_stream = feed;
 +                last_stream = &feed->next;
 +                /* add in feed list */
 +                *last_feed = feed;
 +                last_feed = &feed->next_feed;
 +            }
 +        } else if (!av_strcasecmp(cmd, "Launch")) {
 +            if (feed) {
 +                int i;
 +
 +                feed->child_argv = av_mallocz(64 * sizeof(char *));
 +
 +                for (i = 0; i < 62; i++) {
 +                    get_arg(arg, sizeof(arg), &p);
 +                    if (!arg[0])
 +                        break;
 +
 +                    feed->child_argv[i] = av_strdup(arg);
 +                }
 +
 +                feed->child_argv[i] = av_malloc(30 + strlen(feed->filename));
 +
 +                snprintf(feed->child_argv[i], 30+strlen(feed->filename),
 +                    "http://%s:%d/%s",
 +                        (my_http_addr.sin_addr.s_addr == INADDR_ANY) ? "127.0.0.1" :
 +                    inet_ntoa(my_http_addr.sin_addr),
 +                    ntohs(my_http_addr.sin_port), feed->filename);
 +            }
 +        } else if (!av_strcasecmp(cmd, "ReadOnlyFile")) {
 +            if (feed) {
 +                get_arg(feed->feed_filename, sizeof(feed->feed_filename), &p);
 +                feed->readonly = 1;
 +            } else if (stream) {
 +                get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);
 +            }
 +        } else if (!av_strcasecmp(cmd, "File")) {
 +            if (feed) {
 +                get_arg(feed->feed_filename, sizeof(feed->feed_filename), &p);
 +            } else if (stream)
 +                get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);
 +        } else if (!av_strcasecmp(cmd, "Truncate")) {
 +            if (feed) {
 +                get_arg(arg, sizeof(arg), &p);
 +                feed->truncate = strtod(arg, NULL);
 +            }
 +        } else if (!av_strcasecmp(cmd, "FileMaxSize")) {
 +            if (feed) {
 +                char *p1;
 +                double fsize;
 +
 +                get_arg(arg, sizeof(arg), &p);
 +                p1 = arg;
 +                fsize = strtod(p1, &p1);
 +                switch(toupper(*p1)) {
 +                case 'K':
 +                    fsize *= 1024;
 +                    break;
 +                case 'M':
 +                    fsize *= 1024 * 1024;
 +                    break;
 +                case 'G':
 +                    fsize *= 1024 * 1024 * 1024;
 +                    break;
 +                }
 +                feed->feed_max_size = (int64_t)fsize;
 +                if (feed->feed_max_size < FFM_PACKET_SIZE*4) {
 +                    ERROR("Feed max file size is too small, must be at least %d\n", FFM_PACKET_SIZE*4);
 +                }
 +            }
 +        } else if (!av_strcasecmp(cmd, "</Feed>")) {
 +            if (!feed) {
 +                ERROR("No corresponding <Feed> for </Feed>\n");
 +            }
 +            feed = NULL;
 +        } else if (!av_strcasecmp(cmd, "<Stream")) {
 +            /*********************************************/
 +            /* Stream related options */
 +            char *q;
 +            if (stream || feed) {
 +                ERROR("Already in a tag\n");
 +            } else {
 +                FFStream *s;
 +                stream = av_mallocz(sizeof(FFStream));
 +                get_arg(stream->filename, sizeof(stream->filename), &p);
 +                q = strrchr(stream->filename, '>');
 +                if (*q)
 +                    *q = '\0';
 +
 +                for (s = first_stream; s; s = s->next) {
 +                    if (!strcmp(stream->filename, s->filename)) {
 +                        ERROR("Stream '%s' already registered\n", s->filename);
 +                    }
 +                }
 +
 +                stream->fmt = ffserver_guess_format(NULL, stream->filename, NULL);
 +                avcodec_get_context_defaults2(&video_enc, AVMEDIA_TYPE_VIDEO);
 +                avcodec_get_context_defaults2(&audio_enc, AVMEDIA_TYPE_AUDIO);
 +
 +                audio_id = CODEC_ID_NONE;
 +                video_id = CODEC_ID_NONE;
 +                if (stream->fmt) {
 +                    audio_id = stream->fmt->audio_codec;
 +                    video_id = stream->fmt->video_codec;
 +                }
 +
 +                *last_stream = stream;
 +                last_stream = &stream->next;
 +            }
 +        } else if (!av_strcasecmp(cmd, "Feed")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +                FFStream *sfeed;
 +
 +                sfeed = first_feed;
 +                while (sfeed != NULL) {
 +                    if (!strcmp(sfeed->filename, arg))
 +                        break;
 +                    sfeed = sfeed->next_feed;
 +                }
 +                if (!sfeed)
 +                    ERROR("feed '%s' not defined\n", arg);
 +                else
 +                    stream->feed = sfeed;
 +            }
 +        } else if (!av_strcasecmp(cmd, "Format")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +                if (!strcmp(arg, "status")) {
 +                    stream->stream_type = STREAM_TYPE_STATUS;
 +                    stream->fmt = NULL;
 +                } else {
 +                    stream->stream_type = STREAM_TYPE_LIVE;
 +                    /* jpeg cannot be used here, so use single frame jpeg */
 +                    if (!strcmp(arg, "jpeg"))
 +                        strcpy(arg, "mjpeg");
 +                    stream->fmt = ffserver_guess_format(arg, NULL, NULL);
 +                    if (!stream->fmt) {
 +                        ERROR("Unknown Format: %s\n", arg);
 +                    }
 +                }
 +                if (stream->fmt) {
 +                    audio_id = stream->fmt->audio_codec;
 +                    video_id = stream->fmt->video_codec;
 +                }
 +            }
 +        } else if (!av_strcasecmp(cmd, "InputFormat")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +                stream->ifmt = av_find_input_format(arg);
 +                if (!stream->ifmt) {
 +                    ERROR("Unknown input format: %s\n", arg);
 +                }
 +            }
 +        } else if (!av_strcasecmp(cmd, "FaviconURL")) {
 +            if (stream && stream->stream_type == STREAM_TYPE_STATUS) {
 +                get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);
 +            } else {
 +                ERROR("FaviconURL only permitted for status streams\n");
 +            }
 +        } else if (!av_strcasecmp(cmd, "Author")) {
 +            if (stream)
 +                get_arg(stream->author, sizeof(stream->author), &p);
 +        } else if (!av_strcasecmp(cmd, "Comment")) {
 +            if (stream)
 +                get_arg(stream->comment, sizeof(stream->comment), &p);
 +        } else if (!av_strcasecmp(cmd, "Copyright")) {
 +            if (stream)
 +                get_arg(stream->copyright, sizeof(stream->copyright), &p);
 +        } else if (!av_strcasecmp(cmd, "Title")) {
 +            if (stream)
 +                get_arg(stream->title, sizeof(stream->title), &p);
 +        } else if (!av_strcasecmp(cmd, "Preroll")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream)
 +                stream->prebuffer = atof(arg) * 1000;
 +        } else if (!av_strcasecmp(cmd, "StartSendOnKey")) {
 +            if (stream)
 +                stream->send_on_key = 1;
 +        } else if (!av_strcasecmp(cmd, "AudioCodec")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            audio_id = opt_audio_codec(arg);
 +            if (audio_id == CODEC_ID_NONE) {
 +                ERROR("Unknown AudioCodec: %s\n", arg);
 +            }
 +        } else if (!av_strcasecmp(cmd, "VideoCodec")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            video_id = opt_video_codec(arg);
 +            if (video_id == CODEC_ID_NONE) {
 +                ERROR("Unknown VideoCodec: %s\n", arg);
 +            }
 +        } else if (!av_strcasecmp(cmd, "MaxTime")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream)
 +                stream->max_time = atof(arg) * 1000;
 +        } else if (!av_strcasecmp(cmd, "AudioBitRate")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream)
 +                audio_enc.bit_rate = lrintf(atof(arg) * 1000);
 +        } else if (!av_strcasecmp(cmd, "AudioChannels")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream)
 +                audio_enc.channels = atoi(arg);
 +        } else if (!av_strcasecmp(cmd, "AudioSampleRate")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream)
 +                audio_enc.sample_rate = atoi(arg);
 +        } else if (!av_strcasecmp(cmd, "AudioQuality")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +//                audio_enc.quality = atof(arg) * 1000;
 +            }
 +        } else if (!av_strcasecmp(cmd, "VideoBitRateRange")) {
 +            if (stream) {
 +                int minrate, maxrate;
 +
 +                get_arg(arg, sizeof(arg), &p);
 +
 +                if (sscanf(arg, "%d-%d", &minrate, &maxrate) == 2) {
 +                    video_enc.rc_min_rate = minrate * 1000;
 +                    video_enc.rc_max_rate = maxrate * 1000;
 +                } else {
 +                    ERROR("Incorrect format for VideoBitRateRange -- should be <min>-<max>: %s\n", arg);
 +                }
 +            }
 +        } else if (!av_strcasecmp(cmd, "Debug")) {
 +            if (stream) {
 +                get_arg(arg, sizeof(arg), &p);
 +                video_enc.debug = strtol(arg,0,0);
 +            }
 +        } else if (!av_strcasecmp(cmd, "Strict")) {
 +            if (stream) {
 +                get_arg(arg, sizeof(arg), &p);
 +                video_enc.strict_std_compliance = atoi(arg);
 +            }
 +        } else if (!av_strcasecmp(cmd, "VideoBufferSize")) {
 +            if (stream) {
 +                get_arg(arg, sizeof(arg), &p);
 +                video_enc.rc_buffer_size = atoi(arg) * 8*1024;
 +            }
 +        } else if (!av_strcasecmp(cmd, "VideoBitRateTolerance")) {
 +            if (stream) {
 +                get_arg(arg, sizeof(arg), &p);
 +                video_enc.bit_rate_tolerance = atoi(arg) * 1000;
 +            }
 +        } else if (!av_strcasecmp(cmd, "VideoBitRate")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +                video_enc.bit_rate = atoi(arg) * 1000;
 +            }
 +        } else if (!av_strcasecmp(cmd, "VideoSize")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +                av_parse_video_size(&video_enc.width, &video_enc.height, arg);
 +                if ((video_enc.width % 16) != 0 ||
 +                    (video_enc.height % 16) != 0) {
 +                    ERROR("Image size must be a multiple of 16\n");
 +                }
 +            }
 +        } else if (!av_strcasecmp(cmd, "VideoFrameRate")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +                AVRational frame_rate;
 +                if (av_parse_video_rate(&frame_rate, arg) < 0) {
 +                    ERROR("Incorrect frame rate: %s\n", arg);
 +                } else {
 +                    video_enc.time_base.num = frame_rate.den;
 +                    video_enc.time_base.den = frame_rate.num;
 +                }
 +            }
 +        } else if (!av_strcasecmp(cmd, "VideoGopSize")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream)
 +                video_enc.gop_size = atoi(arg);
 +        } else if (!av_strcasecmp(cmd, "VideoIntraOnly")) {
 +            if (stream)
 +                video_enc.gop_size = 1;
 +        } else if (!av_strcasecmp(cmd, "VideoHighQuality")) {
 +            if (stream)
 +                video_enc.mb_decision = FF_MB_DECISION_BITS;
 +        } else if (!av_strcasecmp(cmd, "Video4MotionVector")) {
 +            if (stream) {
 +                video_enc.mb_decision = FF_MB_DECISION_BITS; //FIXME remove
 +                video_enc.flags |= CODEC_FLAG_4MV;
 +            }
 +        } else if (!av_strcasecmp(cmd, "AVOptionVideo") ||
 +                   !av_strcasecmp(cmd, "AVOptionAudio")) {
 +            char arg2[1024];
 +            AVCodecContext *avctx;
 +            int type;
 +            get_arg(arg, sizeof(arg), &p);
 +            get_arg(arg2, sizeof(arg2), &p);
 +            if (!av_strcasecmp(cmd, "AVOptionVideo")) {
 +                avctx = &video_enc;
 +                type = AV_OPT_FLAG_VIDEO_PARAM;
 +            } else {
 +                avctx = &audio_enc;
 +                type = AV_OPT_FLAG_AUDIO_PARAM;
 +            }
 +            if (ffserver_opt_default(arg, arg2, avctx, type|AV_OPT_FLAG_ENCODING_PARAM)) {
 +                ERROR("AVOption error: %s %s\n", arg, arg2);
 +            }
 +        } else if (!av_strcasecmp(cmd, "AVPresetVideo") ||
 +                   !av_strcasecmp(cmd, "AVPresetAudio")) {
 +            AVCodecContext *avctx;
 +            int type;
 +            get_arg(arg, sizeof(arg), &p);
 +            if (!av_strcasecmp(cmd, "AVPresetVideo")) {
 +                avctx = &video_enc;
 +                video_enc.codec_id = video_id;
 +                type = AV_OPT_FLAG_VIDEO_PARAM;
 +            } else {
 +                avctx = &audio_enc;
 +                audio_enc.codec_id = audio_id;
 +                type = AV_OPT_FLAG_AUDIO_PARAM;
 +            }
 +            if (ffserver_opt_preset(arg, avctx, type|AV_OPT_FLAG_ENCODING_PARAM, &audio_id, &video_id)) {
 +                ERROR("AVPreset error: %s\n", arg);
 +            }
 +        } else if (!av_strcasecmp(cmd, "VideoTag")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if ((strlen(arg) == 4) && stream)
 +                video_enc.codec_tag = MKTAG(arg[0], arg[1], arg[2], arg[3]);
 +        } else if (!av_strcasecmp(cmd, "BitExact")) {
 +            if (stream)
 +                video_enc.flags |= CODEC_FLAG_BITEXACT;
 +        } else if (!av_strcasecmp(cmd, "DctFastint")) {
 +            if (stream)
 +                video_enc.dct_algo  = FF_DCT_FASTINT;
 +        } else if (!av_strcasecmp(cmd, "IdctSimple")) {
 +            if (stream)
 +                video_enc.idct_algo = FF_IDCT_SIMPLE;
 +        } else if (!av_strcasecmp(cmd, "Qscale")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +                video_enc.flags |= CODEC_FLAG_QSCALE;
 +                video_enc.global_quality = FF_QP2LAMBDA * atoi(arg);
 +            }
 +        } else if (!av_strcasecmp(cmd, "VideoQDiff")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +                video_enc.max_qdiff = atoi(arg);
 +                if (video_enc.max_qdiff < 1 || video_enc.max_qdiff > 31) {
 +                    ERROR("VideoQDiff out of range\n");
 +                }
 +            }
 +        } else if (!av_strcasecmp(cmd, "VideoQMax")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +                video_enc.qmax = atoi(arg);
 +                if (video_enc.qmax < 1 || video_enc.qmax > 31) {
 +                    ERROR("VideoQMax out of range\n");
 +                }
 +            }
 +        } else if (!av_strcasecmp(cmd, "VideoQMin")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +                video_enc.qmin = atoi(arg);
 +                if (video_enc.qmin < 1 || video_enc.qmin > 31) {
 +                    ERROR("VideoQMin out of range\n");
 +                }
 +            }
 +        } else if (!av_strcasecmp(cmd, "LumaElim")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream)
 +                video_enc.luma_elim_threshold = atoi(arg);
 +        } else if (!av_strcasecmp(cmd, "ChromaElim")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream)
 +                video_enc.chroma_elim_threshold = atoi(arg);
 +        } else if (!av_strcasecmp(cmd, "LumiMask")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream)
 +                video_enc.lumi_masking = atof(arg);
 +        } else if (!av_strcasecmp(cmd, "DarkMask")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream)
 +                video_enc.dark_masking = atof(arg);
 +        } else if (!av_strcasecmp(cmd, "NoVideo")) {
 +            video_id = CODEC_ID_NONE;
 +        } else if (!av_strcasecmp(cmd, "NoAudio")) {
 +            audio_id = CODEC_ID_NONE;
 +        } else if (!av_strcasecmp(cmd, "ACL")) {
 +            parse_acl_row(stream, feed, NULL, p, filename, line_num);
 +        } else if (!av_strcasecmp(cmd, "DynamicACL")) {
 +            if (stream) {
 +                get_arg(stream->dynamic_acl, sizeof(stream->dynamic_acl), &p);
 +            }
 +        } else if (!av_strcasecmp(cmd, "RTSPOption")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +                av_freep(&stream->rtsp_option);
 +                stream->rtsp_option = av_strdup(arg);
 +            }
 +        } else if (!av_strcasecmp(cmd, "MulticastAddress")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream) {
 +                if (resolve_host(&stream->multicast_ip, arg) != 0) {
 +                    ERROR("Invalid host/IP address: %s\n", arg);
 +                }
 +                stream->is_multicast = 1;
 +                stream->loop = 1; /* default is looping */
 +            }
 +        } else if (!av_strcasecmp(cmd, "MulticastPort")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream)
 +                stream->multicast_port = atoi(arg);
 +        } else if (!av_strcasecmp(cmd, "MulticastTTL")) {
 +            get_arg(arg, sizeof(arg), &p);
 +            if (stream)
 +                stream->multicast_ttl = atoi(arg);
 +        } else if (!av_strcasecmp(cmd, "NoLoop")) {
 +            if (stream)
 +                stream->loop = 0;
 +        } else if (!av_strcasecmp(cmd, "</Stream>")) {
 +            if (!stream) {
 +                ERROR("No corresponding <Stream> for </Stream>\n");
 +            } else {
 +                if (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm") != 0) {
 +                    if (audio_id != CODEC_ID_NONE) {
 +                        audio_enc.codec_type = AVMEDIA_TYPE_AUDIO;
 +                        audio_enc.codec_id = audio_id;
 +                        add_codec(stream, &audio_enc);
 +                    }
 +                    if (video_id != CODEC_ID_NONE) {
 +                        video_enc.codec_type = AVMEDIA_TYPE_VIDEO;
 +                        video_enc.codec_id = video_id;
 +                        add_codec(stream, &video_enc);
 +                    }
 +                }
 +                stream = NULL;
 +            }
 +        } else if (!av_strcasecmp(cmd, "<Redirect")) {
 +            /*********************************************/
 +            char *q;
 +            if (stream || feed || redirect) {
 +                ERROR("Already in a tag\n");
 +            } else {
 +                redirect = av_mallocz(sizeof(FFStream));
 +                *last_stream = redirect;
 +                last_stream = &redirect->next;
 +
 +                get_arg(redirect->filename, sizeof(redirect->filename), &p);
 +                q = strrchr(redirect->filename, '>');
 +                if (*q)
 +                    *q = '\0';
 +                redirect->stream_type = STREAM_TYPE_REDIRECT;
 +            }
 +        } else if (!av_strcasecmp(cmd, "URL")) {
 +            if (redirect)
 +                get_arg(redirect->feed_filename, sizeof(redirect->feed_filename), &p);
 +        } else if (!av_strcasecmp(cmd, "</Redirect>")) {
 +            if (!redirect) {
 +                ERROR("No corresponding <Redirect> for </Redirect>\n");
 +            } else {
 +                if (!redirect->feed_filename[0]) {
 +                    ERROR("No URL found for <Redirect>\n");
 +                }
 +                redirect = NULL;
 +            }
 +        } else if (!av_strcasecmp(cmd, "LoadModule")) {
 +            get_arg(arg, sizeof(arg), &p);
 +#if HAVE_DLOPEN
 +            load_module(arg);
 +#else
 +            ERROR("Module support not compiled into this version: '%s'\n", arg);
 +#endif
 +        } else {
 +            ERROR("Incorrect keyword: '%s'\n", cmd);
 +        }
 +    }
 +#undef ERROR
 +
 +    fclose(f);
 +    if (errors)
 +        return -1;
 +    else
 +        return 0;
 +}
 +
 +static void handle_child_exit(int sig)
 +{
 +    pid_t pid;
 +    int status;
 +
 +    while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
 +        FFStream *feed;
 +
 +        for (feed = first_feed; feed; feed = feed->next) {
 +            if (feed->pid == pid) {
 +                int uptime = time(0) - feed->pid_start;
 +
 +                feed->pid = 0;
 +                fprintf(stderr, "%s: Pid %d exited with status %d after %d seconds\n", feed->filename, pid, status, uptime);
 +
 +                if (uptime < 30)
 +                    /* Turn off any more restarts */
 +                    feed->child_argv = 0;
 +            }
 +        }
 +    }
 +
 +    need_to_start_children = 1;
 +}
 +
 +static void opt_debug(void)
 +{
 +    ffserver_debug = 1;
 +    ffserver_daemon = 0;
 +    logfilename[0] = '-';
 +}
 +
 +static int opt_help(const char *opt, const char *arg)
 +{
 +    printf("usage: ffserver [options]\n"
 +           "Hyper fast multi format Audio/Video streaming server\n");
 +    printf("\n");
 +    show_help_options(options, "Main options:\n", 0, 0);
 +    return 0;
 +}
 +
 +static const OptionDef options[] = {
 +#include "cmdutils_common_opts.h"
 +    { "n", OPT_BOOL, {(void *)&no_launch }, "enable no-launch mode" },
 +    { "d", 0, {(void*)opt_debug}, "enable debug mode" },
 +    { "f", HAS_ARG | OPT_STRING, {(void*)&config_filename }, "use configfile instead of /etc/ffserver.conf", "configfile" },
 +    { NULL },
 +};
 +
 +int main(int argc, char **argv)
 +{
 +    struct sigaction sigact;
 +
 +    parse_loglevel(argc, argv, options);
 +    av_register_all();
 +    avformat_network_init();
 +
 +    show_banner(argc, argv, options);
 +
 +    my_program_name = argv[0];
 +    my_program_dir = getcwd(0, 0);
 +    ffserver_daemon = 1;
 +
 +    parse_options(NULL, argc, argv, options, NULL);
 +
 +    unsetenv("http_proxy");             /* Kill the http_proxy */
 +
 +    av_lfg_init(&random_state, av_get_random_seed());
 +
 +    memset(&sigact, 0, sizeof(sigact));
 +    sigact.sa_handler = handle_child_exit;
 +    sigact.sa_flags = SA_NOCLDSTOP | SA_RESTART;
 +    sigaction(SIGCHLD, &sigact, 0);
 +
 +    if (parse_ffconfig(config_filename) < 0) {
 +        fprintf(stderr, "Incorrect config file - exiting.\n");
 +        exit(1);
 +    }
 +
 +    /* open log file if needed */
 +    if (logfilename[0] != '\0') {
 +        if (!strcmp(logfilename, "-"))
 +            logfile = stdout;
 +        else
 +            logfile = fopen(logfilename, "a");
 +        av_log_set_callback(http_av_log);
 +    }
 +
 +    build_file_streams();
 +
 +    build_feed_streams();
 +
 +    compute_bandwidth();
 +
 +    /* put the process in background and detach it from its TTY */
 +    if (ffserver_daemon) {
 +        int pid;
 +
 +        pid = fork();
 +        if (pid < 0) {
 +            perror("fork");
 +            exit(1);
 +        } else if (pid > 0) {
 +            /* parent : exit */
 +            exit(0);
 +        } else {
 +            /* child */
 +            setsid();
 +            close(0);
 +            open("/dev/null", O_RDWR);
 +            if (strcmp(logfilename, "-") != 0) {
 +                close(1);
 +                dup(0);
 +            }
 +            close(2);
 +            dup(0);
 +        }
 +    }
 +
 +    /* signal init */
 +    signal(SIGPIPE, SIG_IGN);
 +
 +    if (ffserver_daemon)
 +        chdir("/");
 +
 +    if (http_server() < 0) {
 +        http_log("Could not start server\n");
 +        exit(1);
 +    }
 +
 +    return 0;
 +}
@@@ -987,10 -985,10 +987,10 @@@ static int huffman_decode(MPADecodeCont
      /* skip extension bits */
      bits_left = end_pos2 - get_bits_count(&s->gb);
  //av_log(NULL, AV_LOG_ERROR, "left:%d buf:%p\n", bits_left, s->in_gb.buffer);
-     if (bits_left < 0 && (s->err_recognition & (AV_EF_BITSTREAM|AV_EF_COMPLIANT))) {
 -    if (bits_left < 0 && (s->err_recognition & AV_EF_BUFFER)) {
++    if (bits_left < 0 && (s->err_recognition & (AV_EF_BUFFER|AV_EF_COMPLIANT))) {
          av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
          s_index=0;
-     } else if (bits_left > 0 && (s->err_recognition & (AV_EF_BITSTREAM|AV_EF_AGGRESSIVE))) {
 -    } else if (bits_left > 0 && (s->err_recognition & AV_EF_BUFFER)) {
++    } else if (bits_left > 0 && (s->err_recognition & (AV_EF_BUFFER|AV_EF_AGGRESSIVE))) {
          av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
          s_index = 0;
      }
Simple merge
Simple merge
Simple merge
@@@ -477,7 -469,22 +477,23 @@@ static int update_context_from_user(AVC
  
      dst->frame_number     = src->frame_number;
      dst->reordered_opaque = src->reordered_opaque;
 +    dst->thread_safe_callbacks = src->thread_safe_callbacks;
+     if (src->slice_count && src->slice_offset) {
+         if (dst->slice_count < src->slice_count) {
+             int *tmp = av_realloc(dst->slice_offset, src->slice_count *
+                                   sizeof(*dst->slice_offset));
+             if (!tmp) {
+                 av_free(dst->slice_offset);
+                 return AVERROR(ENOMEM);
+             }
+             dst->slice_offset = tmp;
+         }
+         memcpy(dst->slice_offset, src->slice_offset,
+                src->slice_count * sizeof(*dst->slice_offset));
+     }
+     dst->slice_count = src->slice_count;
+     return 0;
  #undef copy_fields
  }
  
  #define MODE_IPOD 0x20
  
  typedef struct MOVIentry {
-     unsigned int size;
      uint64_t     pos;
+     int64_t      dts;
+     unsigned int size;
      unsigned int samplesInChunk;
 +    unsigned int chunkNum;              ///< Chunk number if the current entry is a chunk start otherwise 0
      unsigned int entries;
      int          cts;
-     int64_t      dts;
  #define MOV_SYNC_SAMPLE         0x0001
  #define MOV_PARTIAL_SYNC_SAMPLE 0x0002
      uint32_t     flags;
@@@ -112,13 -109,15 +112,18 @@@ static const AVOption options[]=
  {"fdebug", "print specific debug info", OFFSET(debug), AV_OPT_TYPE_FLAGS, {.dbl = DEFAULT }, 0, INT_MAX, E|D, "fdebug"},
  {"ts", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_FDEBUG_TS }, INT_MIN, INT_MAX, E|D, "fdebug"},
  {"max_delay", "maximum muxing or demuxing delay in microseconds", OFFSET(max_delay), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, INT_MAX, E|D},
- {"fer", "set error detection aggressivity", OFFSET(error_recognition), AV_OPT_TYPE_INT, {.dbl = FF_ER_CAREFUL }, INT_MIN, INT_MAX, D, "fer"},
- {"careful", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_CAREFUL }, INT_MIN, INT_MAX, D, "fer"},
- {"explode", "abort decoding on error recognition", 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_EXPLODE }, INT_MIN, INT_MAX, D, "fer"},
  {"fpsprobesize", "number of frames used to probe fps", OFFSET(fps_probe_size), AV_OPT_TYPE_INT, {.dbl = -1}, -1, INT_MAX-1, D},
 +{"audio_preload", "microseconds by which audio packets should be interleaved earlier", OFFSET(audio_preload), AV_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX-1, E},
 +{"chunk_duration", "microseconds for each chunk", OFFSET(max_chunk_duration), AV_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX-1, E},
 +{"chunk_size", "size in bytes for each chunk", OFFSET(max_chunk_size), AV_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX-1, E},
+ /* this is a crutch for avconv, since it cannot deal with identically named options in different contexts.
+  * to be removed when avconv is fixed */