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)
* commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc':
  ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.

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

Simple merge
Simple merge