ffmpeg/libavutil
Michael Niedermayer d0ac26a264 Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'
* commit 'c692957c4edd119920cd7f2121628dd183589e6a':
  lavu: remove disabled avoptions cruft
  lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft

Conflicts:
	libavutil/opt.c
	libavutil/opt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 14:50:31 +02:00
..
arm Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024' 2012-10-12 14:26:46 +02:00
avr32
bfin
mips
ppc ppc/cpu: make linux 32bit specific altivec detection depend on __linux__ 2012-09-24 13:41:48 +02:00
sh4
tomi
x86 Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024' 2012-10-12 14:26:46 +02:00
Makefile Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f' 2012-10-23 13:34:42 +02:00
adler32.c
adler32.h
aes.c Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
aes.h Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
attributes.h
audio_fifo.c
audio_fifo.h
audioconvert.c Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
audioconvert.h Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
avassert.h
avstring.c Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609' 2012-10-13 16:39:42 +02:00
avstring.h
avutil.h libavutil: loose idiotic circular dependancies between version and avutil.h 2012-10-13 18:47:18 +02:00
base64.c
base64.h
blowfish.c Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a' 2012-10-04 12:30:25 +02:00
blowfish.h
bprint.c bprint: Remove custom vsnprintf 2012-09-15 19:47:10 -04:00
bprint.h
bswap.h
colorspace.h
common.h Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9' 2012-10-21 13:35:42 +02:00
cpu.c
cpu.h cpu: improve av_get_cpu_flags() doxy 2012-10-01 16:41:37 +02:00
crc.c
crc.h
crc_data.h
des.c av_des_init: suppress warning about unused parameter 2012-09-19 21:57:58 +02:00
des.h
dict.c
dict.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
error.c Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4' 2012-10-22 14:39:12 +02:00
error.h Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4' 2012-10-22 14:39:12 +02:00
eval.c Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520' 2012-10-14 14:46:13 +02:00
eval.h
fifo.c
fifo.h
file.c av_tempfile: fix leak in error case 2012-10-11 17:09:57 +02:00
file.h
float_dsp.c
float_dsp.h
imgutils.c Merge remote-tracking branch 'qatar/master' 2012-10-14 15:11:34 +02:00
imgutils.h Merge remote-tracking branch 'qatar/master' 2012-10-14 15:11:34 +02:00
integer.c
integer.h
internal.h Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72' 2012-10-19 13:29:24 +02:00
intfloat.h
intfloat_readwrite.c
intfloat_readwrite.h
intmath.h Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd' 2012-10-21 16:13:55 +02:00
intreadwrite.h
lfg.c avformat: Remove non-compiling and/or silly commented-out printf/av_log statements 2012-10-01 10:24:28 +02:00
lfg.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
libavutil.v Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f' 2012-10-23 13:34:42 +02:00
libm.h
lls.c
lls.h
log.c
log.h
log2.c Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9' 2012-10-21 13:35:42 +02:00
log2_tab.c Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066' 2012-10-13 14:24:58 +02:00
lzo.c Merge remote-tracking branch 'qatar/master' 2012-10-20 13:18:59 +02:00
lzo.h Merge remote-tracking branch 'qatar/master' 2012-10-20 13:18:59 +02:00
mathematics.c Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf' 2012-10-13 14:35:42 +02:00
mathematics.h
md5.c Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
md5.h Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
mem.c Merge remote-tracking branch 'qatar/master' 2012-10-20 13:18:59 +02:00
mem.h Merge remote-tracking branch 'qatar/master' 2012-10-20 13:18:59 +02:00
old_pix_fmts.h Merge commit '78071a1420b425dfb787ac739048f523007b8139' 2012-10-08 19:42:49 +02:00
opt.c lavu: remove disabled avoptions cruft 2012-10-23 07:33:05 +02:00
opt.h lavu: remove disabled avoptions cruft 2012-10-23 07:33:05 +02:00
parseutils.c lavu/parseutils: remove unused gcd variable in av_parse_ratio() 2012-10-22 10:41:51 +02:00
parseutils.h
pca.c pca: get rid of VLA 2012-10-06 14:03:15 +02:00
pca.h
pixdesc.c Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
pixdesc.h Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
pixfmt.h Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507' 2012-10-13 14:14:11 +02:00
qsort.h
random_seed.c Merge commit '0a75d1da23b8659ec49391469bb592da12760077' 2012-10-12 14:15:33 +02:00
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft 2012-10-23 07:33:05 +02:00
samplefmt.h lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft 2012-10-23 07:33:05 +02:00
sha.c Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
sha.h Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
softfloat.c
softfloat.h
time.c
time.h
timecode.c
timecode.h
timer.h
timestamp.h
tree.c Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
tree.h Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
utils.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
version.h Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a' 2012-10-23 14:50:31 +02:00
x86_cpu.h x86_cpu.h: newline at the end to shutup some warnings in opencc 2012-09-13 19:31:02 +02:00
xga_font_data.c Move xGA font data from lavc to lavu. 2012-10-01 22:24:17 +02:00
xga_font_data.h Mark data symbols shared between libraries with av_export 2012-10-20 01:56:50 +02:00
xtea.c xtea: give constants the correct type 2012-10-08 03:44:18 +02:00
xtea.h