Merge commit '23d461fe8714a20ee5e6929f22c61512fdda568e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Jan 2014 13:55:03 +0000 (14:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Jan 2014 13:55:03 +0000 (14:55 +0100)
commit3c7195a96933e27c395a617a178f43ef4bc65a92
treec2cdc6eca53b34e1af54b63ac99b908188fbf632
parent3f35a31ee9566293eec68c61a93cdbd6b0e349a7
parent23d461fe8714a20ee5e6929f22c61512fdda568e
Merge commit '23d461fe8714a20ee5e6929f22c61512fdda568e'

* commit '23d461fe8714a20ee5e6929f22c61512fdda568e':
  ac3dec: Allow asymmetric application of DRC when drc_scale > 1

Conflicts:
libavcodec/ac3dec.c

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