• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 411cc5c4
    Michael Niedermayer authored
    * qatar/master: (31 commits)
      audioconvert: add explanatory comments to channel_names array
      audioconvert: K&R whitespace cosmetics
      avconv: use correct index when selecting metadata to write to.
      avconv: fix inverted variable
      doc/avconv: document option types (input/output/per-stream/...)
      doc/avtools-common-opts: write a section about stream specifiers.
      doc/avconv: remove two pointless paragraphs.
      doc/avconv: document that global options should be specified first.
      doc/avconv: remove entries for nonexistent options
      doc/avconv: remove documentation for removed 'timestamp' option
      doc: cosmetics, rename fftools-common-opts to avtools-....
      avconv: move streamid_map to options context.
      avconv: extend -vf syntax
      avconv: move top_field_first to options context.
      avconv: move inter/intra matrix to options context.
      avconv: remove -psnr option.
      avconv: remove me_threshold option.
      avconv: move video_rc_override_string to options context.
      avconv: move frame pixel format to the options context.
      avconv: move frame aspect ratio to the options context.
      ...
    
    Conflicts:
    	avconv.c
    	cmdutils_common_opts.h
    	doc/avconv.texi
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    411cc5c4
ffserver.texi 9.6 KB