Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Oct 2011 00:23:36 +0000 (02:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Oct 2011 00:34:51 +0000 (02:34 +0200)
* qatar/master:
  presets: rename presets directory
  lavc: make avcodec_get_context_defaults3 "officially" public
  lavf: replace av_new_stream->avformat_new_stream part II.
  lavf,lavd: replace av_new_stream->avformat_new_stream part I.
  lavf: add avformat_new_stream as a replacement for av_new_stream.
  Use correct scaling table for bwd-pred MVs in second B-field
  Ut Video decoder
  Makefile: change presets extension to .avpreset
  lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
  lavfi: add testsrc source
  AVOptions: add documentation.
  presets: update libx264 ffpresets

Conflicts:
Changelog
doc/APIchanges
doc/ffmpeg.texi
ffpresets/libx264-ipod320.ffpreset
ffpresets/libx264-ipod640.ffpreset
ffserver.c
libavcodec/avcodec.h
libavcodec/options.c
libavcodec/version.h
libavdevice/libdc1394.c
libavfilter/avfilter.h
libavfilter/vsrc_testsrc.c
libavformat/flvdec.c
libavformat/riff.c
libavformat/version.h
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
178 files changed:
1  2 
Changelog
Makefile
avconv.c
doc/APIchanges
doc/avconv.texi
doc/examples/muxing.c
doc/ffmpeg.texi
doc/general.texi
ffmpeg.c
ffserver.c
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/options.c
libavcodec/vc1dec.c
libavcodec/version.h
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/fbdev.c
libavdevice/jack_audio.c
libavdevice/libcdio.c
libavdevice/libdc1394.c
libavdevice/oss_audio.c
libavdevice/sndio_dec.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavfilter/avfilter.h
libavfilter/vsrc_testsrc.c
libavformat/4xm.c
libavformat/aacdec.c
libavformat/aea.c
libavformat/aiffdec.c
libavformat/amr.c
libavformat/anm.c
libavformat/apc.c
libavformat/ape.c
libavformat/applehttp.c
libavformat/asfdec.c
libavformat/assdec.c
libavformat/au.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/avisynth.c
libavformat/avs.c
libavformat/bethsoftvid.c
libavformat/bfi.c
libavformat/bink.c
libavformat/c93.c
libavformat/cafdec.c
libavformat/cdg.c
libavformat/daud.c
libavformat/dfa.c
libavformat/dsicin.c
libavformat/dv.c
libavformat/dxa.c
libavformat/eacdata.c
libavformat/electronicarts.c
libavformat/ffmdec.c
libavformat/ffmetadec.c
libavformat/filmstripdec.c
libavformat/flacdec.c
libavformat/flic.c
libavformat/flvdec.c
libavformat/gxf.c
libavformat/idcin.c
libavformat/idroqdec.c
libavformat/iff.c
libavformat/img2.c
libavformat/ipmovie.c
libavformat/iss.c
libavformat/iv8.c
libavformat/ivfdec.c
libavformat/jvdec.c
libavformat/libnut.c
libavformat/lmlm4.c
libavformat/lxfdec.c
libavformat/matroskadec.c
libavformat/mm.c
libavformat/mmf.c
libavformat/mov.c
libavformat/mp3dec.c
libavformat/mpc.c
libavformat/mpc8.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/msnwc_tcp.c
libavformat/mtv.c
libavformat/mvi.c
libavformat/mxfdec.c
libavformat/mxg.c
libavformat/ncdec.c
libavformat/nsvdec.c
libavformat/nutdec.c
libavformat/nuv.c
libavformat/oggdec.c
libavformat/oma.c
libavformat/psxstr.c
libavformat/pva.c
libavformat/qcp.c
libavformat/r3d.c
libavformat/rawdec.c
libavformat/rdt.c
libavformat/riff.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/rsodec.c
libavformat/rtpenc_chain.c
libavformat/rtsp.c
libavformat/sapdec.c
libavformat/segafilm.c
libavformat/sierravmd.c
libavformat/siff.c
libavformat/smacker.c
libavformat/sol.c
libavformat/soxdec.c
libavformat/spdifdec.c
libavformat/srtdec.c
libavformat/swfdec.c
libavformat/thp.c
libavformat/tiertexseq.c
libavformat/tmv.c
libavformat/tta.c
libavformat/tty.c
libavformat/txd.c
libavformat/utils.c
libavformat/vc1test.c
libavformat/version.h
libavformat/vocdec.c
libavformat/vqf.c
libavformat/wav.c
libavformat/wc3movie.c
libavformat/westwood.c
libavformat/wtvdec.c
libavformat/wv.c
libavformat/xa.c
libavformat/xmv.c
libavformat/xwma.c
libavformat/yop.c
libavformat/yuv4mpeg.c
libavutil/opt.h
presets/libvpx-1080p.ffpreset
presets/libvpx-1080p50_60.ffpreset
presets/libvpx-360p.ffpreset
presets/libvpx-720p.ffpreset
presets/libvpx-720p50_60.ffpreset
presets/libx264-baseline.ffpreset
presets/libx264-fast.ffpreset
presets/libx264-fast_firstpass.ffpreset
presets/libx264-faster.ffpreset
presets/libx264-faster_firstpass.ffpreset
presets/libx264-ipod320.ffpreset
presets/libx264-ipod640.ffpreset
presets/libx264-lossless_fast.ffpreset
presets/libx264-lossless_max.ffpreset
presets/libx264-lossless_medium.ffpreset
presets/libx264-lossless_slow.ffpreset
presets/libx264-lossless_slower.ffpreset
presets/libx264-lossless_ultrafast.ffpreset
presets/libx264-main.ffpreset
presets/libx264-medium.ffpreset
presets/libx264-medium_firstpass.ffpreset
presets/libx264-placebo.ffpreset
presets/libx264-placebo_firstpass.ffpreset
presets/libx264-slow.ffpreset
presets/libx264-slow_firstpass.ffpreset
presets/libx264-slower.ffpreset
presets/libx264-slower_firstpass.ffpreset
presets/libx264-superfast.ffpreset
presets/libx264-superfast_firstpass.ffpreset
presets/libx264-ultrafast.ffpreset
presets/libx264-ultrafast_firstpass.ffpreset
presets/libx264-veryfast.ffpreset
presets/libx264-veryfast_firstpass.ffpreset
presets/libx264-veryslow.ffpreset
presets/libx264-veryslow_firstpass.ffpreset

diff --cc Changelog
+++ b/Changelog
@@@ -43,34 -41,46 +43,35 @@@ easier to use. The changes are
        '-preset <presetname>'.
      * -intra option was removed, it's equivalent to -g 0.
  - XMV demuxer
 +- LOAS demuxer
 +- ashowinfo filter added
  - Windows Media Image decoder
 +- amovie source added
  - LATM muxer/demuxer
 -- showinfo filter
 -- split filter
 +- Speex encoder via libspeex
 +- JSON output in ffprobe
 +- WTV muxer
 +- Optional C++ Support (needed for libstagefright)
 +- H.264 Decoding on Android via Stagefright
 +- Prores decoder
 +- BIN/XBIN/ADF/IDF text file decoder
 +- aconvert audio filter added
 +- audio support to lavfi input device added
  - libcdio-paranoia input device for audio CD grabbing
 -- select filter
  - Apple ProRes decoder
  - CELT in Ogg demuxing
 +- G.723.1 demuxer and decoder
 +- libmodplug support (--enable-libmodplug)
  - VC-1 interlaced decoding
 -- lut, lutrgb, and lutyuv filters
 -- boxblur filter
 +- libutvideo wrapper (--enable-libutvideo)
 +- aevalsrc audio source added
+ - Ut Video decoder
  
  
 -version 0.7:
 -
 -- E-AC-3 audio encoder
 -- ac3enc: add channel coupling support
 -- floating-point sample format support for (E-)AC-3, DCA, AAC, Vorbis decoders
 -- H.264/MPEG frame-level multithreading
 -- av_metadata_* functions renamed to av_dict_* and moved to libavutil
 -- 4:4:4 H.264 decoding support
 -- 10-bit H.264 optimizations for x86
 -- bump libswscale for recently reported ABI break
 +version 0.8:
  
  
 -version 0.7_beta2:
 -
 -- VP8 frame-level multithreading
 -- NEON optimizations for VP8
 -- removed a lot of deprecated API cruft
 -- FFT and IMDCT optimizations for AVX (Sandy Bridge) processors
 -- DPX image encoder
 -- SMPTE 302M AES3 audio decoder
 -- ffmpeg no longer quits after the 'q' key is pressed; use 'ctrl+c' instead
 -- 9bit and 10bit per sample support in the H.264 decoder
 -
 -
 -version 0.7_beta1:
 -
 +- many many things we forgot because we rather write code than changelogs
  - WebM support in Matroska de/muxer
  - low overhead Ogg muxing
  - MMS-TCP support
diff --cc Makefile
+++ b/Makefile
@@@ -38,7 -78,7 +38,7 @@@ FFLIBS-$(CONFIG_SWSCALE)  += swscal
  
  FFLIBS := avutil
  
- DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset)
 -DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
++DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset)
  
  SKIPHEADERS = cmdutils_common_opts.h
  
diff --cc avconv.c
Simple merge
diff --cc doc/APIchanges
@@@ -13,9 -13,9 +13,12 @@@ libavutil:   2011-04-1
  
  API changes, most recent first:
  
 +2011-10-20 - b35e9e1 - lavu 51.22.0
 +  Add av_strtok() to avstring.h.
 +
+ 2011-10-xx - xxxxxxx - lavf 53.10.0
+   Add avformat_new_stream(). Deprecate av_new_stream().
  2011-xx-xx - xxxxxxx - lavf 53.9.0
    Add AVFMT_NO_BYTE_SEEK AVInputFormat flag.
  
diff --cc doc/avconv.texi
Simple merge
Simple merge
diff --cc doc/ffmpeg.texi
@@@ -873,7 -791,7 +873,7 @@@ A preset file contains a sequence of @v
  one for each line, specifying a sequence of options which would be
  awkward to specify on the command line. Lines starting with the hash
  ('#') character are ignored and are used to provide comments. Check
- the @file{ffpresets} directory in the FFmpeg source tree for examples.
 -the @file{presets} directory in the Libav source tree for examples.
++the @file{presets} directory in the FFmpeg source tree for examples.
  
  Preset files are specified with the @code{vpre}, @code{apre},
  @code{spre}, and @code{fpre} options. The @code{fpre} option takes the
