Merge commit '27631796c9d1b8146ad4a16e6539ecc08afa7565'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Jun 2014 17:10:19 +0000 (19:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Jun 2014 17:51:35 +0000 (19:51 +0200)
* commit '27631796c9d1b8146ad4a16e6539ecc08afa7565':
  ac3: Only initialize float_dsp for the float encoder variant

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

Simple merge
Simple merge
Simple merge
Simple merge