Merge commit '124134e42455763b28cc346fed1d07017a76e84e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 11:58:11 +0000 (13:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 11:58:11 +0000 (13:58 +0200)
commitd5f65e9d40413b88c5d5dcdd1ef9dabdff478116
tree1029442111a2fd3a67d5de9727b6ac8ff1519538
parent743a295c09b129df2ead045415e2ecc46affe523
parent124134e42455763b28cc346fed1d07017a76e84e
Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

* commit '124134e42455763b28cc346fed1d07017a76e84e':
  avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member

Conflicts:
libavcodec/aacenc.c
libavcodec/libopenjpegenc.c
libavcodec/options_table.h
libavdevice/bktr.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amix.c
libavfilter/vf_drawtext.c
libavformat/movenc.c
libavformat/options_table.h
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
40 files changed:
libavcodec/aacenc.c
libavcodec/apedec.c
libavcodec/flacenc.c
libavcodec/libfdk-aacenc.c
libavcodec/libopenjpegenc.c
libavcodec/libtwolame.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/libxavs.c
libavcodec/mpegvideo.h
libavcodec/options_table.h
libavcodec/proresenc_kostya.c
libavcodec/tiffenc.c
libavdevice/bktr.c
libavdevice/caca.c
libavdevice/dshow.c
libavdevice/dv1394.c
libavdevice/iec61883.c
libavdevice/libcdio.c
libavdevice/openal-dec.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amix.c
libavfilter/vf_drawtext.c
libavfilter/vsrc_mandelbrot.c
libavfilter/vsrc_mptestsrc.c
libavformat/img2dec.c
libavformat/movenc.c
libavformat/mpegtsenc.c
libavformat/options_table.h
libavformat/rtmpproto.c
libavformat/rtpenc.h
libavformat/rtsp.c
libavformat/segment.c
libavformat/spdifenc.c
libavutil/cpu.c
libavutil/opt.c
libswresample/swresample.c
libswscale/options.c