Simple merge
diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -3184,225 -3350,108 +3184,228 @@@ static int opt_input_file(OptionsContex
      return 0;
  }
  
 -static void check_inputs(int *has_video_ptr,
 -                         int *has_audio_ptr,
 -                         int *has_subtitle_ptr,
 -                         int *has_data_ptr)
 +static void parse_forced_key_frames(char *kf, OutputStream *ost)
  {
 -    int has_video, has_audio, has_subtitle, has_data, i, j;
 -    AVFormatContext *ic;
 +    char *p;
 +    int n = 1, i;
  
 -    has_video = 0;
 -    has_audio = 0;
 -    has_subtitle = 0;
 -    has_data = 0;
 +    for (p = kf; *p; p++)
 +        if (*p == ',')
 +            n++;
 +    ost->forced_kf_count = n;
 +    ost->forced_kf_pts = av_malloc(sizeof(*ost->forced_kf_pts) * n);
 +    if (!ost->forced_kf_pts) {
 +        av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
 +        exit_program(1);
 +    }
 +    for (i = 0; i < n; i++) {
 +        p = i ? strchr(p, ',') + 1 : kf;
 +        ost->forced_kf_pts[i] = parse_time_or_die("force_key_frames", p, 1);
 +    }
 +}
  
 -    for(j=0;j<nb_input_files;j++) {
 -        ic = input_files[j].ctx;
 -        for(i=0;i<ic->nb_streams;i++) {
 -            AVCodecContext *enc = ic->streams[i]->codec;
 -            switch(enc->codec_type) {
 -            case AVMEDIA_TYPE_AUDIO:
 -                has_audio = 1;
 -                break;
 -            case AVMEDIA_TYPE_VIDEO:
 -                has_video = 1;
 -                break;
 -            case AVMEDIA_TYPE_SUBTITLE:
 -                has_subtitle = 1;
 -                break;
 -            case AVMEDIA_TYPE_DATA:
 -            case AVMEDIA_TYPE_ATTACHMENT:
 -            case AVMEDIA_TYPE_UNKNOWN:
 -                has_data = 1;
 -                break;
 -            default:
 -                abort();
 -            }
 +static uint8_t *get_line(AVIOContext *s)
 +{
 +    AVIOContext *line;
 +    uint8_t *buf;
 +    char c;
 +
 +    if (avio_open_dyn_buf(&line) < 0) {
 +        av_log(NULL, AV_LOG_FATAL, "Could not alloc buffer for reading preset.\n");
 +        exit_program(1);
 +    }
 +
 +    while ((c = avio_r8(s)) && c != '\n')
 +        avio_w8(line, c);
 +    avio_w8(line, 0);
 +    avio_close_dyn_buf(line, &buf);
 +
 +    return buf;
 +}
 +
 +static int get_preset_file_2(const char *preset_name, const char *codec_name, AVIOContext **s)
 +{
 +    int i, ret = 1;
 +    char filename[1000];
 +    const char *base[3] = { getenv("AVCONV_DATADIR"),
 +                            getenv("HOME"),
 +                            AVCONV_DATADIR,
 +                            };
 +
 +    for (i = 0; i < FF_ARRAY_ELEMS(base) && ret; i++) {
 +        if (!base[i])
 +            continue;
 +        if (codec_name) {
 +            snprintf(filename, sizeof(filename), "%s%s/%s-%s.avpreset", base[i],
 +                     i != 1 ? "" : "/.avconv", codec_name, preset_name);
 +            ret = avio_open(s, filename, AVIO_FLAG_READ);
 +        }
 +        if (ret) {
 +            snprintf(filename, sizeof(filename), "%s%s/%s.avpreset", base[i],
 +                     i != 1 ? "" : "/.avconv", preset_name);
 +            ret = avio_open(s, filename, AVIO_FLAG_READ);
          }
      }
 -    *has_video_ptr = has_video;
 -    *has_audio_ptr = has_audio;
 -    *has_subtitle_ptr = has_subtitle;
 -    *has_data_ptr = has_data;
 +    return ret;
  }
  
 -static void new_video_stream(AVFormatContext *oc, int file_idx)
 +static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, enum AVMediaType type)
  {
 -    AVStream *st;
      OutputStream *ost;
-     AVStream *st = av_new_stream(oc, oc->nb_streams < o->nb_streamid_map ? o->streamid_map[oc->nb_streams] : 0);
 -    AVCodecContext *video_enc;
 -    enum CodecID codec_id = CODEC_ID_NONE;
 -    AVCodec *codec= NULL;
++    AVStream *st = avformat_new_stream(oc, NULL);
 +    int idx      = oc->nb_streams - 1, ret = 0;
 +    int64_t max_frames = INT64_MAX;
 +    char *bsf = NULL, *next, *codec_tag = NULL;
 +    AVBitStreamFilterContext *bsfc, *bsfc_prev = NULL;
 +    double qscale = -1;
 +    char *buf = NULL, *arg = NULL, *preset = NULL;
 +    AVIOContext *s = NULL;
  
 -    if(!video_stream_copy){
 -        if (video_codec_name) {
 -            codec_id = find_codec_or_die(video_codec_name, AVMEDIA_TYPE_VIDEO, 1);
 -            codec = avcodec_find_encoder_by_name(video_codec_name);
 -        } else {
 -            codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
 -            codec = avcodec_find_encoder(codec_id);
 +    if (!st) {
 +        av_log(NULL, AV_LOG_FATAL, "Could not alloc stream.\n");
 +        exit_program(1);
 +    }
 +
++    if (oc->nb_streams - 1 < o->nb_streamid_map)
++        st->id = o->streamid_map[oc->nb_streams - 1];
++
 +    output_streams = grow_array(output_streams, sizeof(*output_streams), &nb_output_streams,
 +                                nb_output_streams + 1);
 +    ost = &output_streams[nb_output_streams - 1];
 +    ost->file_index = nb_output_files;
 +    ost->index = idx;
 +    ost->st    = st;
 +    st->codec->codec_type = type;
 +    ost->enc = choose_codec(o, oc, st, type);
 +    if (ost->enc) {
 +        ost->opts  = filter_codec_opts(codec_opts, ost->enc->id, oc, st);
 +    }
 +
 +    avcodec_get_context_defaults3(st->codec, ost->enc);
 +    st->codec->codec_type = type; // XXX hack, avcodec_get_context_defaults2() sets type to unknown for stream copy
 +
 +    MATCH_PER_STREAM_OPT(presets, str, preset, oc, st);
 +    if (preset && (!(ret = get_preset_file_2(preset, ost->enc->name, &s)))) {
 +        do  {
 +            buf = get_line(s);
 +            if (!buf[0] || buf[0] == '#') {
 +                av_free(buf);
 +                continue;
 +            }
 +            if (!(arg = strchr(buf, '='))) {
 +                av_log(NULL, AV_LOG_FATAL, "Invalid line found in the preset file.\n");
 +                exit_program(1);
 +            }
 +            *arg++ = 0;
 +            av_dict_set(&ost->opts, buf, arg, AV_DICT_DONT_OVERWRITE);
 +            av_free(buf);
 +        } while (!s->eof_reached);
 +        avio_close(s);
 +    }
 +    if (ret) {
 +        av_log(NULL, AV_LOG_FATAL,
 +               "Preset %s specified for stream %d:%d, but could not be opened.\n",
 +               preset, ost->file_index, ost->index);
 +        exit_program(1);
 +    }
 +
 +    MATCH_PER_STREAM_OPT(max_frames, i64, max_frames, oc, st);
 +    ost->max_frames = max_frames;
 +
 +    MATCH_PER_STREAM_OPT(bitstream_filters, str, bsf, oc, st);
 +    while (bsf) {
 +        if (next = strchr(bsf, ','))
 +            *next++ = 0;
 +        if (!(bsfc = av_bitstream_filter_init(bsf))) {
 +            av_log(NULL, AV_LOG_FATAL, "Unknown bitstream filter %s\n", bsf);
 +            exit_program(1);
          }
 +        if (bsfc_prev)
 +            bsfc_prev->next = bsfc;
 +        else
 +            ost->bitstream_filters = bsfc;
 +
 +        bsfc_prev = bsfc;
 +        bsf       = next;
      }
  
 -    ost = new_output_stream(oc, file_idx, codec);
 -    st  = ost->st;
 -    if (!video_stream_copy) {
 -        ost->frame_aspect_ratio = frame_aspect_ratio;
 -        frame_aspect_ratio = 0;
 -#if CONFIG_AVFILTER
 -        ost->avfilter= vfilters;
 -        vfilters = NULL;
 -#endif
 +    MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, oc, st);
 +    if (codec_tag) {
 +        uint32_t tag = strtol(codec_tag, &next, 0);
 +        if (*next)
 +            tag = AV_RL32(codec_tag);
 +        st->codec->codec_tag = tag;
      }
  
 -    ost->bitstream_filters = video_bitstream_filters;
 -    video_bitstream_filters= NULL;
 +    MATCH_PER_STREAM_OPT(qscale, dbl, qscale, oc, st);
 +    if (qscale >= 0 || same_quant) {
 +        st->codec->flags |= CODEC_FLAG_QSCALE;
 +        st->codec->global_quality = FF_QP2LAMBDA * qscale;
 +    }
 +
 +    if (oc->oformat->flags & AVFMT_GLOBALHEADER)
 +        st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
 +
 +    av_opt_get_int(sws_opts, "sws_flags", 0, &ost->sws_flags);
 +    return ost;
 +}
 +
 +static void parse_matrix_coeffs(uint16_t *dest, const char *str)
 +{
 +    int i;
 +    const char *p = str;
 +    for(i = 0;; i++) {
 +        dest[i] = atoi(p);
 +        if(i == 63)
 +            break;
 +        p = strchr(p, ',');
 +        if(!p) {
 +            av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
 +            exit_program(1);
 +        }
 +        p++;
 +    }
 +}
  
 -    st->codec->thread_count= thread_count;
 +static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
 +{
 +    AVStream *st;
 +    OutputStream *ost;
 +    AVCodecContext *video_enc;
  
 +    ost = new_output_stream(o, oc, AVMEDIA_TYPE_VIDEO);
 +    st  = ost->st;
      video_enc = st->codec;
  
 -    if(video_codec_tag)
 -        video_enc->codec_tag= video_codec_tag;
 +    if (!st->stream_copy) {
 +        const char *p = NULL;
 +        char *forced_key_frames = NULL, *frame_rate = NULL, *frame_size = NULL;
 +        char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL;
 +        char *intra_matrix = NULL, *inter_matrix = NULL, *filters = NULL;
 +        int i, force_fps = 0, top_field_first = -1;
  
 -    if(oc->oformat->flags & AVFMT_GLOBALHEADER) {
 -        video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
 -    }
 +        MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st);
 +        if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) {
 +            av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate);
 +            exit_program(1);
 +        }
  
 -    video_enc->codec_type = AVMEDIA_TYPE_VIDEO;
 -    if (video_stream_copy) {
 -        st->stream_copy = 1;
 -        video_enc->sample_aspect_ratio =
 -        st->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255);
 -    } else {
 -        const char *p;
 -        int i;
 +        MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st);
 +        if (frame_size && av_parse_video_size(&video_enc->width, &video_enc->height, frame_size) < 0) {
 +            av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size);
 +            exit_program(1);
 +        }
  
 -        if (frame_rate.num)
 -            ost->frame_rate = frame_rate;
 -        video_enc->codec_id = codec_id;
 +        MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st);
 +        if (frame_aspect_ratio)
 +            ost->frame_aspect_ratio = parse_frame_aspect_ratio(frame_aspect_ratio);
  
 -        video_enc->width = frame_width;
 -        video_enc->height = frame_height;
 -        video_enc->pix_fmt = frame_pix_fmt;
 +        video_enc->bits_per_raw_sample = frame_bits_per_raw_sample;
 +        MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st);
 +        if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == PIX_FMT_NONE) {
 +            av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt);
 +            exit_program(1);
 +        }
          st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
  
          if (intra_only)
