Skip to content
Snippets Groups Projects
Select Git revision
  • master default
  • n3.5-dev-tethys
  • n4.0.2-tethys
  • n3.2.12
  • n3.4.4
  • n4.0.2
  • n3.3.8
  • n2.8.15
  • n3.2.11
  • n3.4.3
  • n4.0.1
  • n4.1-dev
  • n4.0
  • n3.3.7
  • n3.0.11
  • n2.8.14
  • n3.4.2
  • n3.2.10
  • n3.3.6
  • n2.4.14
  • n3.4.1
  • n3.0.10
  • n3.2.9
23 results
Compare
user avatar
Merge commit '124134e4'
Michael Niedermayer authored 
* commit '124134e4':
  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: default avatarMichael Niedermayer <michaelni@gmx.at>
d5f65e9d
History
user avatar d5f65e9d
History
Name Last commit Last update
..
arm
avr32
bfin
mips
ppc
sh4
tomi
x86
Makefile
adler32.c
adler32.h
aes.c
aes.h
attributes.h
audio_fifo.c
audio_fifo.h
audioconvert.c
audioconvert.h
avassert.h
avstring.c
avstring.h
avutil.h
base64.c
base64.h
blowfish.c
blowfish.h
bprint.c
bprint.h
bswap.h
colorspace.h
common.h
cpu.c
cpu.h
crc.c
crc.h
crc_data.h
des.c
des.h
dict.c
dict.h
error.c
error.h
eval.c
eval.h
fifo.c
fifo.h
file.c
file.h
float_dsp.c
float_dsp.h
imgutils.c
imgutils.h
integer.c
integer.h
internal.h
intfloat.h
intfloat_readwrite.c
intfloat_readwrite.h
intmath.h
intreadwrite.h
inverse.c
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c
log.h
lzo.c
lzo.h
mathematics.c
mathematics.h
md5.c
md5.h
mem.c
mem.h
opt.c
opt.h
parseutils.c
parseutils.h
pca.c
pca.h
pixdesc.c
pixdesc.h
pixfmt.h
qsort.h
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c
samplefmt.h
sha.c
sha.h
softfloat.c
softfloat.h
time.c