Merge commit 'b2b766914a49c4e3537df3a585e97b98d432edd2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:26:56 +0000 (01:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:27:02 +0000 (01:27 +0200)
* commit 'b2b766914a49c4e3537df3a585e97b98d432edd2':
  mpegvideo: mpeg12: Move function declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpeg12.h
libavcodec/mpegvideo.h

Simple merge
Simple merge