Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 406215 | Differences between
and this patch

Collapse All | Expand All

(-)xbmc-11.0-Eden_rc2.old/lib/DllAvFilter.h (-1 / +9 lines)
Lines 48-54 Link Here
48 
  #endif
 48 
  #endif
49 
  /* for av_vsrc_buffer_add_frame */
 49 
  /* for av_vsrc_buffer_add_frame */
50 
  #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,8,0)
 50 
  #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,8,0)
51 
    #include <libavfilter/avcodec.h>
 51 
    #include <libavfilter/vsrc_buffer.h>
52 
  #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
 52 
  #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
53 
    int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
 53 
    int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
54 
                                 AVFrame *frame);
 54 
                                 AVFrame *frame);
Lines 83-89 Link Here
83 
  virtual int avfilter_poll_frame(AVFilterLink *link)=0;
 83 
  virtual int avfilter_poll_frame(AVFilterLink *link)=0;
84 
  virtual int avfilter_request_frame(AVFilterLink *link)=0;
 84 
  virtual int avfilter_request_frame(AVFilterLink *link)=0;
85 
#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
 85 
#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
86 
#if LIBAVFILTER_VERSION_MICRO
86 
  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
 87 
  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
88 
#else
89 
  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, AVRational pixel_aspect)=0;
90 
#endif
87 
#elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
 91 
#elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
88 
  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame)=0;
 92 
  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame)=0;
89 
#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
 93 
#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
Lines 172-178 Link Here
172 
  virtual int avfilter_poll_frame(AVFilterLink *link) { return ::avfilter_poll_frame(link); }
 176 
  virtual int avfilter_poll_frame(AVFilterLink *link) { return ::avfilter_poll_frame(link); }
173 
  virtual int avfilter_request_frame(AVFilterLink *link) { return ::avfilter_request_frame(link); }
 177 
  virtual int avfilter_request_frame(AVFilterLink *link) { return ::avfilter_request_frame(link); }
174 
#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
 178 
#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
179 
#if LIBAVFILTER_VERSION_MICRO
175 
  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, flags); }
 180 
  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, flags); }
181 
#else
182 
  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, AVRational pixel_aspect) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, pts, pixel_aspect); }
183 
#endif
176 
#elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
 184 
#elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
177 
  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame); }
 185 
  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame); }
178 
#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
 186 
#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
(-)xbmc-11.0-Eden_rc2.old/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp (+4 lines)
Lines 814-820 Link Here
814 
  if (frame)
 814 
  if (frame)
815 
  {
 815 
  {
816 
#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
 816 
#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
817 
#if LIBAVFILTER_VERSION_MICRO
817 
    result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, 0);
 818 
    result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, 0);
819 
#else
820 
    result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, frame->pts, m_pCodecContext->sample_aspect_ratio);
821 
#endif
818 
#elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
 822 
#elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
819 
    result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame);
 823 
    result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame);
820 
#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
 824 
#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)

Return to bug 406215