Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:09:38 +0000 (01:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:09:38 +0000 (01:09 +0200)
commitf5ee10c16ac00f022e2f29bac3f51509e2799e02
treed26678af959764447de256eb69ae49cfc8592933
parentf9dcf1690c7c74fb8f12183f6b60c22026d632dd
parent2f15846ad7ad57beb0bca99c624affa0facf284b
Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'

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

Conflicts:
libavcodec/wmv2.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/msmpeg4.h
libavcodec/msmpeg4dec.c
libavcodec/wmv2.h