Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 12:44:05 +0000 (14:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 12:44:05 +0000 (14:44 +0200)
commit98840ee0174b227543f2c85f3df09e97ad4f2577
tree80c17ae52b4056988905d00167ad145edfdb1bdf
parentd46c1c72e4f4e1e0b0659a1ab0f57f7092c638f8
parentc7b610aa0b1bac47eea0056b13fe6e982b85844a
Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a'

* commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a':
  avopt: Explicitly store float/double option defaults in .dbl

Conflicts:
libavcodec/ac3dec.c
libavcodec/libx264.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3dec.c
libavcodec/libx264.c
libavcodec/libxavs.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c