[FFmpeg-cvslog] Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec  5 13:25:23 2012 +0100| [99efd596267248ba5eae1b0e540d880368a402c3] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99efd596267248ba5eae1b0e540d880368a402c3
---