[FFmpeg-cvslog] Merge commit '21bc44038491e525335ad763883b0288402ff6a0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  5 14:52:52 2012 +0200| [8510150f48ef3a2008f97af6c4618f150a60edd7] | committer: Michael Niedermayer

Merge commit '21bc44038491e525335ad763883b0288402ff6a0'

* commit '21bc44038491e525335ad763883b0288402ff6a0':
  avopt: Explicitly store rational option defaults in .dbl

Conflicts:
	libavfilter/buffersrc.c
	libavfilter/vsrc_testsrc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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