Michael Niedermayer
174df6affc
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: remove empty $(OBJS) target
build: make rule for linking ff* apply only to these targets
build: rearrange some lines in a more logical way
s302m: fix resampling for 16 and 24bits.
ARM: remove MUL64 and MAC64 inline asm
build: clean up .PHONY lists
build: move all (un)install* target aliases to toplevel Makefile
flvenc: propagate error properly
build: remove stale dependency
build: do not add CFLAGS-yes to CFLAGS
utils.c: fix crash with threading enabled.
configure: simplify source_path setup
configure: remove --source-path option
lavf: deprecate AVFormatParameters.time_base.
img2: add framerate private option.
img2: add video_size private option.
img2: add pixel_format private option.
tty: add framerate private option.
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-07 03:37:57 +02:00
..
2011-06-07 03:37:57 +02:00
2011-05-20 05:48:22 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-06 03:33:58 +02:00
2011-05-17 00:58:33 +02:00
2011-06-02 20:06:00 +01:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-03 05:19:30 +02:00
2011-05-25 09:49:18 +02:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-05-19 06:00:31 +02:00
2011-05-19 06:00:31 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-05-19 06:00:31 +02:00
2011-05-25 06:32:45 +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-05-25 06:32:45 +02:00
2011-05-29 03:34:35 +02:00
2011-05-27 16:25:22 -04:00
2011-06-06 03:33:58 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-05-21 01:11:42 +02:00
2011-05-29 03:34:35 +02:00
2011-05-22 04:53:19 +02:00
2011-05-28 18:25:40 +02:00
2011-05-21 02:31:27 +02:00
2011-05-27 02:53:21 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-02 20:06:00 +01:00
2011-05-22 04:53:19 +02:00
2011-06-03 05:19:30 +02:00
2011-05-20 05:48:22 +02:00
2011-06-03 05:19:30 +02:00
2011-05-17 13:57:23 +01:00
2011-05-17 13:57:23 +01:00
2011-05-18 05:42:42 +02:00
2011-05-17 13:57:23 +01:00
2011-05-18 05:42:42 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-03 05:19:30 +02:00
2011-06-04 06:35:17 +02:00
2011-05-22 04:53:19 +02:00
2011-06-04 06:35:17 +02:00
2011-05-24 19:10:28 +02:00
2011-06-03 05:19:30 +02:00
2011-05-26 01:55:12 +02:00
2011-06-04 06:35:17 +02:00
2011-05-22 04:53:19 +02:00
2011-05-19 06:00:31 +02:00
2011-05-19 06:00:31 +02:00
2011-05-19 13:00:31 +02:00
2011-05-28 17:04:47 +01:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-03 05:19:30 +02:00
2011-06-02 10:16:20 -07:00
2011-06-03 05:19:30 +02:00
2011-06-03 13:55:54 +02:00
2011-06-02 05:12:10 +02:00
2011-05-18 05:42:42 +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-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-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:54 +02:00
2011-05-24 01:31:54 +02:00
2011-06-03 19:41:15 +02:00
2011-05-24 01:31:53 +02:00
2011-05-22 04:53:19 +02:00
2011-06-06 03:33:58 +02:00
2011-06-06 03:33:58 +02:00
2011-06-06 03:33:58 +02:00
2011-05-20 15:28:29 -04:00
2011-05-28 12:15:59 +02:00
2011-05-27 04:37:33 +02:00
2011-06-06 03:33:58 +02:00
2011-06-05 03:00:31 +02:00
2011-05-19 06:00:31 +02:00
2011-05-23 01:23:33 +02:00
2011-05-22 04:53:19 +02:00
2011-05-21 05:32:03 +02:00
2011-05-21 05:32:03 +02:00
2011-05-20 05:48:22 +02:00
2011-06-05 03:00:31 +02:00
2011-05-20 05:48:22 +02:00
2011-06-05 03:00:31 +02:00
2011-06-05 03:00:31 +02:00
2011-05-22 04:53:19 +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-05-21 05:32:03 +02:00
2011-05-18 05:42:42 +02:00
2011-05-22 04:53:19 +02:00
2011-05-21 05:32:03 +02:00
2011-05-21 05:32:03 +02:00
2011-06-01 00:09:05 +02:00
2011-06-02 05:12:10 +02:00
2011-05-21 05:32:03 +02:00
2011-05-21 05:32:03 +02:00
2011-06-05 03:00:31 +02:00
2011-05-19 12:25:34 +01:00
2011-05-19 12:25:34 +01:00
2011-05-23 17:33:03 +02:00
2011-05-20 05:48:22 +02:00
2011-05-21 13:48:10 +02: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-07 03:17:42 +02:00
2011-06-03 05:19:30 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-22 04:53:19 +02:00
2011-06-03 05:19:30 +02:00
2011-05-25 06:32:45 +02:00
2011-05-21 13:48:10 +02:00
2011-05-21 13:48:10 +02:00
2011-05-27 04:36:37 +02:00
2011-05-22 04:53:19 +02:00
2011-05-24 19:10:34 +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-05-22 04:53:19 +02:00
2011-05-20 05:48:22 +02:00
2011-05-25 00:13:09 +02:00
2011-05-30 09:07:43 +02:00
2011-05-22 04:53:19 +02:00
2011-05-23 17:22:02 +02:00
2011-06-03 05:19:30 +02:00
2011-06-07 03:37:57 +02:00
2011-06-03 05:19:30 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-02 20:06:00 +01: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-05-22 04:53:19 +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-06 10:31:01 -04:00
2011-05-30 00:24:01 +02:00
2011-05-28 18:25:40 +02:00
2011-06-02 20:06:00 +01:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-06-01 00:09:05 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-03 05:19:30 +02:00
2011-05-22 02:33:03 +02:00
2011-06-04 06:35:17 +02:00
2011-05-22 04:53:19 +02:00
2011-06-02 20:06:00 +01:00