• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d2084402
    Michael Niedermayer authored
    * qatar/master:
      lavc: fix type for thread_type option
      avconv: move format to options context
      avconv: move limit_filesize to options context
      avconv: move start_time, recording_time and input_ts_offset to options context
      avconv: add a context for options.
      cmdutils: allow storing per-stream/chapter/.... options in a generic way
      cmdutils: split per-option code out of parse_options().
      cmdutils: add support for caller-provided option context.
      cmdutils: declare only one pointer type in OptionDef
      cmdutils: move grow_array() from avconv to cmdutils.
      cmdutils: move exit_program() declaration to cmdutils from avconv
      http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes
      nutenc: add namespace to the api facing functions
    
    Conflicts:
    	avconv.c
    	cmdutils.c
    	cmdutils.h
    	ffmpeg.c
    	ffplay.c
    	ffprobe.c
    	ffserver.c
    	libavformat/http.c
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    d2084402
ffserver.c 155 KB