Merge commit 'd80f0a4ad634b3949b91b85f21fd608c0cddeef7'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:43:26 +0000 (17:43 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:43:26 +0000 (17:43 +0000)
commit819a99ef21e9b0cb4ae0a2620793073d6a242e5a
tree3b050d99fbacdc87206b8ed85f10084238857bef
parent64db3639af7bfe9a5eec6755daf4e52556f3c141
parentd80f0a4ad634b3949b91b85f21fd608c0cddeef7
Merge commit 'd80f0a4ad634b3949b91b85f21fd608c0cddeef7'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/mpegvideo_enc.c