diff options
| author | Torsten Jager <t.jager@gmx.de> | 2014-03-13 00:46:00 +0100 |
|---|---|---|
| committer | Torsten Jager <t.jager@gmx.de> | 2014-03-13 00:46:00 +0100 |
| commit | c192cb6ba0ecbc8c35c79ffb05f71a011234153e (patch) | |
| tree | 7698211c6759e0e46d8ab9549203fc60159d6c66 /src/combined | |
| parent | 4fdfc8bae58a0e591ee038755201a297eb9b610c (diff) | |
| download | xine-lib-c192cb6ba0ecbc8c35c79ffb05f71a011234153e.tar.gz xine-lib-c192cb6ba0ecbc8c35c79ffb05f71a011234153e.tar.bz2 | |
Fix build regression #12510.
Diffstat (limited to 'src/combined')
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_compat.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h index 56b7464ab..2c3315c6a 100644 --- a/src/combined/ffmpeg/ffmpeg_compat.h +++ b/src/combined/ffmpeg/ffmpeg_compat.h @@ -107,6 +107,13 @@ # define AVAUDIO 2 #endif +/* avcodec_encode_video(), av_packet_unref */ +#if LIBAVCODEC_VERSION_INT >= ((55<<16)|(25<<8)|100) +# define AVENCVIDEO 2 +#else +# define AVENCVIDEO 1 +#endif + /* AVFrame.age */ #if LIBAVCODEC_VERSION_INT >= 0x351C01 && LIBAVCODEC_VERSION_INT < 0x360000 // not sure about this - original condition was broken # define AVFRAMEAGE 1 |