Michael Niedermayer 99efd59626 Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
  Remove pointless #undefs of previously forbidden functions.
  fate: Add dependencies for bmp, cdxl, dfa, mp3

Conflicts:
	doc/examples/muxing.c
	libavfilter/filtfmts.c
	libavutil/des.c
	libavutil/eval.c
	libavutil/log.c
	libavutil/parseutils.c
	tests/fate/mp3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05 13:34:45 +01:00
..
2012-11-29 13:24:48 +00:00
2012-11-20 00:26:46 -05:00
2012-10-18 13:12:28 +01:00
2012-11-04 19:11:26 +00:00
2012-12-02 14:44:26 +01:00
2012-12-04 11:25:46 +00:00
2012-11-23 17:30:05 +00:00
2012-12-03 01:34:14 +01:00
2012-12-05 13:10:24 +01:00
2012-11-05 15:32:30 -05:00
2012-10-15 08:32:34 +02:00
2012-10-18 13:12:28 +01:00
2012-11-29 13:24:48 +00:00
2012-10-23 02:19:38 +02:00
2012-10-18 13:12:28 +01:00
2012-12-03 03:15:41 +01:00