diff --cc ffserver.c
@@@ -4233,9 -4233,9 +4233,10 @@@ static int parse_ffconfig(const char *f
                      }
                  }
  
 -                stream->fmt = avserver_guess_format(NULL, stream->filename, NULL);
 -                avcodec_get_context_defaults3(&video_enc, NULL);
 -                avcodec_get_context_defaults3(&audio_enc, NULL);
 +                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) {
Simple merge
Simple merge
@@@ -210,9 -210,9 +210,10 @@@ enum CodecID 
      CODEC_ID_DFA,
      CODEC_ID_WMV3IMAGE,
      CODEC_ID_VC1IMAGE,
 -    CODEC_ID_G723_1,
 -    CODEC_ID_G729,
 -    CODEC_ID_UTVIDEO,
 +    CODEC_ID_8SVX_RAW,
 +    CODEC_ID_G2M,
++    CODEC_ID_UTVIDEO_DEPRECATED,
 +    CODEC_ID_UTVIDEO = 0x800,
  
      /* various PCM "codecs" */
      CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
@@@ -532,37 -531,32 +532,41 @@@ static const AVClass av_codec_context_c
      .child_class_next        = codec_child_class_next,
  };
  
+ #if FF_API_ALLOC_CONTEXT
  void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType codec_type){
 -    avcodec_get_context_defaults3(s, NULL);
++    AVCodec c= {0};
++    c.type= codec_type;
++    avcodec_get_context_defaults3(s, &c);
+ }
+ #endif
+ int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec){
 +    int flags=0;
      memset(s, 0, sizeof(AVCodecContext));
  
-     s->av_class= &av_codec_context_class;
+     s->av_class = &av_codec_context_class;
  
-     s->codec_type = codec_type;
-     if(codec_type == AVMEDIA_TYPE_AUDIO)
+     s->codec_type = codec ? codec->type : AVMEDIA_TYPE_UNKNOWN;
 -    av_opt_set_defaults(s);
++    if(s->codec_type == AVMEDIA_TYPE_AUDIO)
 +        flags= AV_OPT_FLAG_AUDIO_PARAM;
-     else if(codec_type == AVMEDIA_TYPE_VIDEO)
++    else if(s->codec_type == AVMEDIA_TYPE_VIDEO)
 +        flags= AV_OPT_FLAG_VIDEO_PARAM;
-     else if(codec_type == AVMEDIA_TYPE_SUBTITLE)
++    else if(s->codec_type == AVMEDIA_TYPE_SUBTITLE)
 +        flags= AV_OPT_FLAG_SUBTITLE_PARAM;
 +    av_opt_set_defaults2(s, flags, flags);
  
-     s->time_base= (AVRational){0,1};
-     s->get_buffer= avcodec_default_get_buffer;
-     s->release_buffer= avcodec_default_release_buffer;
-     s->get_format= avcodec_default_get_format;
-     s->execute= avcodec_default_execute;
-     s->execute2= avcodec_default_execute2;
-     s->sample_aspect_ratio= (AVRational){0,1};
-     s->pix_fmt= PIX_FMT_NONE;
-     s->sample_fmt= AV_SAMPLE_FMT_NONE;
+     s->time_base           = (AVRational){0,1};
+     s->get_buffer          = avcodec_default_get_buffer;
+     s->release_buffer      = avcodec_default_release_buffer;
+     s->get_format          = avcodec_default_get_format;
+     s->execute             = avcodec_default_execute;
+     s->execute2            = avcodec_default_execute2;
+     s->sample_aspect_ratio = (AVRational){0,1};
+     s->pix_fmt             = PIX_FMT_NONE;
+     s->sample_fmt          = AV_SAMPLE_FMT_NONE;
  
-     s->reget_buffer= avcodec_default_reget_buffer;
-     s->reordered_opaque= AV_NOPTS_VALUE;
- }
- int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec){
-     avcodec_get_context_defaults2(s, codec ? codec->type : AVMEDIA_TYPE_UNKNOWN);
+     s->reget_buffer        = avcodec_default_reget_buffer;
+     s->reordered_opaque    = AV_NOPTS_VALUE;
      if(codec && codec->priv_data_size){
          if(!s->priv_data){
              s->priv_data= av_mallocz(codec->priv_data_size);
Simple merge
@@@ -21,7 -21,7 +21,7 @@@
  #define AVCODEC_VERSION_H
  
  #define LIBAVCODEC_VERSION_MAJOR 53
- #define LIBAVCODEC_VERSION_MINOR 21
 -#define LIBAVCODEC_VERSION_MINOR  13
++#define LIBAVCODEC_VERSION_MINOR 22
  #define LIBAVCODEC_VERSION_MICRO  0
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@@ -59,9 -58,9 +59,9 @@@ static av_cold int audio_read_header(AV
      AVStream *st;
      int ret;
      enum CodecID codec_id;
 -    snd_pcm_sw_params_t *sw_params;
 +    double o;
  
-     st = av_new_stream(s1, 0);
+     st = avformat_new_stream(s1, NULL);
      if (!st) {
          av_log(s1, AV_LOG_ERROR, "Cannot add stream\n");
  
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -253,9 -160,11 +253,9 @@@ static int dc1394_read_header(AVFormatC
      }
  
      /* create a video stream */
-     vst = av_new_stream(c, 0);
+     vst = avformat_new_stream(c, NULL);
 -    if (!vst) {
 -        ret = AVERROR(ENOMEM);
 -        goto out;
 -    }
 +    if (!vst)
 +        goto out_camera;
      av_set_pts_info(vst, 64, 1, 1000);
      vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
      vst->codec->codec_id = CODEC_ID_RAWVIDEO;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/rational.h"
  
  #define LIBAVFILTER_VERSION_MAJOR  2
 -#define LIBAVFILTER_VERSION_MINOR  13
 -#define LIBAVFILTER_VERSION_MICRO  0
 +#define LIBAVFILTER_VERSION_MINOR 44
- #define LIBAVFILTER_VERSION_MICRO  0
++#define LIBAVFILTER_VERSION_MICRO  1
  
  #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                 LIBAVFILTER_VERSION_MINOR, \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -64,9 -62,9 +64,9 @@@ static int cdata_read_header(AVFormatCo
      };
  
      sample_rate = avio_rb16(pb);
 -    avio_skip(pb, 12);
 +    avio_skip(pb, (avio_r8(pb) & 0x20) ? 15 : 11);
  
-     st = av_new_stream(s, 0);
+     st = avformat_new_stream(s, NULL);
      if (!st)
          return AVERROR(ENOMEM);
      st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -346,18 -353,12 +346,19 @@@ static int flv_read_metabody(AVFormatCo
      return 0;
  }
  
 -static AVStream *create_stream(AVFormatContext *s, int is_audio){
 +static AVStream *create_stream(AVFormatContext *s, int stream_type){
-     AVStream *st = av_new_stream(s, stream_type);
+     AVStream *st = avformat_new_stream(s, NULL);
      if (!st)
          return NULL;
 -    st->id = is_audio;
 -    st->codec->codec_type = is_audio ? AVMEDIA_TYPE_AUDIO : AVMEDIA_TYPE_VIDEO;
++    st->id = stream_type;
 +    switch(stream_type) {
 +        case FLV_STREAM_TYPE_VIDEO:    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;    break;
 +        case FLV_STREAM_TYPE_AUDIO:    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;    break;
 +        case FLV_STREAM_TYPE_DATA:
 +            st->codec->codec_type = AVMEDIA_TYPE_DATA;
 +            st->codec->codec_id = CODEC_ID_NONE; // Going to rely on copy for now
 +            av_log(s, AV_LOG_DEBUG, "Data stream created\n");
 +    }
      av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */
      return st;
  }
Simple merge
Simple merge
Simple merge
@@@ -129,13 -112,10 +129,13 @@@ static int iff_read_header(AVFormatCont
      IffDemuxContext *iff = s->priv_data;
      AVIOContext *pb = s->pb;
      AVStream *st;
 +    uint8_t *buf;
      uint32_t chunk_id, data_size;
 -    int compression = -1;
 +    uint32_t screenmode = 0;
 +    unsigned transparency = 0;
 +    unsigned masking = 0; // no mask
  
-     st = av_new_stream(s, 0);
+     st = avformat_new_stream(s, NULL);
      if (!st)
          return AVERROR(ENOMEM);
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -537,12 -532,12 +537,13 @@@ static int mpegps_read_packet(AVFormatC
          goto redo;
      }
      /* no stream found: add a new stream */
-     st = av_new_stream(s, startcode);
+     st = avformat_new_stream(s, NULL);
      if (!st)
          goto skip;
+     st->id = startcode;
      st->codec->codec_type = type;
      st->codec->codec_id = codec_id;
 +    st->request_probe     = request_probe;
      if (codec_id != CODEC_ID_PCM_S16BE)
          st->need_parsing = AVSTREAM_PARSE_FULL;
   found:
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -277,14 -275,10 +277,14 @@@ const AVCodecTag ff_codec_bmp_tags[] = 
      { CODEC_ID_DPX,          MKTAG('d', 'p', 'x', ' ') },
      { CODEC_ID_KGV1,         MKTAG('K', 'G', 'V', '1') },
      { CODEC_ID_LAGARITH,     MKTAG('L', 'A', 'G', 'S') },
 +    { CODEC_ID_G2M,          MKTAG('G', '2', 'M', '2') },
 +    { CODEC_ID_G2M,          MKTAG('G', '2', 'M', '3') },
 +    { CODEC_ID_G2M,          MKTAG('G', '2', 'M', '4') },
 +    { CODEC_ID_AMV,          MKTAG('A', 'M', 'V', 'F') },
+     { CODEC_ID_UTVIDEO,      MKTAG('U', 'L', 'R', 'A') },
+     { CODEC_ID_UTVIDEO,      MKTAG('U', 'L', 'R', 'G') },
      { CODEC_ID_UTVIDEO,      MKTAG('U', 'L', 'Y', '0') },
      { CODEC_ID_UTVIDEO,      MKTAG('U', 'L', 'Y', '2') },
-     { CODEC_ID_UTVIDEO,      MKTAG('U', 'L', 'R', 'G') },
-     { CODEC_ID_UTVIDEO,      MKTAG('U', 'L', 'R', 'A') },
      { CODEC_ID_NONE,         0 }
  };
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -24,8 -24,8 +24,8 @@@
  #include "libavutil/avutil.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 53
- #define LIBAVFORMAT_VERSION_MINOR 16
- #define LIBAVFORMAT_VERSION_MICRO  1
 -#define LIBAVFORMAT_VERSION_MINOR 10
++#define LIBAVFORMAT_VERSION_MINOR 17
+ #define LIBAVFORMAT_VERSION_MICRO  0
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index af0b711,0000000..88587c4
mode 100644,000000..100644
--- /dev/null
@@@ -1,1037 -1,0 +1,1038 @@@
-     st = av_new_stream(s, 0);
 +/*
 + * Windows Television (WTV) demuxer
 + * Copyright (c) 2010-2011 Peter Ross <pross@xvid.org>
 + *
 + * 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
 + * Windows Television (WTV) demuxer
 + * @author Peter Ross <pross@xvid.org>
 + */
 +
 +#include "libavutil/intreadwrite.h"
 +#include "libavutil/intfloat_readwrite.h"
 +#include "avformat.h"
 +#include "internal.h"
 +#include "wtv.h"
 +#include "mpegts.h"
 +#include <strings.h>
 +
 +/* Macros for formating GUIDs */
 +#define PRI_PRETTY_GUID \
 +    "%08x-%04x-%04x-%02x%02x%02x%02x%02x%02x%02x%02x"
 +#define ARG_PRETTY_GUID(g) \
 +    AV_RL32(g),AV_RL16(g+4),AV_RL16(g+6),g[8],g[9],g[10],g[11],g[12],g[13],g[14],g[15]
 +#define LEN_PRETTY_GUID 34
 +
 +/*
 + *
 + * File system routines
 + *
 + */
 +
 +typedef struct {
 +    AVIOContext *pb_filesystem;  /** file system (AVFormatContext->pb) */
 +
 +    int sector_bits;     /** sector shift bits; used to convert sector number into pb_filesystem offset */
 +    uint32_t *sectors;   /** file allocation table */
 +    int nb_sectors;      /** number of sectors */
 +
 +    int error;
 +    int64_t position;
 +    int64_t length;
 +} WtvFile;
 +
 +/**
 + * @return bytes read, 0 on end of file, or <0 on error
 + */
 +static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size)
 +{
 +    WtvFile *wf = opaque;
 +    AVIOContext *pb = wf->pb_filesystem;
 +    int nread = 0;
 +
 +    if (wf->error || pb->error)
 +        return -1;
 +    if (wf->position >= wf->length || url_feof(pb))
 +        return 0;
 +
 +    buf_size = FFMIN(buf_size, wf->length - wf->position);
 +    while(nread < buf_size) {
 +        int n;
 +        int remaining_in_sector = (1 << wf->sector_bits) - (wf->position & ((1 << wf->sector_bits) - 1));
 +        int read_request        = FFMIN(buf_size - nread, remaining_in_sector);
 +
 +        n = avio_read(pb, buf, read_request);
 +        if (n <= 0)
 +            break;
 +        nread += n;
 +        buf += n;
 +        wf->position += n;
 +        if (n == remaining_in_sector) {
 +            int i = wf->position >> wf->sector_bits;
 +            if (i >= wf->nb_sectors ||
 +                (wf->sectors[i] != wf->sectors[i - 1] + (1 << (wf->sector_bits - WTV_SECTOR_BITS)) &&
 +                avio_seek(pb, (int64_t)wf->sectors[i] << WTV_SECTOR_BITS, SEEK_SET) < 0)) {
 +                wf->error = 1;
 +                break;
 +            }
 +        }
 +    }
 +    return nread;
 +}
 +
 +/**
 + * @return position (or file length)
 + */
 +static int64_t wtvfile_seek(void *opaque, int64_t offset, int whence)
 +{
 +    WtvFile *wf = opaque;
 +    AVIOContext *pb = wf->pb_filesystem;
 +
 +    if (whence == AVSEEK_SIZE)
 +        return wf->length;
 +    else if (whence == SEEK_CUR)
 +        offset = wf->position + offset;
 +    else if (whence == SEEK_END)
 +        offset = wf->length;
 +
 +    wf->error = offset < 0 || offset >= wf->length ||
 +                avio_seek(pb, ((int64_t)wf->sectors[offset >> wf->sector_bits] << WTV_SECTOR_BITS)
 +                              + (offset & ((1 << wf->sector_bits) - 1)), SEEK_SET) < 0;
 +    wf->position = offset;
 +    return offset;
 +}
 +
 +/**
 + * read non-zero integers (le32) from input stream
 + * @param pb
 + * @param[out] data destination
 + * @param     count maximum number of integers to read
 + * @return    total number of integers read
 + */
 +static int read_ints(AVIOContext *pb, uint32_t *data, int count)
 +{
 +    int i, total = 0;
 +    for (i = 0; i < count; i++) {
 +        if ((data[total] = avio_rl32(pb)))
 +           total++;
 +    }
 +    return total;
 +}
 +
 +/**
 + * Open file
 + * @param first_sector  First sector
 + * @param length        Length of file (bytes)
 + * @param depth         File allocation table depth
 + * @return NULL on error
 + */
 +static AVIOContext * wtvfile_open_sector(int first_sector, uint64_t length, int depth, AVFormatContext *s)
 +{
 +    AVIOContext *pb;
 +    WtvFile *wf;
 +    uint8_t *buffer;
 +
 +    if (avio_seek(s->pb, first_sector << WTV_SECTOR_BITS, SEEK_SET) < 0)
 +        return NULL;
 +
 +    wf = av_mallocz(sizeof(WtvFile));
 +    if (!wf)
 +        return NULL;
 +
 +    if (depth == 0) {
 +        wf->sectors = av_malloc(sizeof(uint32_t));
 +        if (!wf->sectors) {
 +            av_free(wf);
 +            return NULL;
 +        }
 +        wf->sectors[0]  = first_sector;
 +        wf->nb_sectors  = 1;
 +    } else if (depth == 1) {
 +        wf->sectors = av_malloc(WTV_SECTOR_SIZE);
 +        if (!wf->sectors) {
 +            av_free(wf);
 +            return NULL;
 +        }
 +        wf->nb_sectors  = read_ints(s->pb, wf->sectors, WTV_SECTOR_SIZE / 4);
 +    } else if (depth == 2) {
 +        uint32_t sectors1[WTV_SECTOR_SIZE / 4];
 +        int nb_sectors1 = read_ints(s->pb, sectors1, WTV_SECTOR_SIZE / 4);
 +        int i;
 +
 +        wf->sectors = av_malloc(nb_sectors1 << WTV_SECTOR_BITS);
 +        if (!wf->sectors) {
 +            av_free(wf);
 +            return NULL;
 +        }
 +        wf->nb_sectors = 0;
 +        for (i = 0; i < nb_sectors1; i++) {
 +            if (avio_seek(s->pb, (int64_t)sectors1[i] << WTV_SECTOR_BITS, SEEK_SET) < 0)
 +                break;
 +            wf->nb_sectors += read_ints(s->pb, wf->sectors + i * WTV_SECTOR_SIZE / 4, WTV_SECTOR_SIZE / 4);
 +        }
 +    } else {
 +        av_log(s, AV_LOG_ERROR, "unsupported file allocation table depth (0x%x)\n", depth);
 +        av_free(wf);
 +        return NULL;
 +    }
 +    wf->sector_bits = length & (1ULL<<63) ? WTV_SECTOR_BITS : WTV_BIGSECTOR_BITS;
 +
 +    if (!wf->nb_sectors) {
 +        av_free(wf->sectors);
 +        av_free(wf);
 +        return NULL;
 +    }
 +
 +    /* check length */
 +    length &= 0xFFFFFFFFFFFF;
 +    if (length > ((int64_t)wf->nb_sectors << wf->sector_bits)) {
 +        av_log(s, AV_LOG_WARNING, "reported file length (0x%"PRIx64") exceeds number of available sectors (0x%"PRIx64")\n", length, (int64_t)wf->nb_sectors << wf->sector_bits);
 +        length = (int64_t)wf->nb_sectors <<  wf->sector_bits;
 +    }
 +    wf->length = length;
 +
 +    /* seek to intial sector */
 +    wf->position = 0;
 +    if (avio_seek(s->pb, (int64_t)wf->sectors[0] << WTV_SECTOR_BITS, SEEK_SET) < 0) {
 +        av_free(wf->sectors);
 +        av_free(wf);
 +        return NULL;
 +    }
 +
 +    wf->pb_filesystem = s->pb;
 +    buffer = av_malloc(1 << wf->sector_bits);
 +    if (!buffer) {
 +        av_free(wf->sectors);
 +        av_free(wf);
 +        return NULL;
 +    }
 +
 +    pb = avio_alloc_context(buffer, 1 << wf->sector_bits, 0, wf,
 +                           wtvfile_read_packet, NULL, wtvfile_seek);
 +    if (!pb) {
 +        av_free(buffer);
 +        av_free(wf->sectors);
 +        av_free(wf);
 +    }
 +    return pb;
 +}
 +
 +/**
 + * Open file using filename
 + * @param[in]  buf       directory buffer
 + * @param      buf_size  directory buffer size
 + * @param[in]  filename
 + * @param      filename_size size of filename
 + * @return NULL on error
 + */
 +static AVIOContext * wtvfile_open2(AVFormatContext *s, const uint8_t *buf, int buf_size, const uint8_t *filename, int filename_size)
 +{
 +    const uint8_t *buf_end = buf + buf_size;
 +
 +    while(buf + 48 <= buf_end) {
 +        int dir_length, name_size, first_sector, depth;
 +        uint64_t file_length;
 +        const uint8_t *name;
 +        if (ff_guidcmp(buf, ff_dir_entry_guid)) {
 +            av_log(s, AV_LOG_ERROR, "unknown guid "FF_PRI_GUID", expected dir_entry_guid; "
 +                   "remaining directory entries ignored\n", FF_ARG_GUID(buf));
 +            break;
 +        }
 +        dir_length  = AV_RL16(buf + 16);
 +        file_length = AV_RL64(buf + 24);
 +        name_size   = 2 * AV_RL32(buf + 32);
 +        if (buf + 48 + name_size > buf_end) {
 +            av_log(s, AV_LOG_ERROR, "filename exceeds buffer size; remaining directory entries ignored\n");
 +            break;
 +        }
 +        first_sector = AV_RL32(buf + 40 + name_size);
 +        depth        = AV_RL32(buf + 44 + name_size);
 +
 +        /* compare file name; test optional null terminator */
 +        name = buf + 40;
 +        if (name_size >= filename_size &&
 +            !memcmp(name, filename, filename_size) &&
 +            (name_size < filename_size + 2 || !AV_RN16(name + filename_size)))
 +            return wtvfile_open_sector(first_sector, file_length, depth, s);
 +
 +        buf += dir_length;
 +    }
 +    return 0;
 +}
 +
 +#define wtvfile_open(s, buf, buf_size, filename) \
 +    wtvfile_open2(s, buf, buf_size, filename, sizeof(filename))
 +
 +/**
 + * Close file opened with wtvfile_open_sector(), or wtv_open()
 + */
 +static void wtvfile_close(AVIOContext *pb)
 +{
 +    WtvFile *wf = pb->opaque;
 +    av_free(wf->sectors);
 +    av_free(pb);
 +}
 +
 +/*
 + *
 + * Main demuxer
 + *
 + */
 +
 +typedef struct {
 +    int seen_data;
 +} WtvStream;
 +
 +typedef struct {
 +    AVIOContext *pb;       /** timeline file */
 +    int64_t epoch;
 +    int64_t pts;             /** pts for next data chunk */
 +    int64_t last_valid_pts;  /** latest valid pts, used for interative seeking */
 +
 +    /* maintain private seek index, as the AVIndexEntry->pos is relative to the
 +       start of the 'timeline' file, not the file system (AVFormatContext->pb) */
 +    AVIndexEntry *index_entries;
 +    int nb_index_entries;
 +    unsigned int index_entries_allocated_size;
 +} WtvContext;
 +
 +/* WTV GUIDs */
 +static const ff_asf_guid EVENTID_SubtitleSpanningEvent =
 +    {0x48,0xC0,0xCE,0x5D,0xB9,0xD0,0x63,0x41,0x87,0x2C,0x4F,0x32,0x22,0x3B,0xE8,0x8A};
 +static const ff_asf_guid EVENTID_LanguageSpanningEvent =
 +    {0x6D,0x66,0x92,0xE2,0x02,0x9C,0x8D,0x44,0xAA,0x8D,0x78,0x1A,0x93,0xFD,0xC3,0x95};
 +static const ff_asf_guid EVENTID_AudioDescriptorSpanningEvent =
 +    {0x1C,0xD4,0x7B,0x10,0xDA,0xA6,0x91,0x46,0x83,0x69,0x11,0xB2,0xCD,0xAA,0x28,0x8E};
 +static const ff_asf_guid EVENTID_CtxADescriptorSpanningEvent =
 +    {0xE6,0xA2,0xB4,0x3A,0x47,0x42,0x34,0x4B,0x89,0x6C,0x30,0xAF,0xA5,0xD2,0x1C,0x24};
 +static const ff_asf_guid EVENTID_CSDescriptorSpanningEvent =
 +    {0xD9,0x79,0xE7,0xEf,0xF0,0x97,0x86,0x47,0x80,0x0D,0x95,0xCF,0x50,0x5D,0xDC,0x66};
 +static const ff_asf_guid EVENTID_DVBScramblingControlSpanningEvent =
 +    {0xC4,0xE1,0xD4,0x4B,0xA1,0x90,0x09,0x41,0x82,0x36,0x27,0xF0,0x0E,0x7D,0xCC,0x5B};
 +static const ff_asf_guid EVENTID_StreamIDSpanningEvent =
 +    {0x68,0xAB,0xF1,0xCA,0x53,0xE1,0x41,0x4D,0xA6,0xB3,0xA7,0xC9,0x98,0xDB,0x75,0xEE};
 +static const ff_asf_guid EVENTID_TeletextSpanningEvent =
 +    {0x50,0xD9,0x99,0x95,0x33,0x5F,0x17,0x46,0xAF,0x7C,0x1E,0x54,0xB5,0x10,0xDA,0xA3};
 +static const ff_asf_guid EVENTID_AudioTypeSpanningEvent =
 +    {0xBE,0xBF,0x1C,0x50,0x49,0xB8,0xCE,0x42,0x9B,0xE9,0x3D,0xB8,0x69,0xFB,0x82,0xB3};
 +
 +/* Windows media GUIDs */
 +
 +/* Media types */
 +static const ff_asf_guid mediasubtype_mpeg1payload =
 +    {0x81,0xEB,0x36,0xE4,0x4F,0x52,0xCE,0x11,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70};
 +static const ff_asf_guid mediatype_mpeg2_sections =
 +    {0x6C,0x17,0x5F,0x45,0x06,0x4B,0xCE,0x47,0x9A,0xEF,0x8C,0xAE,0xF7,0x3D,0xF7,0xB5};
 +static const ff_asf_guid mediatype_mpeg2_pes =
 +    {0x20,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA};
 +static const ff_asf_guid mediatype_mstvcaption =
 +    {0x89,0x8A,0x8B,0xB8,0x49,0xB0,0x80,0x4C,0xAD,0xCF,0x58,0x98,0x98,0x5E,0x22,0xC1};
 +
 +/* Media subtypes */
 +static const ff_asf_guid mediasubtype_dvb_subtitle =
 +    {0xC3,0xCB,0xFF,0x34,0xB3,0xD5,0x71,0x41,0x90,0x02,0xD4,0xC6,0x03,0x01,0x69,0x7F};
 +static const ff_asf_guid mediasubtype_teletext =
 +    {0xE3,0x76,0x2A,0xF7,0x0A,0xEB,0xD0,0x11,0xAC,0xE4,0x00,0x00,0xC0,0xCC,0x16,0xBA};
 +static const ff_asf_guid mediasubtype_dtvccdata =
 +    {0xAA,0xDD,0x2A,0xF5,0xF0,0x36,0xF5,0x43,0x95,0xEA,0x6D,0x86,0x64,0x84,0x26,0x2A};
 +static const ff_asf_guid mediasubtype_mpeg2_sections =
 +    {0x79,0x85,0x9F,0x4A,0xF8,0x6B,0x92,0x43,0x8A,0x6D,0xD2,0xDD,0x09,0xFA,0x78,0x61};
 +
 +/* Formats */
 +static const ff_asf_guid format_videoinfo2 =
 +    {0xA0,0x76,0x2A,0xF7,0x0A,0xEB,0xD0,0x11,0xAC,0xE4,0x00,0x00,0xC0,0xCC,0x16,0xBA};
 +
 +static int read_probe(AVProbeData *p)
 +{
 +    return ff_guidcmp(p->buf, ff_wtv_guid) ? 0 : AVPROBE_SCORE_MAX;
 +}
 +
 +/**
 + * Convert win32 FILETIME to ISO-8601 string
 + */
 +static void filetime_to_iso8601(char *buf, int buf_size, int64_t value)
 +{
 +    time_t t = (value / 10000000LL) - 11644473600LL;
 +    strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", gmtime(&t));
 +}
 +
 +/**
 + * Convert crazy time (100ns since 1 Jan 0001) to ISO-8601 string
 + */
 +static void crazytime_to_iso8601(char *buf, int buf_size, int64_t value)
 +{
 +    time_t t = (value / 10000000LL) - 719162LL*86400LL;
 +    strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", gmtime(&t));
 +}
 +
 +/**
 + * Convert OLE DATE to ISO-8601 string
 + * @return <0 on error
 + */
 +static int oledate_to_iso8601(char *buf, int buf_size, int64_t value)
 +{
 +    time_t t = (av_int2dbl(value) - 25569.0) * 86400;
 +    struct tm *result= gmtime(&t);
 +    if (!result)
 +        return -1;
 +    strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", result);
 +    return 0;
 +}
 +
 +static void get_attachment(AVFormatContext *s, AVIOContext *pb, int length)
 +{
 +    char mime[1024];
 +    char description[1024];
 +    unsigned int filesize;
 +    AVStream *st;
 +    int64_t pos = avio_tell(pb);
 +
 +    avio_get_str16le(pb, INT_MAX, mime, sizeof(mime));
 +    if (strcmp(mime, "image/jpeg"))
 +        goto done;
 +
 +    avio_r8(pb);
 +    avio_get_str16le(pb, INT_MAX, description, sizeof(description));
 +    filesize = avio_rl32(pb);
 +    if (!filesize)
 +        goto done;
 +
-         st = av_new_stream(s, sid);
++    st = avformat_new_stream(s, NULL);
 +    if (!st)
 +        goto done;
 +    av_dict_set(&st->metadata, "title", description, 0);
 +    st->codec->codec_id   = CODEC_ID_MJPEG;
 +    st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
 +    st->codec->extradata  = av_mallocz(filesize);
 +    if (!st->codec->extradata)
 +        goto done;
 +    st->codec->extradata_size = filesize;
 +    avio_read(pb, st->codec->extradata, filesize);
 +done:
 +    avio_seek(pb, pos + length, SEEK_SET);
 +}
 +
 +static void get_tag(AVFormatContext *s, AVIOContext *pb, const char *key, int type, int length)
 +{
 +    int buf_size = FFMAX(2*length, LEN_PRETTY_GUID) + 1;
 +    char *buf = av_malloc(buf_size);
 +    if (!buf)
 +        return;
 +
 +    if (type == 0 && length == 4) {
 +        snprintf(buf, buf_size, "%"PRIi32, avio_rl32(pb));
 +    } else if (type == 1) {
 +        avio_get_str16le(pb, length, buf, buf_size);
 +        if (!strlen(buf)) {
 +           av_free(buf);
 +           return;
 +        }
 +    } else if (type == 3 && length == 4) {
 +        strcpy(buf, avio_rl32(pb) ? "true" : "false");
 +    } else if (type == 4 && length == 8) {
 +        int64_t num = avio_rl64(pb);
 +        if (!strcmp(key, "WM/EncodingTime") ||
 +            !strcmp(key, "WM/MediaOriginalBroadcastDateTime"))
 +            filetime_to_iso8601(buf, buf_size, num);
 +        else if (!strcmp(key, "WM/WMRVEncodeTime") ||
 +                 !strcmp(key, "WM/WMRVEndTime"))
 +            crazytime_to_iso8601(buf, buf_size, num);
 +        else if (!strcmp(key, "WM/WMRVExpirationDate")) {
 +            if (oledate_to_iso8601(buf, buf_size, num) < 0 ) {
 +                av_free(buf);
 +                return;
 +            }
 +        } else if (!strcmp(key, "WM/WMRVBitrate"))
 +            snprintf(buf, buf_size, "%f", av_int2dbl(num));
 +        else
 +            snprintf(buf, buf_size, "%"PRIi64, num);
 +    } else if (type == 5 && length == 2) {
 +        snprintf(buf, buf_size, "%"PRIi16, avio_rl16(pb));
 +    } else if (type == 6 && length == 16) {
 +        ff_asf_guid guid;
 +        avio_read(pb, guid, 16);
 +        snprintf(buf, buf_size, PRI_PRETTY_GUID, ARG_PRETTY_GUID(guid));
 +    } else if (type == 2 && !strcmp(key, "WM/Picture")) {
 +        get_attachment(s, pb, length);
 +        av_freep(&buf);
 +        return;
 +    } else {
 +        av_freep(&buf);
 +        av_log(s, AV_LOG_WARNING, "unsupported metadata entry; key:%s, type:%d, length:0x%x\n", key, type, length);
 +        avio_skip(pb, length);
 +        return;
 +    }
 +
 +    av_dict_set(&s->metadata, key, buf, 0);
 +    av_freep(&buf);
 +}
 +
 +/**
 + * Parse metadata entries
 + */
 +static void parse_legacy_attrib(AVFormatContext *s, AVIOContext *pb)
 +{
 +    ff_asf_guid guid;
 +    int length, type;
 +    while(!url_feof(pb)) {
 +        char key[1024];
 +        ff_get_guid(pb, &guid);
 +        type   = avio_rl32(pb);
 +        length = avio_rl32(pb);
 +        if (!length)
 +            break;
 +        if (ff_guidcmp(&guid, ff_metadata_guid)) {
 +            av_log(s, AV_LOG_WARNING, "unknown guid "FF_PRI_GUID", expected metadata_guid; "
 +                   "remaining metadata entries ignored\n", FF_ARG_GUID(guid));
 +            break;
 +        }
 +        avio_get_str16le(pb, INT_MAX, key, sizeof(key));
 +        get_tag(s, pb, key, type, length);
 +    }
 +
 +    ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv);
 +}
 +
 +/**
 + * parse VIDEOINFOHEADER2 structure
 + * @return bytes consumed
 + */
 +static int parse_videoinfoheader2(AVFormatContext *s, AVStream *st)
 +{
 +    WtvContext *wtv = s->priv_data;
 +    AVIOContext *pb = wtv->pb;
 +
 +    avio_skip(pb, 72);  // picture aspect ratio is unreliable
 +    ff_get_bmp_header(pb, st);
 +
 +    return 72 + 40;
 +}
 +
 +/**
 + * Parse MPEG1WAVEFORMATEX extradata structure
 + */
 +static void parse_mpeg1waveformatex(AVStream *st)
 +{
 +    /* fwHeadLayer */
 +    switch (AV_RL16(st->codec->extradata)) {
 +    case 0x0001 : st->codec->codec_id = CODEC_ID_MP1; break;
 +    case 0x0002 : st->codec->codec_id = CODEC_ID_MP2; break;
 +    case 0x0004 : st->codec->codec_id = CODEC_ID_MP3; break;
 +    }
 +
 +    st->codec->bit_rate = AV_RL32(st->codec->extradata + 2); /* dwHeadBitrate */
 +
 +    /* dwHeadMode */
 +    switch (AV_RL16(st->codec->extradata + 6)) {
 +    case 1 : case 2 : case 4 : st->codec->channels = 2; break;
 +    case 8 :                   st->codec->channels = 1; break;
 +    }
 +}
 +
 +/**
 + * Initialise stream
 + * @param st Stream to initialise, or NULL to create and initialise new stream
 + * @return NULL on error
 + */
 +static AVStream * new_stream(AVFormatContext *s, AVStream *st, int sid, int codec_type)
 +{
 +    if (st) {
 +        if (st->codec->extradata) {
 +            av_freep(&st->codec->extradata);
 +            st->codec->extradata_size = 0;
 +        }
 +    } else {
 +        WtvStream *wst = av_mallocz(sizeof(WtvStream));
 +        if (!wst)
 +            return NULL;
++        st = avformat_new_stream(s, NULL);
 +        if (!st)
 +            return NULL;
++        st->id = sid;
 +        st->priv_data = wst;
 +    }
 +    st->codec->codec_type = codec_type;
 +    st->need_parsing      = AVSTREAM_PARSE_FULL;
 +    av_set_pts_info(st, 64, 1, 10000000);
 +    return st;
 +}
 +
 +/**
 + * parse Media Type structure and populate stream
 + * @param st         Stream, or NULL to create new stream
 + * @param mediatype  Mediatype GUID
 + * @param subtype    Subtype GUID
 + * @param formattype Format GUID
 + * @param size       Size of format buffer
 + * @return NULL on error
 + */
 +static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid,
 +                                   ff_asf_guid mediatype, ff_asf_guid subtype,
 +                                   ff_asf_guid formattype, int size)
 +{
 +    WtvContext *wtv = s->priv_data;
 +    AVIOContext *pb = wtv->pb;
 +    if (!ff_guidcmp(subtype, ff_mediasubtype_cpfilters_processed) &&
 +        !ff_guidcmp(formattype, ff_format_cpfilters_processed)) {
 +        ff_asf_guid actual_subtype;
 +        ff_asf_guid actual_formattype;
 +
 +        if (size < 32) {
 +            av_log(s, AV_LOG_WARNING, "format buffer size underflow\n");
 +            avio_skip(pb, size);
 +            return NULL;
 +        }
 +
 +        avio_skip(pb, size - 32);
 +        ff_get_guid(pb, &actual_subtype);
 +        ff_get_guid(pb, &actual_formattype);
 +        avio_seek(pb, -size, SEEK_CUR);
 +
 +        st = parse_media_type(s, st, sid, mediatype, actual_subtype, actual_formattype, size - 32);
 +        avio_skip(pb, 32);
 +        return st;
 +    } else if (!ff_guidcmp(mediatype, ff_mediatype_audio)) {
 +        st = new_stream(s, st, sid, AVMEDIA_TYPE_AUDIO);
 +        if (!st)
 +            return NULL;
 +        if (!ff_guidcmp(formattype, ff_format_waveformatex)) {
 +            int ret = ff_get_wav_header(pb, st->codec, size);
 +            if (ret < 0)
 +                return NULL;
 +        } else {
 +            if (ff_guidcmp(formattype, ff_format_none))
 +                av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype));
 +            avio_skip(pb, size);
 +        }
 +
 +        if (!memcmp(subtype + 4, (const uint8_t[]){FF_MEDIASUBTYPE_BASE_GUID}, 12)) {
 +            st->codec->codec_id = ff_wav_codec_get_id(AV_RL32(subtype), st->codec->bits_per_coded_sample);
 +        } else if (!ff_guidcmp(subtype, mediasubtype_mpeg1payload)) {
 +            if (st->codec->extradata && st->codec->extradata_size >= 22)
 +                parse_mpeg1waveformatex(st);
 +            else
 +                av_log(s, AV_LOG_WARNING, "MPEG1WAVEFORMATEX underflow\n");
 +        } else {
 +            st->codec->codec_id = ff_codec_guid_get_id(ff_codec_wav_guids, subtype);
 +            if (st->codec->codec_id == CODEC_ID_NONE)
 +                av_log(s, AV_LOG_WARNING, "unknown subtype:"FF_PRI_GUID"\n", FF_ARG_GUID(subtype));
 +        }
 +        return st;
 +    } else if (!ff_guidcmp(mediatype, ff_mediatype_video)) {
 +        st = new_stream(s, st, sid, AVMEDIA_TYPE_VIDEO);
 +        if (!st)
 +            return NULL;
 +        if (!ff_guidcmp(formattype, format_videoinfo2)) {
 +            int consumed = parse_videoinfoheader2(s, st);
 +            avio_skip(pb, FFMAX(size - consumed, 0));
 +        } else if (!ff_guidcmp(formattype, ff_format_mpeg2_video)) {
 +            int consumed = parse_videoinfoheader2(s, st);
 +            avio_skip(pb, FFMAX(size - consumed, 0));
 +        } else {
 +            if (ff_guidcmp(formattype, ff_format_none))
 +                av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype));
 +            avio_skip(pb, size);
 +        }
 +
 +        if (!memcmp(subtype + 4, (const uint8_t[]){FF_MEDIASUBTYPE_BASE_GUID}, 12)) {
 +            st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(subtype));
 +        } else {
 +            st->codec->codec_id = ff_codec_guid_get_id(ff_video_guids, subtype);
 +        }
 +        if (st->codec->codec_id == CODEC_ID_NONE)
 +            av_log(s, AV_LOG_WARNING, "unknown subtype:"FF_PRI_GUID"\n", FF_ARG_GUID(subtype));
 +        return st;
 +    } else if (!ff_guidcmp(mediatype, mediatype_mpeg2_pes) &&
 +               !ff_guidcmp(subtype, mediasubtype_dvb_subtitle)) {
 +        st = new_stream(s, st, sid, AVMEDIA_TYPE_SUBTITLE);
 +        if (!st)
 +            return NULL;
 +        if (ff_guidcmp(formattype, ff_format_none))
 +            av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype));
 +        avio_skip(pb, size);
 +        st->codec->codec_id = CODEC_ID_DVB_SUBTITLE;
 +        return st;
 +    } else if (!ff_guidcmp(mediatype, mediatype_mstvcaption) &&
 +               (!ff_guidcmp(subtype, mediasubtype_teletext) || !ff_guidcmp(subtype, mediasubtype_dtvccdata))) {
 +        st = new_stream(s, st, sid, AVMEDIA_TYPE_SUBTITLE);
 +        if (!st)
 +            return NULL;
 +        if (ff_guidcmp(formattype, ff_format_none))
 +            av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype));
 +        avio_skip(pb, size);
 +        st->codec->codec_id   = CODEC_ID_DVB_TELETEXT;
 +        return st;
 +    } else if (!ff_guidcmp(mediatype, mediatype_mpeg2_sections) &&
 +               !ff_guidcmp(subtype, mediasubtype_mpeg2_sections)) {
 +        if (ff_guidcmp(formattype, ff_format_none))
 +            av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype));
 +        avio_skip(pb, size);
 +        return NULL;
 +    }
 +
 +    av_log(s, AV_LOG_WARNING, "unknown media type, mediatype:"FF_PRI_GUID
 +                              ", subtype:"FF_PRI_GUID", formattype:"FF_PRI_GUID"\n",
 +                              FF_ARG_GUID(mediatype), FF_ARG_GUID(subtype), FF_ARG_GUID(formattype));
 +    avio_skip(pb, size);
 +    return NULL;
 +}
 +
 +enum {
 +    SEEK_TO_DATA = 0,
 +    SEEK_TO_PTS,
 +};
 +
 +/**
 + * Parse WTV chunks
 + * @param mode SEEK_TO_DATA or SEEK_TO_PTS
 + * @param seekts timestamp
 + * @param[out] len_ptr Length of data chunk
 + * @return stream index of data chunk, or <0 on error
 + */
 +static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_ptr)
 +{
 +    WtvContext *wtv = s->priv_data;
 +    AVIOContext *pb = wtv->pb;
 +    while (!url_feof(pb)) {
 +        ff_asf_guid g;
 +        int len, sid, consumed;
 +
 +        ff_get_guid(pb, &g);
 +        len = avio_rl32(pb);
 +        if (len < 32)
 +            break;
 +        sid = avio_rl32(pb) & 0x7FFF;
 +        avio_skip(pb, 8);
 +        consumed = 32;
 +
 +        if (!ff_guidcmp(g, ff_stream_guid)) {
 +            if (ff_find_stream_index(s, sid) < 0) {
 +                ff_asf_guid mediatype, subtype, formattype;
 +                int size;
 +                avio_skip(pb, 28);
 +                ff_get_guid(pb, &mediatype);
 +                ff_get_guid(pb, &subtype);
 +                avio_skip(pb, 12);
 +                ff_get_guid(pb, &formattype);
 +                size = avio_rl32(pb);
 +                parse_media_type(s, 0, sid, mediatype, subtype, formattype, size);
 +                consumed += 92 + size;
 +            }
 +        } else if (!ff_guidcmp(g, ff_stream2_guid)) {
 +            int stream_index = ff_find_stream_index(s, sid);
 +            if (stream_index >= 0 && !((WtvStream*)s->streams[stream_index]->priv_data)->seen_data) {
 +                ff_asf_guid mediatype, subtype, formattype;
 +                int size;
 +                avio_skip(pb, 12);
 +                ff_get_guid(pb, &mediatype);
 +                ff_get_guid(pb, &subtype);
 +                avio_skip(pb, 12);
 +                ff_get_guid(pb, &formattype);
 +                size = avio_rl32(pb);
 +                parse_media_type(s, s->streams[stream_index], sid, mediatype, subtype, formattype, size);
 +                consumed += 76 + size;
 +            }
 +        } else if (!ff_guidcmp(g, EVENTID_AudioDescriptorSpanningEvent) ||
 +                   !ff_guidcmp(g, EVENTID_CtxADescriptorSpanningEvent) ||
 +                   !ff_guidcmp(g, EVENTID_CSDescriptorSpanningEvent) ||
 +                   !ff_guidcmp(g, EVENTID_StreamIDSpanningEvent) ||
 +                   !ff_guidcmp(g, EVENTID_SubtitleSpanningEvent) ||
 +                   !ff_guidcmp(g, EVENTID_TeletextSpanningEvent)) {
 +            int stream_index = ff_find_stream_index(s, sid);
 +            if (stream_index >= 0) {
 +                AVStream *st = s->streams[stream_index];
 +                uint8_t buf[258];
 +                const uint8_t *pbuf = buf;
 +                int buf_size;
 +
 +                avio_skip(pb, 8);
 +                consumed += 8;
 +                if (!ff_guidcmp(g, EVENTID_CtxADescriptorSpanningEvent) ||
 +                    !ff_guidcmp(g, EVENTID_CSDescriptorSpanningEvent)) {
 +                    avio_skip(pb, 6);
 +                    consumed += 6;
 +                }
 +
 +                buf_size = FFMIN(len - consumed, sizeof(buf));
 +                avio_read(pb, buf, buf_size);
 +                consumed += buf_size;
 +                ff_parse_mpeg2_descriptor(s, st, 0, &pbuf, buf + buf_size, 0, 0, 0, 0);
 +            }
 +        } else if (!ff_guidcmp(g, EVENTID_AudioTypeSpanningEvent)) {
 +            int stream_index = ff_find_stream_index(s, sid);
 +            if (stream_index >= 0) {
 +                AVStream *st = s->streams[stream_index];
 +                int audio_type;
 +                avio_skip(pb, 8);
 +                audio_type = avio_r8(pb);
 +                if (audio_type == 2)
 +                    st->disposition |= AV_DISPOSITION_HEARING_IMPAIRED;
 +                else if (audio_type == 3)
 +                    st->disposition |= AV_DISPOSITION_VISUAL_IMPAIRED;
 +                consumed += 9;
 +            }
 +        } else if (!ff_guidcmp(g, EVENTID_DVBScramblingControlSpanningEvent)) {
 +            int stream_index = ff_find_stream_index(s, sid);
 +            if (stream_index >= 0) {
 +                avio_skip(pb, 12);
 +                if (avio_rl32(pb))
 +                    av_log(s, AV_LOG_WARNING, "DVB scrambled stream detected (st:%d), decoding will likely fail\n", stream_index);
 +                consumed += 16;
 +            }
 +        } else if (!ff_guidcmp(g, EVENTID_LanguageSpanningEvent)) {
 +            int stream_index = ff_find_stream_index(s, sid);
 +            if (stream_index >= 0) {
 +                AVStream *st = s->streams[stream_index];
 +                uint8_t language[4];
 +                avio_skip(pb, 12);
 +                avio_read(pb, language, 3);
 +                if (language[0]) {
 +                    language[3] = 0;
 +                    av_dict_set(&st->metadata, "language", language, 0);
 +                    if (!strcmp(language, "nar") || !strcmp(language, "NAR"))
 +                        st->disposition |= AV_DISPOSITION_VISUAL_IMPAIRED;
 +                }
 +                consumed += 15;
 +            }
 +        } else if (!ff_guidcmp(g, ff_timestamp_guid)) {
 +            int stream_index = ff_find_stream_index(s, sid);
 +            if (stream_index >= 0) {
 +                avio_skip(pb, 8);
 +                wtv->pts = avio_rl64(pb);
 +                consumed += 16;
 +                if (wtv->pts == -1)
 +                    wtv->pts = AV_NOPTS_VALUE;
 +                else {
 +                    wtv->last_valid_pts = wtv->pts;
 +                    if (wtv->epoch == AV_NOPTS_VALUE || wtv->pts < wtv->epoch)
 +                        wtv->epoch = wtv->pts;
 +                if (mode == SEEK_TO_PTS && wtv->pts >= seekts) {
 +                    avio_skip(pb, WTV_PAD8(len) - consumed);
 +                    return 0;
 +                }
 +                }
 +            }
 +        } else if (!ff_guidcmp(g, ff_data_guid)) {
 +            int stream_index = ff_find_stream_index(s, sid);
 +            if (mode == SEEK_TO_DATA && stream_index >= 0 && len > 32) {
 +                WtvStream *wst = s->streams[stream_index]->priv_data;
 +                wst->seen_data = 1;
 +                if (len_ptr) {
 +                    *len_ptr = len;
 +                }
 +                return stream_index;
 +            }
 +        } else if (
 +            !ff_guidcmp(g, /* DSATTRIB_CAPTURE_STREAMTIME */ (const ff_asf_guid){0x14,0x56,0x1A,0x0C,0xCD,0x30,0x40,0x4F,0xBC,0xBF,0xD0,0x3E,0x52,0x30,0x62,0x07}) ||
 +            !ff_guidcmp(g, /* DSATTRIB_PicSampleSeq */ (const ff_asf_guid){0x02,0xAE,0x5B,0x2F,0x8F,0x7B,0x60,0x4F,0x82,0xD6,0xE4,0xEA,0x2F,0x1F,0x4C,0x99}) ||
 +            !ff_guidcmp(g, /* DSATTRIB_TRANSPORT_PROPERTIES */ ff_DSATTRIB_TRANSPORT_PROPERTIES) ||
 +            !ff_guidcmp(g, /* dvr_ms_vid_frame_rep_data */ (const ff_asf_guid){0xCC,0x32,0x64,0xDD,0x29,0xE2,0xDB,0x40,0x80,0xF6,0xD2,0x63,0x28,0xD2,0x76,0x1F}) ||
 +            !ff_guidcmp(g, /* EVENTID_ChannelChangeSpanningEvent */ (const ff_asf_guid){0xE5,0xC5,0x67,0x90,0x5C,0x4C,0x05,0x42,0x86,0xC8,0x7A,0xFE,0x20,0xFE,0x1E,0xFA}) ||
 +            !ff_guidcmp(g, /* EVENTID_ChannelInfoSpanningEvent */ (const ff_asf_guid){0x80,0x6D,0xF3,0x41,0x32,0x41,0xC2,0x4C,0xB1,0x21,0x01,0xA4,0x32,0x19,0xD8,0x1B}) ||
 +            !ff_guidcmp(g, /* EVENTID_ChannelTypeSpanningEvent */ (const ff_asf_guid){0x51,0x1D,0xAB,0x72,0xD2,0x87,0x9B,0x48,0xBA,0x11,0x0E,0x08,0xDC,0x21,0x02,0x43}) ||
 +            !ff_guidcmp(g, /* EVENTID_PIDListSpanningEvent */ (const ff_asf_guid){0x65,0x8F,0xFC,0x47,0xBB,0xE2,0x34,0x46,0x9C,0xEF,0xFD,0xBF,0xE6,0x26,0x1D,0x5C}) ||
 +            !ff_guidcmp(g, /* EVENTID_SignalAndServiceStatusSpanningEvent */ (const ff_asf_guid){0xCB,0xC5,0x68,0x80,0x04,0x3C,0x2B,0x49,0xB4,0x7D,0x03,0x08,0x82,0x0D,0xCE,0x51}) ||
 +            !ff_guidcmp(g, /* EVENTID_StreamTypeSpanningEvent */ (const ff_asf_guid){0xBC,0x2E,0xAF,0x82,0xA6,0x30,0x64,0x42,0xA8,0x0B,0xAD,0x2E,0x13,0x72,0xAC,0x60}) ||
 +            !ff_guidcmp(g, (const ff_asf_guid){0x1E,0xBE,0xC3,0xC5,0x43,0x92,0xDC,0x11,0x85,0xE5,0x00,0x12,0x3F,0x6F,0x73,0xB9}) ||
 +            !ff_guidcmp(g, (const ff_asf_guid){0x3B,0x86,0xA2,0xB1,0xEB,0x1E,0xC3,0x44,0x8C,0x88,0x1C,0xA3,0xFF,0xE3,0xE7,0x6A}) ||
 +            !ff_guidcmp(g, (const ff_asf_guid){0x4E,0x7F,0x4C,0x5B,0xC4,0xD0,0x38,0x4B,0xA8,0x3E,0x21,0x7F,0x7B,0xBF,0x52,0xE7}) ||
 +            !ff_guidcmp(g, (const ff_asf_guid){0x63,0x36,0xEB,0xFE,0xA1,0x7E,0xD9,0x11,0x83,0x08,0x00,0x07,0xE9,0x5E,0xAD,0x8D}) ||
 +            !ff_guidcmp(g, (const ff_asf_guid){0x70,0xE9,0xF1,0xF8,0x89,0xA4,0x4C,0x4D,0x83,0x73,0xB8,0x12,0xE0,0xD5,0xF8,0x1E}) ||
 +            !ff_guidcmp(g, (const ff_asf_guid){0x96,0xC3,0xD2,0xC2,0x7E,0x9A,0xDA,0x11,0x8B,0xF7,0x00,0x07,0xE9,0x5E,0xAD,0x8D}) ||
 +            !ff_guidcmp(g, (const ff_asf_guid){0x97,0xC3,0xD2,0xC2,0x7E,0x9A,0xDA,0x11,0x8B,0xF7,0x00,0x07,0xE9,0x5E,0xAD,0x8D}) ||
 +            !ff_guidcmp(g, (const ff_asf_guid){0xA1,0xC3,0xD2,0xC2,0x7E,0x9A,0xDA,0x11,0x8B,0xF7,0x00,0x07,0xE9,0x5E,0xAD,0x8D})) {
 +            //ignore known guids
 +        } else
 +            av_log(s, AV_LOG_WARNING, "unsupported chunk:"FF_PRI_GUID"\n", FF_ARG_GUID(g));
 +
 +        avio_skip(pb, WTV_PAD8(len) - consumed);
 +    }
 +    return AVERROR_EOF;
 +}
 +
 +static int read_header(AVFormatContext *s, AVFormatParameters *ap)
 +{
 +    WtvContext *wtv = s->priv_data;
 +    int root_sector, root_size;
 +    uint8_t root[WTV_SECTOR_SIZE];
 +    AVIOContext *pb;
 +    int64_t timeline_pos;
 +    int ret;
 +
 +    wtv->epoch          =
 +    wtv->pts            =
 +    wtv->last_valid_pts = AV_NOPTS_VALUE;
 +
 +    /* read root directory sector */
 +    avio_skip(s->pb, 0x30);
 +    root_size = avio_rl32(s->pb);
 +    if (root_size > sizeof(root)) {
 +        av_log(s, AV_LOG_ERROR, "root directory size exceeds sector size\n");
 +        return AVERROR_INVALIDDATA;
 +    }
 +    avio_skip(s->pb, 4);
 +    root_sector = avio_rl32(s->pb);
 +
 +    avio_seek(s->pb, root_sector << WTV_SECTOR_BITS, SEEK_SET);
 +    root_size = avio_read(s->pb, root, root_size);
 +    if (root_size < 0)
 +        return AVERROR_INVALIDDATA;
 +
 +    /* parse chunks up until first data chunk */
 +    wtv->pb = wtvfile_open(s, root, root_size, ff_timeline_le16);
 +    if (!wtv->pb) {
 +        av_log(s, AV_LOG_ERROR, "timeline data missing\n");
 +        return AVERROR_INVALIDDATA;
 +    }
 +
 +    ret = parse_chunks(s, SEEK_TO_DATA, 0, 0);
 +    if (ret < 0)
 +        return ret;
 +    avio_seek(wtv->pb, -32, SEEK_CUR);
 +
 +    timeline_pos = avio_tell(s->pb); // save before opening another file
 +
 +    /* read metadata */
 +    pb = wtvfile_open(s, root, root_size, ff_table_0_entries_legacy_attrib_le16);
 +    if (pb) {
 +        parse_legacy_attrib(s, pb);
 +        wtvfile_close(pb);
 +    }
 +
 +    /* read seek index */
 +    if (s->nb_streams) {
 +        AVStream *st = s->streams[0];
 +        pb = wtvfile_open(s, root, root_size, ff_table_0_entries_time_le16);
 +        if (pb) {
 +            while(1) {
 +                uint64_t timestamp = avio_rl64(pb);
 +                uint64_t frame_nb  = avio_rl64(pb);
 +                if (url_feof(pb))
 +                    break;
 +                ff_add_index_entry(&wtv->index_entries, &wtv->nb_index_entries, &wtv->index_entries_allocated_size,
 +                                   0, timestamp, frame_nb, 0, AVINDEX_KEYFRAME);
 +            }
 +            wtvfile_close(pb);
 +
 +            if (wtv->nb_index_entries) {
 +                pb = wtvfile_open(s, root, root_size, ff_timeline_table_0_entries_Events_le16);
 +                if (pb) {
 +                    int i;
 +                    while (1) {
 +                        uint64_t frame_nb = avio_rl64(pb);
 +                        uint64_t position = avio_rl64(pb);
 +                        if (url_feof(pb))
 +                            break;
 +                        for (i = wtv->nb_index_entries - 1; i >= 0; i--) {
 +                            AVIndexEntry *e = wtv->index_entries + i;
 +                            if (frame_nb > e->size)
 +                                break;
 +                            if (position > e->pos)
 +                                e->pos = position;
 +                        }
 +                    }
 +                    wtvfile_close(pb);
 +                    st->duration = wtv->index_entries[wtv->nb_index_entries - 1].timestamp;
 +                }
 +            }
 +        }
 +    }
 +
 +    avio_seek(s->pb, timeline_pos, SEEK_SET);
 +    return 0;
 +}
 +
 +static int read_packet(AVFormatContext *s, AVPacket *pkt)
 +{
 +    WtvContext *wtv = s->priv_data;
 +    AVIOContext *pb = wtv->pb;
 +    int stream_index, len, ret;
 +
 +    stream_index = parse_chunks(s, SEEK_TO_DATA, 0, &len);
 +    if (stream_index < 0)
 +        return stream_index;
 +
 +    ret = av_get_packet(pb, pkt, len - 32);
 +    if (ret < 0)
 +        return ret;
 +    pkt->stream_index = stream_index;
 +    pkt->pts          = wtv->pts;
 +    avio_skip(pb, WTV_PAD8(len) - len);
 +    return 0;
 +}
 +
 +static int read_seek(AVFormatContext *s, int stream_index,
 +                     int64_t ts, int flags)
 +{
 +    WtvContext *wtv = s->priv_data;
 +    AVIOContext *pb = wtv->pb;
 +    AVStream *st = s->streams[0];
 +    int64_t ts_relative;
 +    int i;
 +
 +    if ((flags & AVSEEK_FLAG_FRAME) || (flags & AVSEEK_FLAG_BYTE))
 +        return AVERROR(ENOSYS);
 +
 +    /* timestamp adjustment is required because wtv->pts values are absolute,
 +     * whereas AVIndexEntry->timestamp values are relative to epoch. */
 +    ts_relative = ts;
 +    if (wtv->epoch != AV_NOPTS_VALUE)
 +        ts_relative -= wtv->epoch;
 +
 +    i = ff_index_search_timestamp(wtv->index_entries, wtv->nb_index_entries, ts_relative, flags);
 +    if (i < 0) {
 +        if (wtv->last_valid_pts == AV_NOPTS_VALUE || ts < wtv->last_valid_pts) {
 +            if (avio_seek(pb, 0, SEEK_SET) < 0)
 +                return -1;
 +        } else if (st->duration != AV_NOPTS_VALUE && ts_relative > st->duration && wtv->nb_index_entries) {
 +            if (avio_seek(pb, wtv->index_entries[wtv->nb_index_entries - 1].pos, SEEK_SET) < 0)
 +                return -1;
 +        }
 +        if (parse_chunks(s, SEEK_TO_PTS, ts, 0) < 0)
 +            return AVERROR(ERANGE);
 +        return 0;
 +    }
 +    if (avio_seek(pb, wtv->index_entries[i].pos, SEEK_SET) < 0)
 +        return -1;
 +    wtv->pts = wtv->index_entries[i].timestamp;
 +    if (wtv->epoch != AV_NOPTS_VALUE)
 +        wtv->pts += wtv->epoch;
 +    wtv->last_valid_pts = wtv->pts;
 +    return 0;
 +}
 +
 +static int read_close(AVFormatContext *s)
 +{
 +    WtvContext *wtv = s->priv_data;
 +    wtvfile_close(wtv->pb);
 +    return 0;
 +}
 +
 +AVInputFormat ff_wtv_demuxer = {
 +    .name           = "wtv",
 +    .long_name      = NULL_IF_CONFIG_SMALL("Windows Television (WTV)"),
 +    .priv_data_size = sizeof(WtvContext),
 +    .read_probe     = read_probe,
 +    .read_header    = read_header,
 +    .read_packet    = read_packet,
 +    .read_seek      = read_seek,
 +    .read_close     = read_close,
 +    .flags          = AVFMT_SHOW_IDS,
 +};
