FFmpeg/libavcodec
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-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-06-21 03:06:54 +02:00
2011-05-11 05:47:02 +02:00
2011-06-02 20:06:00 +01:00
2011-05-16 05:01:40 +02:00
2011-06-15 10:58:25 +02:00
2011-05-21 02:31:27 +02:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-06-02 20:06:00 +01:00
2011-05-15 13:12:47 +02:00
2011-06-10 22:13:26 +02:00
2011-05-11 05:47:02 +02:00
2011-05-24 19:10:28 +02:00
2011-06-19 03:54:15 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-25 11:29:47 +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-06-15 10:57:26 +02:00
2011-06-07 18:22:53 +02:00
2011-06-21 04:45:29 +02:00
2011-05-13 04:40:40 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-06-15 01:16:58 +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-21 13:48:10 +02:00
2011-05-21 13:48:10 +02:00
2011-06-20 21:03:59 +02:00
2011-05-11 05:47:02 +02:00
2011-06-21 22:18:59 +02:00
2011-06-02 20:06:00 +01:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-06-21 13:17:10 +02:00
2011-06-02 20:06:00 +01:00