diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 14:09:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 14:09:09 +0200 |
| commit | 99de3df3d321715572a4017806d222e35f3f6ac6 (patch) | |
| tree | c938e894566c8cdcf218e1ea29ef56eb451f4662 /libavformat/bethsoftvid.c | |
| parent | d5f65e9d40413b88c5d5dcdd1ef9dabdff478116 (diff) | |
| parent | d58dd4b5b5d31cfd4092e38a5f2c894eee2ab078 (diff) | |
| download | ffmpeg-99de3df3d321715572a4017806d222e35f3f6ac6.tar.gz | |
Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'
* commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078':
avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member
Conflicts:
libavcodec/libvpxenc.c
libavcodec/options_table.h
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bethsoftvid.c')
0 files changed, 0 insertions, 0 deletions