diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 00:48:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 00:49:25 +0100 |
| commit | e664f48b97f2e971bdba56d33f28ef05fbf06847 (patch) | |
| tree | 2318c3c611d70336fdf45e4fd0c512a4a16bea66 /libavcodec | |
| parent | aeac1dae29d543e7879ba288842869351a289e87 (diff) | |
| parent | bdd1567c355a8092e7746ef99e831d579e34fa6a (diff) | |
| download | ffmpeg-e664f48b97f2e971bdba56d33f28ef05fbf06847.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index cb819f2558..12345fdbea 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -499,10 +499,6 @@ enum AVCodecID { #endif }; -#if FF_API_CODEC_ID -#define CodecID AVCodecID -#endif - /** * This struct describes the properties of a single codec described by an * AVCodecID. |