diff options
| author | Jochen Dolze <vdr@dolze.de> | 2013-07-15 15:50:23 +0200 |
|---|---|---|
| committer | Jochen Dolze <vdr@dolze.de> | 2013-07-15 15:50:23 +0200 |
| commit | 5178e0ea9af99a09a309b5b43aa1c06bcfeeaa2b (patch) | |
| tree | 501ad25b3322e38614eddc3edad0c432362c5d56 /command/decoder.cpp | |
| parent | a4af99d86e186b127c228abec4eccf64a93ab28a (diff) | |
| download | vdr-plugin-markad-5178e0ea9af99a09a309b5b43aa1c06bcfeeaa2b.tar.gz vdr-plugin-markad-5178e0ea9af99a09a309b5b43aa1c06bcfeeaa2b.tar.bz2 | |
Added support for ffmpeg 2.0
Prevent wrong setup options to become active
Diffstat (limited to 'command/decoder.cpp')
| -rw-r--r-- | command/decoder.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/command/decoder.cpp b/command/decoder.cpp index 4b207a1..ed81b37 100644 --- a/command/decoder.cpp +++ b/command/decoder.cpp @@ -152,7 +152,11 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH264, int Threads) } video_codec=NULL; +#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(51<<8)+100) + AVCodecID video_codecid; +#else CodecID video_codecid; +#endif if (useH264) { @@ -173,7 +177,11 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH264, int Threads) if (video_codec) { +#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(51<<8)+100) + video_context = avcodec_alloc_context3(NULL); +#else video_context = avcodec_alloc_context(); +#endif if (video_context) { if (video_codec->capabilities & CODEC_CAP_TRUNCATED) @@ -323,7 +331,11 @@ bool cMarkAdDecoder::Clear() { avcodec_flush_buffers(video_context); AVCodecContext *dest; +#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(51<<8)+100) + dest=avcodec_alloc_context3(NULL); +#else dest=avcodec_alloc_context(); +#endif if (dest) { if (avcodec_copy_context(dest,video_context)!=0) ret=false; |