[FFmpeg-cvslog] Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 01:09:38 2015 +0200| [f5ee10c16ac00f022e2f29bac3f51509e2799e02] | committer: Michael Niedermayer

Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'

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

Conflicts:
	libavcodec/wmv2.h

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5ee10c16ac00f022e2f29bac3f51509e2799e02
---