summaryrefslogtreecommitdiff
path: root/libavformat/wv.h
Commit message (Collapse)AuthorAge
* Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'Michael Niedermayer2013-05-29
| | | | | | | | | | | * commit '794ca87d2bff2513118de8b97595b3e23070e67d': wvdec: split block header parsing into a separate file Conflicts: libavformat/Makefile libavformat/wvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* wvdec: split block header parsing into a separate fileAnton Khirnov2013-05-28
It will be reused by other muxers and demuxers.