Merge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 20:18:07 +0000 (22:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 20:18:12 +0000 (22:18 +0200)
commitc895fa7f66c01de6cfead8b1866dad478daad948
tree2b3cbba729d112bb99e05cfe4ad40e37fb8e4ef2
parent15fda8bcf1ea8e9676bb0e4cb4ccd81386a62c22
parentcc4992aaf3dbb0af88d9727983d75636baf1f8cc
Merge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc'

* commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc':
  ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3enc.h
libavcodec/ac3enc_opts_template.c