Merge commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:17:03 +0000 (01:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:17:26 +0000 (01:17 +0200)
* commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332':
  mpegvideo: msmpeg4: Move function declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpegvideo.h
libavcodec/msmpeg4.h
libavcodec/mss2.c
libavcodec/vc1dec.c

Simple merge
Simple merge
Simple merge
Simple merge