Michael Niedermayer 53015bb3b3 Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d' ...

* commit '794ca87d2bff2513118de8b97595b3e23070e67d':
  wvdec: split block header parsing into a separate file

Conflicts:
	libavformat/Makefile
	libavformat/wvdec.c

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

2013-05-29 10:07:30 +02:00

1.6 KiB

Raw Blame History

View Raw