Merge commit 'c0e6b8cab874db97b6818007bc86507c8d213083'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jun 2015 19:07:55 +0000 (21:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jun 2015 19:07:59 +0000 (21:07 +0200)
* commit 'c0e6b8cab874db97b6818007bc86507c8d213083':
  mpegvideo: Mark one function as static

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

Simple merge
Simple merge