[FFmpeg-cvslog] Merge commit 'd80f0a4ad634b3949b91b85f21fd608c0cddeef7'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Nov 22 17:43:26 2015 +0000| [819a99ef21e9b0cb4ae0a2620793073d6a242e5a] | committer: Derek Buitenhuis

Merge commit 'd80f0a4ad634b3949b91b85f21fd608c0cddeef7'

* commit 'd80f0a4ad634b3949b91b85f21fd608c0cddeef7':
  mpevideo_enc: disallow multiple slices for h261 and flv

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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