]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64db363 d80f0a4)
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)
* commit 'd80f0a4ad634b3949b91b85f21fd608c0cddeef7':
  mpevideo_enc: disallow multiple slices for h261 and flv

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavcodec/mpegvideo_enc.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/mpegvideo_enc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.