• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 31dfe20d
    Michael Niedermayer authored
    * qatar/master:
      doc: Replace some @file tags by more suitable markup.
      fate: Set FUZZ factor of vorbis-13 test to 2.
      fate: Set FUZZ factor of (e)ac3-encode test to 3.
      fate: remove unused code from regressions-funcs.sh
      rtmp: Don't assume path points to a string of nonzero length
      avconv: fix behavior with -ss as an output option.
    
    Conflicts:
    	doc/platform.texi
    	doc/protocols.texi
    	ffmpeg.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    31dfe20d
platform.texi 13.3 KB