NoMerge commit '4d58e4cb4ca8e04317fecea432ea3272a445877c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Aug 2011 14:28:12 +0000 (16:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Aug 2011 14:29:20 +0000 (16:29 +0200)
commite2cc3311246376e902f0defc6c57bd554babcf39
tree4b340b4db651f2e9491670cc6b55aa8d10496cf7
parent51fb933dd0dda5f581d7489b32b8446767d33b97
parent4d58e4cb4ca8e04317fecea432ea3272a445877c
NoMerge commit '4d58e4cb4ca8e04317fecea432ea3272a445877c'

* commit '4d58e4cb4ca8e04317fecea432ea3272a445877c':
  Rename ffserver to avserver.
  Rename ffprobe to avprobe.
  Rename ffplay to avplay.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffplay.c
ffprobe.c