Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Aug 2011 16:24:31 +0000 (18:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Aug 2011 16:32:52 +0000 (18:32 +0200)
commit03cbe6c8bc42626107e75b001180b81781619ed7
treef83ec1fa8adb21b5695c650c781b10631de8a4b5
parent29d854d6c5b31f816b639eac231ce86afa42b11d
parentb4ea1c5a77704eb7096bc017467b774e088ef3bd
Merge remote-tracking branch 'qatar/master'

* qatar/master:
Not merged:  Remove the ffserver test.
  Remove ffserver.h

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