Merge commit '4c2fd4b262347273afe97865ba451a1abde43ae6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 20:06:46 +0000 (22:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 20:07:35 +0000 (22:07 +0200)
commit15fda8bcf1ea8e9676bb0e4cb4ccd81386a62c22
treea60fb9e513f385594385db5e2b31bc7b2f301a2f
parentb7caf89401232da02d2b493543b6dfcc524c15bf
parent4c2fd4b262347273afe97865ba451a1abde43ae6
Merge commit '4c2fd4b262347273afe97865ba451a1abde43ae6'

* commit '4c2fd4b262347273afe97865ba451a1abde43ae6':
  ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.

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