Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 May 2012 22:38:21 +0000 (00:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 May 2012 22:52:25 +0000 (00:52 +0200)
commit31dfe20dd2fe16c2a3a6816d140b8a32dbdc06ba
tree321a6eb57e018866779df59bc4ef6144d4780a40
parent48a40e09c4858c43627d9bc25efc3c47efdde5af
parent90c9edba58eddf39e77937a6c602d7ff289c9bfd
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
doc/general.texi
doc/platform.texi
ffmpeg.c
libavformat/rtmpproto.c