Simple merge
Simple merge
@@@ -198,11 -207,11 +198,11 @@@ static int xmv_read_header(AVFormatCont
  
          /* TODO: ADPCM'd 5.1 sound is encoded in three separate streams.
           *       Those need to be interleaved to a proper 5.1 stream. */
 -        if (track->flags & XMV_AUDIO_ADPCM51)
 +        if (packet->flags & XMV_AUDIO_ADPCM51)
              av_log(s, AV_LOG_WARNING, "Unsupported 5.1 ADPCM audio stream "
 -                                      "(0x%04X)\n", track->flags);
 +                                      "(0x%04X)\n", packet->flags);
  
-         ast = av_new_stream(s, audio_track);
+         ast = avformat_new_stream(s, NULL);
          if (!ast)
              return AVERROR(ENOMEM);
  
Simple merge
Simple merge
Simple merge
diff --cc libavutil/opt.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,0626e28..0626e28
mode 000000,100644..100644
--- /dev/null
index 0000000,a8c526e..a8c526e
mode 000000,100644..100644
--- /dev/null
index 0000000,e311989..e311989
mode 000000,100644..100644
--- /dev/null
index 0000000,6323191..6323191
mode 000000,100644..100644
--- /dev/null
index 0000000,c2c3e1a..c2c3e1a
mode 000000,100644..100644
--- /dev/null
index 0000000,336c69b..336c69b
mode 000000,100644..100644
--- /dev/null
index 0000000,261d584..261d584
mode 000000,100644..100644
--- /dev/null
index 0000000,93d721d..93d721d
mode 000000,100644..100644
--- /dev/null
index 0000000,85778ec..85778ec
mode 000000,100644..100644
--- /dev/null
index 0000000,87d6989..87d6989
mode 000000,100644..100644
--- /dev/null
index 0000000,1c117ec..1c117ec
mode 000000,100644..100644
--- /dev/null
index 0000000,9103301..9103301
mode 000000,100644..100644
--- /dev/null
index 0000000,fa49629..fa49629
mode 000000,100644..100644
--- /dev/null
index 0000000,7e01c8f..7e01c8f
mode 000000,100644..100644
--- /dev/null