Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Jun 2014 18:25:48 +0000 (20:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Jun 2014 18:25:48 +0000 (20:25 +0200)
commitc600c8e966996555724d574e26f9e95259b1f884
tree46adfa676b96c7676e156f37394fe405cf9cf7b1
parent7ed89addb7f6271d17c2ba21ec11204e37fa9917
parentdca7ba4bffe3e4aeb620cb62955256a0d87561f4
Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'

* commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4':
  Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

Conflicts:
libavcodec/ac3enc_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3enc_float.c
libavcodec/eac3enc.c
libavformat/dv.c