Merge commit 'dbce017913ce04966021a2f72e4f8fae5b4b7190'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 09:20:46 +0000 (10:20 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 09:20:46 +0000 (10:20 +0100)
* commit 'dbce017913ce04966021a2f72e4f8fae5b4b7190':
  mpegtsenc: add flag to embed an AC-3 ES the DVB way

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge