diff options
| author | Alfred E. Heggestad <aeh@db.org> | 2014-09-06 12:39:03 +0200 |
|---|---|---|
| committer | Alfred E. Heggestad <aeh@db.org> | 2014-09-06 12:39:03 +0200 |
| commit | 7278d78bec83b978c38a3abffcafd0a866723cb1 (patch) | |
| tree | 5520b580becaa8c96161738001d0b88b52ee66d7 /modules/avcodec/avcodec.h | |
| parent | 70ba83b68294c33cca5b8d2910829d561feb5d01 (diff) | |
avcodec: use codecid with AV_ prefix
- use enum AVCodecID instead of enum CodecID
- use AV_CODEC_ID_xxx instead of CODEC_ID_xxx
- extend a backwards compatible macro-wrapper in
avcodec.h
avcodec should still compile on old versions of FFmpeg.
please let us know if it does not :)
Diffstat (limited to 'modules/avcodec/avcodec.h')
| -rw-r--r-- | modules/avcodec/avcodec.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/avcodec/avcodec.h b/modules/avcodec/avcodec.h index bbd022a..1d91b27 100644 --- a/modules/avcodec/avcodec.h +++ b/modules/avcodec/avcodec.h @@ -5,8 +5,14 @@ */ -#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(25<<8)+0) -#define CodecID AVCodecID +#if LIBAVCODEC_VERSION_INT < ((54<<16)+(25<<8)+0) +#define AVCodecID CodecID + +#define AV_CODEC_ID_NONE CODEC_ID_NONE +#define AV_CODEC_ID_H263 CODEC_ID_H263 +#define AV_CODEC_ID_H264 CODEC_ID_H264 +#define AV_CODEC_ID_MPEG4 CODEC_ID_MPEG4 + #endif |