virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
d5f65e9d40
FFmpeg/libavutil
History
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
..
arm Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
avr32
bfin
mips replace all __volatile__ by volatile 2012-07-11 04:04:29 +02:00
ppc Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2012-09-04 17:04:51 +02:00
adler32.c
adler32.h
aes.c
aes.h
attributes.h lavu: disable av_uninit for clang 2012-07-16 19:30:13 +00:00
audio_fifo.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
audio_fifo.h
audioconvert.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
audioconvert.h audioconvert: add av_get_standard_channel_layout(). 2012-07-30 11:38:38 +02:00
avassert.h
avstring.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
avstring.h
avutil.h Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
base64.c
base64.h
blowfish.c Blowfish: restructure/simplify code a bit. 2012-07-06 02:25:29 +02:00
blowfish.h blowfish.h: include author attribution 2012-07-04 23:23:17 +02:00
bprint.c bprint: implement vsnprintf for win32. 2012-06-14 13:54:00 +02:00
bprint.h lavu/bprint: readd documentation for 0 and 1 av_bprint_init() special values 2012-07-31 13:15:43 +02:00
bswap.h
colorspace.h
common.h Merge remote-tracking branch 'qatar/master' 2012-08-13 14:38:43 +02:00
cpu.c Merge commit '124134e42455763b28cc346fed1d07017a76e84e' 2012-09-05 13:58:11 +02:00
cpu.h deprecate av_parse_cpu_flags 2012-08-16 22:04:46 +02:00
crc_data.h
crc.c
crc.h
des.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
des.h
dict.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
dict.h Merge remote-tracking branch 'qatar/master' 2012-08-11 15:01:45 +02:00
error.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
error.h Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
eval.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
eval.h
fifo.c fifo: add av_fifo_grow() 2012-05-15 18:08:32 +02:00
fifo.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
file.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
file.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
float_dsp.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
float_dsp.h Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
imgutils.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
imgutils.h lavu/imgutils: create misc functions for dealing with buffers 2012-06-26 13:12:12 +02:00
integer.c integer: switch to av_assert 2012-08-09 01:44:15 +02:00
integer.h
internal.h Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
intfloat_readwrite.c
intfloat_readwrite.h
intfloat.h intfloat: Don't use designated initializers in the public headers 2012-07-02 14:05:40 +03:00
intmath.h x86: remove FASTDIV inline asm 2012-08-22 14:29:10 +01:00
intreadwrite.h intreadwrite: Dont evaluate value for AV_W* multiple times. 2012-09-04 21:45:13 +02:00
inverse.c
lfg.c
lfg.h
libavutil.v libavutil.v: add avpriv prefix 2012-06-09 02:51:02 +02:00
libm.h Merge remote-tracking branch 'qatar/master' 2012-07-11 23:57:11 +02:00
lls.c
lls.h
log.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
log.h lavu: 256 color support 2012-07-07 01:41:55 +00:00
lzo.c
lzo.h
Makefile lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime. 2012-08-28 17:52:03 +02:00
mathematics.c libavutil/mathematics: use av_assert() 2012-06-06 20:00:35 +02:00
mathematics.h Merge remote-tracking branch 'qatar/master' 2012-07-01 22:43:09 +02:00
md5.c md5: consistently use uint32_t instead of unsigned int 2012-06-16 12:47:46 +02:00
md5.h
mem.c mem: Don't abort on av_malloc(0) in debug mode 2012-07-10 11:37:03 +03:00
mem.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
opt.c Merge commit '124134e42455763b28cc346fed1d07017a76e84e' 2012-09-05 13:58:11 +02:00
opt.h lavu/opt.h: add AV_OPT_FLAG_FILTERING_PARAM macro 2012-08-12 23:52:55 +02:00
parseutils.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
parseutils.h lavu/parseutils: fix specification for av_parse_time() 2012-05-18 00:38:06 +02:00
pca.c
pca.h
pixdesc.c Merge remote-tracking branch 'qatar/master' 2012-09-04 17:04:51 +02:00
pixdesc.h pixdesc: fix project reference in comment 2012-06-29 11:23:56 +02:00
pixfmt.h cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
qsort.h qsort: flip compare direction to match libc qsort() 2012-06-22 22:48:00 +02:00
random_seed.c random_seed: Only read /dev/*random if we have unistd.h 2012-06-29 15:52:07 +03:00
random_seed.h
rational.c
rational.h Merge remote-tracking branch 'qatar/master' 2012-08-05 22:17:02 +02:00
rc4.c
rc4.h
samplefmt.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
sha.c
sha.h
softfloat.c
softfloat.h
time.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
time.h Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
timecode.c lavu/timecode: add av_timecode_check_frame_rate(). 2012-08-08 09:11:26 +02:00
timecode.h lavu/timecode: add av_timecode_check_frame_rate(). 2012-08-08 09:11:26 +02:00
timer.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
timestamp.h lavu/timestamp: remove duplicate definition of AV_TS_MAX_STRING_SIZE 2012-06-10 00:37:02 +02:00
tree.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
tree.h lavu/tree: perform minor fixes to av_tree_insert() documentation 2012-05-20 16:19:36 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
version.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
x86_cpu.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
xtea.c Merge remote-tracking branch 'qatar/master' 2012-07-05 21:55:31 +02:00
xtea.h Merge remote-tracking branch 'qatar/master' 2012-08-10 16:25:23 +02:00