[FFmpeg-cvslog] Merge commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 27 20:32:41 2015 +0200| [c7074375724e85e889ddaff68d150c12a90b4300] | committer: Michael Niedermayer

Merge commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7074375724e85e889ddaff68d150c12a90b4300
---