Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 11:03:09 +0000 (13:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 11:03:09 +0000 (13:03 +0200)
commit48480da6ad0f53e8d9d68162e8d003f557221fc2
treee6032b1df7c55f07d7b677b0e56a8dce5ef82952
parentbc6e535db13222d7de97b774639e6a7d42afd91c
parent48f2e53ad0c8586369c3ce88712f0b9cec5a4c47
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: document the asf demuxer

Conflicts:
doc/demuxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/demuxers.texi