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)
commite18d9d90f1d30feed02a0d973ee1c0e46f6abfd7
tree3b00c61d68c0c45d1bdf044a05947f2f7a2d69a7
parenta71fcfad892c4c59a011556f70b998aca1139b37
parent8c6f430291374cf6d2cfb85cdbb809803b5a7d83
Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'

* commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83':
  mpeg: Suppress a compiler warning on callback type

Conflicts:
libavformat/mpegenc.c

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