Merge commit 'f6c94457b44f41d900cd0991857f54e1f0ccedd6'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:46:26 +0000 (17:46 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:46:26 +0000 (17:46 +0000)
commit09f9ef8536efa563350af98a99023185cec1fbe8
tree6ed362bc0fd1da1373a3d7713730ce07141cdf1f
parent819a99ef21e9b0cb4ae0a2620793073d6a242e5a
parentf6c94457b44f41d900cd0991857f54e1f0ccedd6
Merge commit 'f6c94457b44f41d900cd0991857f54e1f0ccedd6'

* commit 'f6c94457b44f41d900cd0991857f54e1f0ccedd6':
  mpegvideo_enc: enable rtp_mode when multiple slices are used

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