Merge commit '91bfac759dfd536e439ad3e35964705012c6a5a7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Dec 2014 19:54:47 +0000 (20:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Dec 2014 20:10:56 +0000 (21:10 +0100)
* commit '91bfac759dfd536e439ad3e35964705012c6a5a7':
  h261enc: Disallow sliced encoding

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

Simple merge