[FFmpeg-cvslog] Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 09:05:13 2013 +0200| [4131f21f7761d911e5e1b1f44068b652872e454f] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4131f21f7761d911e5e1b1f44068b652872e454f
---