diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:47:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:48:51 +0100 |
| commit | 2581d9bcbb2e45fa1f8538d038099f6e673d9566 (patch) | |
| tree | c6bd3e6b9d61bb8fc115f3f89bab78b2a72bbdde /libavformat/spdif.h | |
| parent | 37e81996dcf3452c48dd134877bf10b5060dacb3 (diff) | |
| parent | b3fab1f2cd22bfaee95831af57a65f803f03083c (diff) | |
| download | ffmpeg-2581d9bcbb2e45fa1f8538d038099f6e673d9566.tar.gz | |
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>
Diffstat (limited to 'libavformat/spdif.h')
0 files changed, 0 insertions, 0 deletions