[FFmpeg-cvslog] Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  5 13:58:11 2012 +0200| [d5f65e9d40413b88c5d5dcdd1ef9dabdff478116] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5f65e9d40413b88c5d5dcdd1ef9dabdff478116
---