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	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
base64.c	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
codec-regression.sh	Merge remote-tracking branch 'qatar/master'	2011-06-22 05:16:40 +02:00
copy.regression.ref	Make sure we dont double test files and sort the list.	2010-03-02 17:16:25 +00:00
copycooker.sh	Remove now obsolete references to _g-suffixed binaries.	2011-04-18 23:55:11 +02:00
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: remove stale fate-update.sh script	2011-03-19 13:35:52 +00:00
fate.mak	Split fate-psx-str-v3 into a video-only and audio-only test.	2011-03-26 16:39:22 -04:00
fate.sh	fate: add comment field	2011-05-20 13:50:52 +01:00
ffserver-regression.sh	Make ffserver regression test run (still fails)	2010-03-08 00:27:00 +00:00
ffserver.conf	Rename test.conf --> ffserver.conf, the new name is more meaningful.	2009-03-29 20:17:23 +00:00
ffserver.regression.ref	update ffserver regression ref	2009-03-21 10:03:37 +00:00
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	finished integrating rotozoom test in ffmpeg	2003-04-11 13:43:17 +00:00
Makefile	build: remove SRC_PATH_BARE variable	2011-06-23 12:17:25 +01:00
md5.sh	regtest: add openssl to md5 alternatives	2011-01-18 20:48:24 +00:00
regression-funcs.sh	fate: remove output redirections from old regtest scripts	2011-06-21 12:37:58 +01:00
rotozoom.c	Merge remote branch 'qatar/master'	2011-05-12 04:51:24 +02:00
seek_test.c	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
tiny_psnr.c	tests: Remove disabled code.	2011-04-29 18:08:46 +02:00
videogen.c	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00