• Michael Niedermayer's avatar
    Merge commit 'e6153f17' · d46c1c72
    Michael Niedermayer authored
    * commit 'e6153f17':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d46c1c72
Name
Last commit
Last update
..
Makefile Loading commit data...
alldevices.c Loading commit data...
alsa-audio-common.c Loading commit data...
alsa-audio-dec.c Loading commit data...
alsa-audio-enc.c Loading commit data...
alsa-audio.h Loading commit data...
avdevice.c Loading commit data...
avdevice.h Loading commit data...
bktr.c Loading commit data...
caca.c Loading commit data...
dshow.c Loading commit data...
dshow_capture.h Loading commit data...
dshow_common.c Loading commit data...
dshow_enummediatypes.c Loading commit data...
dshow_enumpins.c Loading commit data...
dshow_filter.c Loading commit data...
dshow_pin.c Loading commit data...
dv1394.c Loading commit data...
dv1394.h Loading commit data...
fbdev.c Loading commit data...
iec61883.c Loading commit data...
jack_audio.c Loading commit data...
lavfi.c Loading commit data...
libavdevice.v Loading commit data...
libcdio.c Loading commit data...
libdc1394.c Loading commit data...
openal-dec.c Loading commit data...
oss_audio.c Loading commit data...
pulse.c Loading commit data...
sdl.c Loading commit data...
sndio_common.c Loading commit data...
sndio_common.h Loading commit data...
sndio_dec.c Loading commit data...
sndio_enc.c Loading commit data...
timefilter.c Loading commit data...
timefilter.h Loading commit data...
v4l.c Loading commit data...
v4l2.c Loading commit data...
version.h Loading commit data...
vfwcap.c Loading commit data...
x11grab.c Loading commit data...