Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Nov 2012 13:47:50 +0000 (14:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Nov 2012 13:48:51 +0000 (14:48 +0100)
commit2581d9bcbb2e45fa1f8538d038099f6e673d9566
treec6bd3e6b9d61bb8fc115f3f89bab78b2a72bbdde
parent37e81996dcf3452c48dd134877bf10b5060dacb3
parentb3fab1f2cd22bfaee95831af57a65f803f03083c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: add apidoc target for doxygen API documentation
  matroskadec: do not use avpacket internals

Conflicts:
doc/Makefile
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/Makefile
libavformat/matroskadec.c
library.mak