Michael Niedermayer f5ee10c16a Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b' ...

* commit '2f15846ad7ad57beb0bca99c624affa0facf284b':
  mpegvideo: wmv2: Move function declarations

Conflicts:
	libavcodec/wmv2.h

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

2015-06-01 01:09:38 +02:00

33 KiB

Raw Blame History

View Raw