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-05-29 03:34:35 +02:00
2011-06-01 15:45:13 +01:00
2011-05-15 04:44:07 +02:00
2011-06-02 05:12:10 +02:00
2011-04-05 01:11:16 +01:00
2011-05-22 04:53:19 +02:00
2011-05-30 01:29:11 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-11 05:47:02 +02:00
2011-03-19 13:33:20 +00:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-27 23:48:22 +02:00
2011-03-19 13:33:20 +00:00
2011-05-11 05:47:02 +02:00
2011-03-25 02:57:41 +01:00
2011-05-30 01:29:11 +02:00
2011-04-04 02:15:12 +02:00
2011-04-19 10:16:07 +02:00
2011-03-21 03:33:28 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-30 01:29:11 +02:00
2011-05-10 07:24:36 -04:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-11 05:47:02 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2009-10-06 21:55:41 +00:00
2011-06-01 15:45:13 +01:00
2011-06-07 03:37:57 +02:00
2011-04-03 22:39:52 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-05-30 01:29:11 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-30 01:29:11 +02:00
2011-05-22 04:53:19 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-29 03:34:35 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00