ffmpeg/libavutil
Michael Niedermayer 4d941eac16 Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'
* commit '3b4296f41473a5b39e84d7a49d480624c9c60040':
  avformat: clarify stream id for muxing
  fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
  ppc: do not pass redundant compiler flags
  avutil: change GET_UTF8 to not use av_log2()
  segment: fix NULL pointer dereference in seg_write_header()

Conflicts:
	tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-15 11:12:25 +01:00
..
arm
avr32
bfin
mips
ppc
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
Makefile Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
adler32.c
adler32.h
aes.c lavu: keep context size variables 2012-10-28 14:33:41 +01:00
aes.h lavu: keep context size variables 2012-10-28 14:33:41 +01:00
attributes.h
audio_fifo.c
audio_fifo.h
audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h 2012-11-11 13:35:12 -05:00
avassert.h
avstring.c avstring: fix compiler warning about freeing const pointers 2012-11-03 20:22:53 +01:00
avstring.h
avutil.h Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8' 2012-10-30 14:40:22 +01:00
base64.c
base64.h
blowfish.c
blowfish.h
bprint.c lavu/bprint: add av_bprint_get_buffer(). 2012-11-02 15:12:29 +01:00
bprint.h lavu/bprint: add av_bprint_get_buffer(). 2012-11-02 15:12:29 +01:00
bswap.h
channel_layout.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
channel_layout.h Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
colorspace.h
common.h Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040' 2012-11-15 11:12:25 +01:00
cpu.c
cpu.h
crc.c Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f' 2012-11-03 14:24:11 +01:00
crc.h Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f' 2012-11-03 14:24:11 +01:00
crc_data.h
des.c
des.h
dict.c
dict.h
error.c
error.h
eval.c lavu: remove disabled FF_API_OLD_EVAL_NAMES code 2012-11-07 23:18:05 +01:00
eval.h lavu: remove disabled FF_API_OLD_EVAL_NAMES code 2012-11-07 23:18:05 +01:00
fifo.c
fifo.h
file.c
file.h file: typo 2012-10-31 17:01:52 +01:00
float_dsp.c
float_dsp.h
imgutils.c av_image_copy: check for av_image_get_linesize() failure. 2012-10-31 19:12:48 +01:00
imgutils.h
integer.c
integer.h
internal.h
intfloat.h
intfloat_readwrite.c
intfloat_readwrite.h
intmath.c Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e' 2012-11-05 22:51:20 +01:00
intmath.h Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e' 2012-11-05 22:51:20 +01:00
intreadwrite.h
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c
log.h
log2_tab.c
lzo.c
lzo.h
mathematics.c
mathematics.h
md5.c lavu: keep context size variables 2012-10-28 14:33:41 +01:00
md5.h lavu: keep context size variables 2012-10-28 14:33:41 +01:00
mem.c
mem.h
old_pix_fmts.h
opt.c lavu/opt: show valid range in case of out-of-range value 2012-11-07 23:17:57 +01:00
opt.h lavu/opt: implement av_opt_get_key_value(). 2012-11-04 10:47:52 +01:00
parseutils.c lavu/parseutils: add trailing characters check in av_parse_video_size() 2012-10-29 17:39:26 +01:00
parseutils.h
pca.c
pca.h
pixdesc.c Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2' 2012-11-14 11:59:20 +01:00
pixdesc.h Remove deprecation of avcodec_get_chroma_sub_sample. 2012-11-14 12:04:39 +01:00
pixfmt.h Merge remote-tracking branch 'qatar/master' 2012-10-30 17:47:36 +01:00
qsort.h
random_seed.c
random_seed.h
rational.c rational: test add/sub too 2012-11-01 02:59:44 +01:00
rational.h
rc4.c
rc4.h
samplefmt.c
samplefmt.h
sha.c lavu: keep context size variables 2012-10-28 14:33:41 +01:00
sha.h lavu: keep context size variables 2012-10-28 14:33:41 +01:00
softfloat.c
softfloat.h
time.c
time.h
timecode.c lavu: drop disabled FF_API_OLD_TC_ADJUST_FRAMENUM code 2012-11-04 18:10:39 +01:00
timecode.h lavu: drop disabled FF_API_OLD_TC_ADJUST_FRAMENUM code 2012-11-04 18:10:39 +01:00
timer.h
timestamp.h
tree.c tree-test: fix printf() types 2012-10-31 03:10:35 +01:00
tree.h lavu: keep context size variables 2012-10-28 14:33:41 +01:00
utils.c
version.h Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
x86_cpu.h
xga_font_data.c
xga_font_data.h
xtea.c
xtea.h