Michael Niedermayer
4ccb7911ba
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: silence some annoying armcc warnings
ffplay: Remove unused-but-set channels variable from update_sample_display().
build: Add DEP_LIBS dependency directly to the shared library build rule.
build: Remove multiple inclusion guards from config.mak.
build: Remove redundant config.mak includes from subdirectory Makefiles.
aacenc: Mark psy_3gpp_window() as av_unused.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-26 02:31:32 +02:00
..
2011-06-02 08:38:09 +02:00
2011-05-17 03:05:36 +02:00
2011-03-19 13:33:20 +00:00
2011-06-19 19:18:33 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-12 22:46:02 +02:00
2011-06-12 22:46:02 +02:00
2011-06-21 04:24:03 +02:00
2011-06-19 22:58:32 +02:00
2011-06-19 22:58:32 +02:00
2011-06-12 22:46:02 +02:00
2011-06-20 18:56:06 -04:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-22 18:28:28 +02:00
2011-05-17 03:05:36 +02:00
2011-06-18 02:08:38 +02:00
2011-06-02 18:24:49 +02:00
2010-01-16 04:49:02 +00:00
2011-06-26 02:31:32 +02:00
2011-05-01 13:10:18 +02:00
2011-06-19 22:58:32 +02:00
2011-03-19 13:33:20 +00:00
2011-06-19 22:58:32 +02:00
2011-06-19 22:58:32 +02:00
2011-06-19 22:58:32 +02:00
2011-06-20 20:54:40 +02:00
2011-06-19 22:58:32 +02:00
2011-06-02 20:06:00 +01:00
2011-03-19 13:33:20 +00:00
2011-06-19 22:58:32 +02:00
2011-06-19 22:58:32 +02:00
2011-06-19 22:58:32 +02:00
2011-06-19 22:58:32 +02:00
2011-06-19 22:58:32 +02:00
2011-06-20 20:54:40 +02:00
2011-06-19 22:58:32 +02:00
2011-06-22 19:05:00 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-19 22:58:32 +02:00
2011-03-19 13:33:20 +00:00
2011-06-01 20:26:54 +02:00
2011-05-25 12:54:07 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-15 12:28:53 +02:00
2011-03-19 13:33:20 +00:00
2011-05-22 02:43:47 +02:00
2011-06-19 22:58:32 +02:00
2011-06-19 22:58:32 +02:00
2011-03-19 13:33:20 +00:00
2011-06-19 22:58:32 +02:00
2011-06-25 22:06:30 +02:00
2011-06-19 19:18:33 +02:00
2011-03-19 13:33:20 +00:00
2011-06-19 22:58:32 +02:00
2011-06-06 01:35:27 +02:00
2011-06-19 22:58:32 +02:00
2011-06-19 22:58:32 +02:00
2011-03-19 13:33:20 +00:00
2011-04-03 08:46:19 +02:00