Michael Niedermayer d5f65e9d40 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>

2012-09-05 13:58:11 +02:00

..

alldevices.c

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

alsa-audio-common.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

alsa-audio-dec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

alsa-audio-enc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

alsa-audio.h

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

avdevice.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

avdevice.h

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

bktr.c

Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

2012-09-05 13:58:11 +02:00

caca.c

Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

2012-09-05 13:58:11 +02:00

dshow_capture.h

dshow: rename dshow.h to avoid conflict with system header of equal name

2012-05-24 14:15:10 +02:00

dshow_common.c

dshow: rename dshow.h to avoid conflict with system header of equal name

2012-05-24 14:15:10 +02:00

dshow_enummediatypes.c

dshow: rename dshow.h to avoid conflict with system header of equal name

2012-05-24 14:15:10 +02:00

dshow_enumpins.c

dshow: rename dshow.h to avoid conflict with system header of equal name

2012-05-24 14:15:10 +02:00

dshow_filter.c

dshow: rename dshow.h to avoid conflict with system header of equal name

2012-05-24 14:15:10 +02:00

dshow_pin.c

dshow: rename dshow.h to avoid conflict with system header of equal name

2012-05-24 14:15:10 +02:00

dshow.c

Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

2012-09-05 13:58:11 +02:00

dv1394.c

Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

2012-09-05 13:58:11 +02:00

dv1394.h

cosmetics: various spelling fixes

2012-07-06 17:08:22 +02:00

fbdev.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

iec61883.c

Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

2012-09-05 13:58:11 +02:00

jack_audio.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

lavfi.c

avoid ambigous buffersink names

2012-09-01 06:05:08 +02:00

libavdevice.v

…

libcdio.c

Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

2012-09-05 13:58:11 +02:00

libdc1394.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

openal-dec.c

Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

2012-09-05 13:58:11 +02:00

oss_audio.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

pulse.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

sdl.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

sndio_common.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

sndio_common.h

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

sndio_dec.c

…

sndio_enc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

timefilter.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

timefilter.h

timefilter: allow to evaluate at other times.

2012-04-04 14:32:44 +02:00

v4l2.c

Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

2012-09-05 13:58:11 +02:00

v4l.c

Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

2012-09-05 13:58:11 +02:00

version.h

libcaca output device

2012-07-21 03:33:02 +00:00

vfwcap.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

x11grab.c

Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

2012-09-05 13:58:11 +02:00