Merge commit '21bc44038491e525335ad763883b0288402ff6a0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 12:52:52 +0000 (14:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 12:52:52 +0000 (14:52 +0200)
commit8510150f48ef3a2008f97af6c4618f150a60edd7
tree8767933672698895900a32e6e517ab3752445186
parent98840ee0174b227543f2c85f3df09e97ad4f2577
parent21bc44038491e525335ad763883b0288402ff6a0
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@gmx.at>
libavfilter/buffersrc.c
libavutil/opt.c