Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 00:20:54 +0000 (02:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 00:20:54 +0000 (02:20 +0200)
* commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83':
  mpeg: Suppress a compiler warning on callback type

Conflicts:
libavformat/mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mpegenc.c

Simple merge