Index: mplayer-1.2_pre20141011/fmt-conversion.c =================================================================== --- mplayer-1.2_pre20141011.orig/fmt-conversion.c +++ mplayer-1.2_pre20141011/fmt-conversion.c @@ -134,7 +134,7 @@ static const struct { { IMGFMT_422P, AV_PIX_FMT_YUVJ422P }, { IMGFMT_444P, AV_PIX_FMT_YUVJ444P }, { IMGFMT_440P, AV_PIX_FMT_YUVJ440P }, - { IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC }, + { IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC_MPEG2_IDCT }, { IMGFMT_VDPAU_MPEG1, AV_PIX_FMT_VDPAU_MPEG1 }, { IMGFMT_VDPAU_MPEG2, AV_PIX_FMT_VDPAU_MPEG2 }, { IMGFMT_VDPAU_H264, AV_PIX_FMT_VDPAU_H264 }, Index: mplayer-1.2_pre20141011/libmpcodecs/ad_ffmpeg.c =================================================================== --- mplayer-1.2_pre20141011.orig/libmpcodecs/ad_ffmpeg.c +++ mplayer-1.2_pre20141011/libmpcodecs/ad_ffmpeg.c @@ -46,6 +46,7 @@ LIBAD_EXTERN(ffmpeg) #include "libavcodec/avcodec.h" #include "libavutil/dict.h" +#include "libavutil/channel_layout.h" struct adctx { int last_samplerate; Index: mplayer-1.2_pre20141011/libmpdemux/demux_lavf.c =================================================================== --- mplayer-1.2_pre20141011.orig/libmpdemux/demux_lavf.c +++ mplayer-1.2_pre20141011/libmpdemux/demux_lavf.c @@ -390,8 +390,13 @@ static void handle_stream(demuxer_t *dem sh_video->video.dwRate= codec->time_base.den; sh_video->video.dwScale= codec->time_base.num; } +#if LIBAVFORMAT_VERSION_MICRO >= 100 sh_video->fps=av_q2d(st->r_frame_rate); sh_video->frametime=1/av_q2d(st->r_frame_rate); +#else + sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; + sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; +#endif sh_video->format=bih->biCompression; if(st->sample_aspect_ratio.num) sh_video->original_aspect = codec->width * st->sample_aspect_ratio.num Index: mplayer-1.2_pre20141011/libaf/af_lavcresample.c =================================================================== --- mplayer-1.2_pre20141011.orig/libaf/af_lavcresample.c +++ mplayer-1.2_pre20141011/libaf/af_lavcresample.c @@ -27,6 +27,7 @@ #include "af.h" #include "libavcodec/avcodec.h" #include "libavutil/rational.h" +#include "libavutil/common.h" // Data for specific instances of this filter typedef struct af_resample_s{ Index: mplayer-1.2_pre20141011/libmpcodecs/vd_ffmpeg.c =================================================================== --- mplayer-1.2_pre20141011.orig/libmpcodecs/vd_ffmpeg.c +++ mplayer-1.2_pre20141011/libmpcodecs/vd_ffmpeg.c @@ -32,6 +32,7 @@ #include "libavutil/dict.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" +#include "libavutil/avutil.h" #include "mpbswap.h" #include "fmt-conversion.h" @@ -980,9 +981,14 @@ static mp_image_t *decode(sh_video_t *sh int x, y; int w = ((avctx->width << lavc_param_lowres)+15) >> 4; int h = ((avctx->height << lavc_param_lowres)+15) >> 4; +#if LIBAVUTIL_VERSION_MICRO >= 100 int qstride; int dummy; int8_t *q = av_frame_get_qp_table(pic, &qstride, &dummy); +#else + int8_t *q = pic->qscale_table; + int qstride = pic->qstride; +#endif for(y = 0; y < h; y++) { for(x = 0; x < w; x++) quality += q[x]; @@ -1079,7 +1085,13 @@ static mp_image_t *decode(sh_video_t *sh swap_palette(mpi->planes[1]); #endif /* to comfirm with newer lavc style */ +#if LIBAVUTIL_VERSION_MICRO >= 100 mpi->qscale = av_frame_get_qp_table(pic, &mpi->qstride, &mpi->qscale_type); +#else + mpi->qscale =pic->qscale_table; + mpi->qstride=pic->qstride; + mpi->qscale_type= pic->qscale_type; +#endif mpi->pict_type=pic->pict_type; mpi->fields = MP_IMGFIELD_ORDERED; if(pic->interlaced_frame) mpi->fields |= MP_IMGFIELD_INTERLACED;