Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Dec 2012 12:25:23 +0000 (13:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Dec 2012 12:34:45 +0000 (13:34 +0100)
commit99efd596267248ba5eae1b0e540d880368a402c3
tree1ab9b0250d1350ffaae7d5f2bf98ba78e21d0cf4
parent1fa2bdc90a4a5309a3bf83ff9ae37f59e5f329fa
parentcb45553f577f8e0ebfe05d3287e1b6fa5859b967
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>
31 files changed:
libavcodec/golomb-test.c
libavcodec/iirfilter.c
libavcodec/libaacplus.c
libavcodec/libfaac.c
libavdevice/libcdio.c
libavdevice/libdc1394.c
libavdevice/timefilter.c
libavfilter/filtfmts.c
libavfilter/vf_drawtext.c
libavfilter/vf_mp.c
libavformat/network.c
libavformat/seek-test.c
libavformat/url-test.c
libavformat/utils.c
libavutil/avstring.c
libavutil/base64.c
libavutil/blowfish.c
libavutil/cpu.c
libavutil/crc.c
libavutil/des.c
libavutil/eval.c
libavutil/fifo.c
libavutil/internal.h
libavutil/log.c
libavutil/md5.c
libavutil/mem.c
libavutil/opt.c
libavutil/parseutils.c
libavutil/sha.c
libavutil/xtea.c
tests/fate/mp3.mak