Michael Niedermayer
35ce42e070
Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'
* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
fate: Declare avcodec/avformat deps in the respective Makefile snippets
fate: Add dependencies for WMA and WavPack tests
Improve wording and spelling of av_log_missing_feature messages.
lavu: remove disabled FF_API_AV_FIFO_PEEK cruft
Conflicts:
libavcodec/aacsbr.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 15:00:27 +02:00
..
2012-09-28 20:30:37 +02:00
2012-10-10 14:13:51 +02:00
2012-10-18 11:01:15 +02:00
2012-10-20 21:10:21 +02:00
2012-08-22 16:41:57 -04:00
2012-10-18 13:12:28 +01:00
2012-10-10 10:49:51 +02:00
2012-10-10 10:49:51 +02:00
2012-10-10 10:49:51 +02:00
2012-10-10 14:13:51 +02:00
2012-10-18 12:16:08 +02:00
2012-10-21 17:01:01 +02:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-07-20 10:17:25 +02:00
2012-05-09 14:13:34 +01:00
2012-10-19 13:47:47 +02:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-05-20 10:21:52 +02:00
2012-09-22 09:34:56 +02:00
2012-05-09 14:13:34 +01:00
2012-10-22 23:13:54 +02:00
2012-08-22 00:58:44 +02:00
2012-07-02 23:18:04 +02:00
2012-10-15 08:32:34 +02:00
2012-10-18 13:12:28 +01:00
2012-10-23 10:28:40 +02:00
2012-10-23 10:28:40 +02:00
2012-10-13 15:42:49 +02:00
2012-10-09 08:48:36 +00:00
2012-10-19 14:15:47 +02:00
2012-10-23 02:19:38 +02:00
2012-10-20 12:37:52 +02:00
2012-09-10 00:07:24 +01:00
2012-10-18 13:12:28 +01:00
2012-06-30 13:49:43 +02:00
2012-05-27 15:42:55 +02:00
2012-08-04 09:49:30 +02:00
2012-05-20 10:21:52 +02:00
2012-10-19 14:15:47 +02:00
2012-05-19 14:30:41 +01:00
2012-10-10 14:13:51 +02:00
2012-10-19 13:58:14 +02:00
2012-10-21 17:01:01 +02:00
2012-10-20 12:37:52 +02:00
2012-09-01 01:54:40 +02:00
2012-10-18 11:01:53 +02:00
2012-10-20 12:37:52 +02:00
2012-10-10 14:13:51 +02:00
2012-06-18 11:47:08 +01:00
2012-05-27 15:42:55 +02:00
2012-10-19 13:47:47 +02:00
2012-10-23 10:28:40 +02:00
2012-10-23 10:28:40 +02:00