From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Sun, 22 Nov 2015 17:46:26 +0000 (+0000)
Subject: Merge commit 'f6c94457b44f41d900cd0991857f54e1f0ccedd6'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=09f9ef8536efa563350af98a99023185cec1fbe8;p=ffmpeg

Merge commit 'f6c94457b44f41d900cd0991857f54e1f0ccedd6'

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

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

09f9ef8536efa563350af98a99023185cec1fbe8