Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 12:09:09 +0000 (14:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 12:09:09 +0000 (14:09 +0200)
commit99de3df3d321715572a4017806d222e35f3f6ac6
treec938e894566c8cdcf218e1ea29ef56eb451f4662
parentd5f65e9d40413b88c5d5dcdd1ef9dabdff478116
parentd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078
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>
15 files changed:
libavcodec/libvpxenc.c
libavcodec/mpegvideo.h
libavcodec/options_table.h
libavdevice/libcdio.c
libavfilter/vf_drawtext.c
libavformat/movenc.c
libavformat/mpegtsenc.c
libavformat/options_table.h
libavformat/rtpenc.h
libavformat/rtsp.c
libavformat/spdifenc.c
libavutil/cpu.c
libavutil/opt.c
libswresample/swresample.c
libswscale/options.c