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
2011-06-24 03:07:04 +02:00
2011-06-21 03:06:54 +02:00
2011-06-24 03:07:04 +02:00
2011-06-02 20:06:00 +01:00
2011-06-08 05:25:28 +02:00
2011-06-03 05:19:30 +02:00
2011-06-21 03:38:25 +02:00
2011-06-15 10:58:25 +02:00
2011-06-03 05:19:30 +02:00
2011-06-08 05:25:28 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-06-21 03:38:25 +02:00
2011-06-14 04:56:26 +02:00
2011-05-29 03:34:35 +02:00
2011-05-29 03:34:35 +02:00
2011-05-29 03:34:35 +02:00
2011-06-14 04:56:26 +02:00
2011-06-14 04:56:26 +02:00
2011-06-13 16:49:35 -04:00
2011-06-15 17:56:49 -04:00
2011-06-23 04:49:04 +02:00
2011-06-23 04:49:04 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-06-24 03:07:04 +02:00
2011-05-29 03:34:35 +02:00
2011-06-21 03:38:25 +02:00
2011-06-24 03:07:04 +02:00
2011-05-27 02:53:21 +02:00
2011-06-20 23:28:55 +02:00
2011-06-13 20:42:14 +02:00
2011-06-21 03:38:25 +02:00
2011-06-21 03:38:25 +02:00
2011-06-02 20:06:00 +01:00
2011-06-24 03:07:04 +02:00
2011-06-03 05:19:30 +02:00
2011-06-21 21:03:46 -07:00
2011-06-21 03:38:25 +02:00
2011-06-18 11:36:35 +02:00
2011-06-03 05:19:30 +02:00
2011-06-10 22:13:26 +02:00
2011-06-08 05:25:28 +02:00
2011-06-15 02:15:25 +02:00
2011-06-15 02:15:25 +02:00
2011-06-08 05:25:28 +02:00
2011-06-08 05:25:28 +02:00
2011-06-09 04:47:19 +02:00
2011-05-24 19:10:28 +02:00
2011-06-13 16:49:35 -04:00
2011-06-07 15:16:41 -04:00
2011-06-21 03:38:25 +02:00
2011-06-24 03:07:04 +02:00
2011-06-13 20:42:14 +02:00
2011-06-19 03:54:15 +02:00
2011-06-24 03:07:04 +02:00
2011-05-28 17:04:47 +01:00
2011-06-03 05:19:30 +02:00
2011-06-22 21:45:03 +02:00
2011-06-15 02:15:25 +02:00
2011-06-02 10:16:20 -07:00
2011-06-23 04:49:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-23 04:49:04 +02:00
2011-06-23 04:49:04 +02:00
2011-06-15 02:15:25 +02:00
2011-06-11 03:51:36 +02:00
2011-06-15 02:15:25 +02:00
2011-06-15 02:15:25 +02:00
2011-06-08 05:25:28 +02:00
2011-05-28 18:25:40 +02:00
2011-05-25 11:29:47 +02:00
2011-06-03 05:19:30 +02:00
2011-06-10 04:47:23 +02:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-06-08 16:38:37 +02:00
2011-06-24 03:07:04 +02:00
2011-06-06 03:33:58 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-15 10:57:26 +02:00
2011-06-07 18:22:53 +02:00
2011-06-21 04:45:29 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-15 10:47:46 +02:00
2011-06-05 03:00:31 +02:00
2011-06-19 03:54:16 +02:00
2011-06-15 01:16:58 +02:00
2011-06-08 05:25:28 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-05 03:00:31 +02:00
2011-06-05 03:00:31 +02:00
2011-06-05 03:00:31 +02:00
2011-06-03 05:19:30 +02:00
2011-06-12 17:59:23 +02:00
2011-06-03 05:19:30 +02:00
2011-06-21 03:07:11 +02:00
2011-06-01 00:09:05 +02:00
2011-06-02 05:12:10 +02:00
2011-06-05 03:00:31 +02:00
2011-06-14 04:56:26 +02:00
2011-06-13 11:33:44 +01:00
2011-06-02 05:12:10 +02:00
2011-06-04 06:35:17 +02:00
2011-06-03 05:19:30 +02:00
2011-06-15 02:15:25 +02:00
2011-06-24 03:07:04 +02:00
2011-06-03 05:19:30 +02:00
2011-05-25 06:32:45 +02:00
2011-06-24 03:07:04 +02:00
2011-06-18 05:10:38 +02:00
2011-06-08 05:25:28 +02:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-06-05 03:00:31 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-20 21:03:59 +02:00
2011-06-08 16:38:37 +02:00
2011-06-21 22:18:59 +02:00
2011-06-21 22:18:59 +02:00
2011-06-21 03:38:25 +02:00
2011-06-24 03:07:04 +02:00
2011-06-03 05:19:30 +02:00
2011-06-07 03:37:57 +02:00
2011-06-08 05:25:28 +02:00
2011-06-20 04:07:34 +02:00
2011-06-20 04:07:34 +02:00
2011-06-15 02:15:25 +02:00
2011-06-02 20:06:00 +01:00
2011-06-07 13:20:57 +02:00
2011-06-15 02:15:25 +02:00
2011-06-24 03:07:04 +02:00
2011-06-03 05:19:30 +02:00
2011-06-04 06:35:17 +02:00
2011-06-06 03:33:58 +02:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-06-24 03:07:04 +02:00
2011-06-21 03:38:25 +02:00
2011-06-08 05:25:28 +02:00
2011-06-24 03:07:04 +02:00
2011-05-30 00:24:01 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-08 05:25:28 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-10 12:13:08 +02:00
2011-06-21 03:38:25 +02:00
2011-06-03 05:19:30 +02:00
2011-06-21 03:38:25 +02:00
2011-06-01 00:09:05 +02:00
2011-06-03 05:19:30 +02:00
2011-06-19 03:54:15 +02:00
2011-06-21 13:17:10 +02:00
2011-06-04 06:35:17 +02:00
2011-06-24 03:07:04 +02:00
2011-06-02 20:06:00 +01:00
686959e87e