| 1234567891011121314151617181920212223242526272829 |
- --- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h 2016-02-20 16:21:19.000000000 +0100
- +++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h 2016-03-19 18:38:18.618025151 +0100
- @@ -46,7 +46,7 @@ public:
- public:
- IHardwareDecoder() {}
- virtual ~IHardwareDecoder() {};
- - virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces) = 0;
- + virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces) = 0;
- virtual int Decode (AVCodecContext* avctx, AVFrame* frame) = 0;
- virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) = 0;
- virtual int Check (AVCodecContext* avctx) = 0;
- @@ -77,7 +77,7 @@ public:
- void SetHardware(IHardwareDecoder* hardware);
-
- protected:
- - static enum PixelFormat GetFormat(struct AVCodecContext * avctx, const PixelFormat * fmt);
- + static enum AVPixelFormat GetFormat(struct AVCodecContext * avctx, const AVPixelFormat * fmt);
-
- int FilterOpen(const std::string& filters, bool scale);
- void FilterClose();
- @@ -119,7 +119,7 @@ protected:
- int m_iLastKeyframe;
- double m_dts;
- bool m_started;
- - std::vector<PixelFormat> m_formats;
- + std::vector<AVPixelFormat> m_formats;
- double m_decoderPts;
- int m_skippedDeint;
- bool m_requestSkipDeint;
|
