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
..
fate	build: remove SRC_PATH_BARE variable	2011-06-23 12:17:25 +01:00
ref	error_resilience: actually add counter when adding a MV predictor.	2011-06-20 22:18:23 +02:00
audiogen.c
base64.c
codec-regression.sh	Merge remote-tracking branch 'qatar/master'	2011-06-22 05:16:40 +02:00
copy.regression.ref
copycooker.sh
fate2.mak	ffmpeg: use new avformat_open_* API.	2011-06-16 20:24:57 +02:00
fate-run.sh	fate: remove output redirections from old regtest scripts	2011-06-21 12:37:58 +01:00
fate-update.sh
fate.mak
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	fate: remove output redirections from old regtest scripts	2011-06-21 12:37:58 +01:00
lavfi-regression.sh	Merge remote-tracking branch 'qatar/master'	2011-06-22 05:16:40 +02:00
lena.pnm
Makefile	build: remove SRC_PATH_BARE variable	2011-06-23 12:17:25 +01:00
md5.sh
regression-funcs.sh	fate: remove output redirections from old regtest scripts	2011-06-21 12:37:58 +01:00
rotozoom.c
seek_test.c
tiny_psnr.c
videogen.c