diff options
| author | Torsten Jager <t.jager@gmx.de> | 2013-04-11 20:33:14 +0300 |
|---|---|---|
| committer | Torsten Jager <t.jager@gmx.de> | 2013-04-11 20:33:14 +0300 |
| commit | 6c578b9e4b7ae730f667992c23cd62bf6fa514c2 (patch) | |
| tree | 9c89dc2a0342acb798e6b62888862f48d5206aea /src/combined/ffmpeg/ffmpeg_decoder.h | |
| parent | 6da7eb9805657660cc51f75fcd8e2720c03ec1e8 (diff) | |
| download | xine-lib-6c578b9e4b7ae730f667992c23cd62bf6fa514c2.tar.gz xine-lib-6c578b9e4b7ae730f667992c23cd62bf6fa514c2.tar.bz2 | |
ff decoder: use AV_CODEC_ID_* where available
Diffstat (limited to 'src/combined/ffmpeg/ffmpeg_decoder.h')
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_decoder.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h index ffa7de8df..b0185d50a 100644 --- a/src/combined/ffmpeg/ffmpeg_decoder.h +++ b/src/combined/ffmpeg/ffmpeg_decoder.h @@ -36,7 +36,11 @@ typedef struct ff_codec_s { uint32_t type; +#if defined LIBAVCODEC_VERSION_INT && LIBAVCODEC_VERSION_INT >= ((54<<16)|(25<<8)) + enum AVCodecID id; +#else enum CodecID id; +#endif const char *name; } ff_codec_t; |