ffmpeg/libavutil
Michael Niedermayer 686959e87e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doxygen: Consistently use '@' instead of '\' for Doxygen markup.
  Use av_printf_format to check the usage of printf style functions
  Add av_printf_format, for marking printf style format strings and their parameters
  ARM: enable thumb for Cortex-M* CPUs
  nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
  build: remove SRC_PATH_BARE variable
  build: move basic rules and variables to main Makefile
  build: move special targets to end of main Makefile
  lavdev: improve feedback in case of invalid frame rate/size
  vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
  v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
  fbdev: prefer "framerate_q" over "fps" in device context
  bktr: prefer "framerate" over "fps" for grab_read_header()
  ALSA: implement channel layout for playback.
  alsa: support unsigned variants of already supported signed formats.
  alsa: add support for more formats.
  ARM: allow building in Thumb2 mode

Conflicts:
	common.mak
	doc/APIchanges
	libavcodec/vdpau.h
	libavdevice/alsa-audio-common.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-24 03:07:04 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
avr32
bfin
mips
ppc Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
sh4
tomi
x86
Makefile Move metadata API from lavf to lavu. 2011-06-08 07:43:45 +02:00
adler32.c
adler32.h
aes.c
aes.h
attributes.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
audioconvert.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
audioconvert.h
avassert.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
avstring.c
avstring.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
avutil.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
base64.c
base64.h
bswap.h
colorspace.h
common.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
cpu.c cpudetect: add av_force_cpu_flags() 2011-06-02 21:03:54 +02:00
cpu.h cpudetect: add av_force_cpu_flags() 2011-06-02 21:03:54 +02:00
crc.c
crc.h
crc_data.h
des.c Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
des.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
dict.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
dict.h Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
error.c error.c: fix compile flags 2011-05-30 03:11:54 +02:00
error.h
eval.c eval: Fix 32bit unsigned parsing 2011-06-20 01:58:18 +02:00
eval.h
fifo.c fifo: use av_freep() 2011-05-09 21:23:45 +02:00
fifo.h
file.c Fix error check in av_file_map() 2011-06-04 17:03:25 +01:00
file.h
imgutils.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
imgutils.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
integer.c
integer.h
internal.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
intfloat_readwrite.c
intfloat_readwrite.h
intmath.h
intreadwrite.h Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
inverse.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c
log.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
lzo.c Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
lzo.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
mathematics.c av_compare_ts: Improve speed when calculations fit in 64bit. 2011-05-11 20:41:19 +02:00
mathematics.h
md5.c
md5.h
mem.c mem: Trying to workaround posix_memalign() bug on OSX 2011-06-07 03:17:42 +02:00
mem.h
opt.c opt: do not crash in av_set_options_string() if opts == NULL 2011-06-19 19:13:05 +02:00
opt.h opt: do not crash in av_set_options_string() if opts == NULL 2011-06-19 19:13:05 +02:00
parseutils.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
parseutils.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
pca.c
pca.h
pixdesc.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
pixdesc.h pixdesc: remove duplicated header inclusion 2011-06-06 11:34:45 +02:00
pixfmt.h Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
samplefmt.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
sha.c
sha.h
softfloat.c Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
softfloat.h Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
timer.h
tree.c
tree.h
utils.c
x86_cpu.h