[FFmpeg-cvslog] Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  5 14:44:05 2012 +0200| [98840ee0174b227543f2c85f3df09e97ad4f2577] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98840ee0174b227543f2c85f3df09e97ad4f2577
---