Michael Niedermayer e664f48b97 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@gmx.at>

2013-03-13 00:49:25 +01:00

158 KiB

Raw Blame History

View Raw