[FFmpeg-cvslog] Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'
Michael Niedermayer
git at videolan.org
Wed Sep 5 14:14:18 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 5 14:09:09 2012 +0200| [99de3df3d321715572a4017806d222e35f3f6ac6] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99de3df3d321715572a4017806d222e35f3f6ac6
---
More information about the ffmpeg-cvslog
mailing list