Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 12:26:01 +0000 (14:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 12:33:32 +0000 (14:33 +0200)
commitd46c1c72e4f4e1e0b0659a1ab0f57f7092c638f8
tree542a10ecd4b4cb18456e4dec031c6ace69541d0c
parent99de3df3d321715572a4017806d222e35f3f6ac6
parente6153f173a49e5bfa70b0c04d2f82930533597b9
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9':
  avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member

Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx264.c
libavcodec/mpeg12enc.c
libavcodec/options_table.h
libavcodec/snowenc.c
libavcodec/tiffenc.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_join.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_delogo.c
libavfilter/vf_drawtext.c
libavformat/http.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/movenc.c
libavformat/mpegenc.c
libavformat/mpegtsenc.c
libavformat/options_table.h
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
107 files changed:
ffprobe.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/apedec.c
libavcodec/cljr.c
libavcodec/dnxhdenc.c
libavcodec/ffv1.c
libavcodec/flacenc.c
libavcodec/g723_1.c
libavcodec/g726.c
libavcodec/libfdk-aacenc.c
libavcodec/libilbc.c
libavcodec/libmp3lame.c
libavcodec/libopencore-amr.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/libtwolame.c
libavcodec/libvo-amrwbenc.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/libxavs.c
libavcodec/mjpegdec.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options.c
libavcodec/options_table.h
libavcodec/pgssubdec.c
libavcodec/proresenc_kostya.c
libavcodec/rawdec.c
libavcodec/snowenc.c
libavcodec/tiffenc.c
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/caca.c
libavdevice/dshow.c
libavdevice/dv1394.c
libavdevice/iec61883.c
libavdevice/jack_audio.c
libavdevice/libcdio.c
libavdevice/libdc1394.c
libavdevice/openal-dec.c
libavdevice/oss_audio.c
libavdevice/pulse.c
libavdevice/sndio_dec.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amerge.c
libavfilter/af_amix.c
libavfilter/af_asetnsamples.c
libavfilter/af_asyncts.c
libavfilter/af_join.c
libavfilter/af_silencedetect.c
libavfilter/asrc_aevalsrc.c
libavfilter/asrc_anullsrc.c
libavfilter/asrc_flite.c
libavfilter/avf_concat.c
libavfilter/avf_showwaves.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_delogo.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_overlay.c
libavfilter/vsrc_cellauto.c
libavfilter/vsrc_life.c
libavfilter/vsrc_mandelbrot.c
libavfilter/vsrc_mptestsrc.c
libavfilter/vsrc_testsrc.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/bintext.c
libavformat/bluray.c
libavformat/cdxl.c
libavformat/flvdec.c
libavformat/g729dec.c
libavformat/gif.c
libavformat/gsmdec.c
libavformat/http.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/latmenc.c
libavformat/libmodplug.c
libavformat/movenc.c
libavformat/mp3enc.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/oggenc.c
libavformat/options_table.h
libavformat/pcmdec.c
libavformat/rtmpcrypt.c
libavformat/rtmphttp.c
libavformat/rtmpproto.c
libavformat/rtpenc.c
libavformat/rtsp.c
libavformat/sbgdec.c
libavformat/segment.c
libavformat/spdifenc.c
libavformat/tty.c
libavformat/wav.c
libavutil/opt.c
libswresample/swresample.c
libswscale/options.c