[FFmpeg-cvslog] Merge commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 00:48:58 2013 +0100| [e664f48b97f2e971bdba56d33f28ef05fbf06847] | committer: Michael Niedermayer

Merge commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a'

* commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a':
  lavc: remove disabled FF_API_CODEC_ID cruft

Conflicts:
	libavcodec/old_codec_ids.h
	libavcodec/version.h

Only the #define is removed
The CODEC_IDs itself are left until theres some reason to remove
them.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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