Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 07:05:13 +0000 (09:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 07:13:51 +0000 (09:13 +0200)
commit4131f21f7761d911e5e1b1f44068b652872e454f
treeb798a257be175716ca739947498c4c03722c4f39
parenta7bb12a307568c0db72e6eb8d496a5651a8228df
parent612a5049d9b4ac1c2a293daf75fe814b7a94fdc7
Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'

* commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7':
  avserver: do not use a static string as a default for a string option

See: 19c41c6d8ef6cc34cfde6bf877e059689e763bb7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffserver.c