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-10-23 15:00:27 +02:00
2012-10-23 02:19:38 +02:00
2012-01-23 23:41:32 +01:00
2012-07-29 02:16:26 +02:00
2012-01-19 01:19:38 +01:00
2011-07-07 22:47:24 +02:00
2012-07-09 22:40:12 +02:00
2011-03-19 13:35:52 +00:00
2012-01-21 12:04:46 +01:00
2012-09-06 16:23:17 +02:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2012-09-27 08:59:37 +02:00
2012-10-11 02:21:28 +02:00
2012-10-23 15:00:27 +02:00
2012-10-16 14:04:14 +02:00
2012-05-30 05:57:56 +02:00
2012-06-07 21:45:52 +02:00
2012-10-08 11:03:27 +02:00
2012-10-16 14:04:14 +02:00
2012-05-30 01:40:54 +02:00
2012-06-07 21:45:52 +02:00