Merge commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 18:32:41 +0000 (20:32 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 18:33:34 +0000 (20:33 +0200)
commitc7074375724e85e889ddaff68d150c12a90b4300
tree3e52d0dfc8ced0959300d1cc797dd4f6ca4c8e02
parentaf5f707e46f01d9afff57029d098fb46da53cc93
parenta67b67944aa9e6e794934d15f9fd9a9cf7173e09
Merge commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09'

* commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09':
  ac3enc_template: Use the correct context field

See: 320ce9f284171f8c8d8561cccd2186c27f24898c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>