[FFmpeg-cvslog] Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 10 02:20:54 2014 +0200| [e18d9d90f1d30feed02a0d973ee1c0e46f6abfd7] | committer: Michael Niedermayer

Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'

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

Conflicts:
	libavformat/mpegenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e18d9d90f1d30feed02a0d973ee1c0e46f6abfd7
---