diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 14:44:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 14:44:05 +0200 |
| commit | 98840ee0174b227543f2c85f3df09e97ad4f2577 (patch) | |
| tree | 80c17ae52b4056988905d00167ad145edfdb1bdf /libavutil | |
| parent | d46c1c72e4f4e1e0b0659a1ab0f57f7092c638f8 (diff) | |
| parent | c7b610aa0b1bac47eea0056b13fe6e982b85844a (diff) | |
| download | ffmpeg-98840ee0174b227543f2c85f3df09e97ad4f2577.tar.gz | |
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>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions