Attachment #386480 for bug #525070

View | Details | Raw Unified | Return to bug 525070
Collapse All | Expand All

Lines 134-140 static const struct { Link Here

(-)mplayer-1.2_pre20141011/fmt-conversion.c (-1 / +1 lines)
134	{ IMGFMT_422P, AV_PIX_FMT_YUVJ422P },	134	{ IMGFMT_422P, AV_PIX_FMT_YUVJ422P },
135	{ IMGFMT_444P, AV_PIX_FMT_YUVJ444P },	135	{ IMGFMT_444P, AV_PIX_FMT_YUVJ444P },
136	{ IMGFMT_440P, AV_PIX_FMT_YUVJ440P },	136	{ IMGFMT_440P, AV_PIX_FMT_YUVJ440P },
137	{ IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC },	137	{ IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC_MPEG2_IDCT },
138	{ IMGFMT_VDPAU_MPEG1, AV_PIX_FMT_VDPAU_MPEG1 },	138	{ IMGFMT_VDPAU_MPEG1, AV_PIX_FMT_VDPAU_MPEG1 },
139	{ IMGFMT_VDPAU_MPEG2, AV_PIX_FMT_VDPAU_MPEG2 },	139	{ IMGFMT_VDPAU_MPEG2, AV_PIX_FMT_VDPAU_MPEG2 },
140	{ IMGFMT_VDPAU_H264, AV_PIX_FMT_VDPAU_H264 },	140	{ IMGFMT_VDPAU_H264, AV_PIX_FMT_VDPAU_H264 },

Lines 46-51 LIBAD_EXTERN(ffmpeg) Link Here

(-)mplayer-1.2_pre20141011/libmpcodecs/ad_ffmpeg.c (+1 lines)
46		46
47	#include "libavcodec/avcodec.h"	47	#include "libavcodec/avcodec.h"
48	#include "libavutil/dict.h"	48	#include "libavutil/dict.h"
		49	#include "libavutil/channel_layout.h"
49		50
50	struct adctx {	51	struct adctx {
51	int last_samplerate;	52	int last_samplerate;

Lines 390-397 static void handle_stream(demuxer_t *dem Link Here

(-)mplayer-1.2_pre20141011/libmpdemux/demux_lavf.c (+5 lines)
390	sh_video->video.dwRate= codec->time_base.den;	390	sh_video->video.dwRate= codec->time_base.den;
391	sh_video->video.dwScale= codec->time_base.num;	391	sh_video->video.dwScale= codec->time_base.num;
392	}	392	}
		393	#if LIBAVFORMAT_VERSION_MICRO >= 100
393	sh_video->fps=av_q2d(st->r_frame_rate);	394	sh_video->fps=av_q2d(st->r_frame_rate);
394	sh_video->frametime=1/av_q2d(st->r_frame_rate);	395	sh_video->frametime=1/av_q2d(st->r_frame_rate);
		396	#else
		397	sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
		398	sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
		399	#endif
395	sh_video->format=bih->biCompression;	400	sh_video->format=bih->biCompression;
396	if(st->sample_aspect_ratio.num)	401	if(st->sample_aspect_ratio.num)
397	sh_video->original_aspect = codec->width * st->sample_aspect_ratio.num	402	sh_video->original_aspect = codec->width * st->sample_aspect_ratio.num

Lines 27-32 Link Here

(-)mplayer-1.2_pre20141011/libaf/af_lavcresample.c (+1 lines)
27	#include "af.h"	27	#include "af.h"
28	#include "libavcodec/avcodec.h"	28	#include "libavcodec/avcodec.h"
29	#include "libavutil/rational.h"	29	#include "libavutil/rational.h"
		30	#include "libavutil/common.h"
30		31
31	// Data for specific instances of this filter	32	// Data for specific instances of this filter
32	typedef struct af_resample_s{	33	typedef struct af_resample_s{

Lines 32-37 Link Here

(-)mplayer-1.2_pre20141011/libmpcodecs/vd_ffmpeg.c (+12 lines)
32	#include "libavutil/dict.h"	32	#include "libavutil/dict.h"
33	#include "libavutil/intreadwrite.h"	33	#include "libavutil/intreadwrite.h"
34	#include "libavutil/opt.h"	34	#include "libavutil/opt.h"
		35	#include "libavutil/avutil.h"
35	#include "mpbswap.h"	36	#include "mpbswap.h"
36	#include "fmt-conversion.h"	37	#include "fmt-conversion.h"
37		38
Lines 980-988 static mp_image_t decode(sh_video_t sh Link Here
980	int x, y;	981	int x, y;
981	int w = ((avctx->width << lavc_param_lowres)+15) >> 4;	982	int w = ((avctx->width << lavc_param_lowres)+15) >> 4;
982	int h = ((avctx->height << lavc_param_lowres)+15) >> 4;	983	int h = ((avctx->height << lavc_param_lowres)+15) >> 4;
		984	#if LIBAVUTIL_VERSION_MICRO >= 100
983	int qstride;	985	int qstride;
984	int dummy;	986	int dummy;
985	int8_t *q = av_frame_get_qp_table(pic, &qstride, &dummy);	987	int8_t *q = av_frame_get_qp_table(pic, &qstride, &dummy);
		988	#else
		989	int8_t *q = pic->qscale_table;
		990	int qstride = pic->qstride;
		991	#endif
986	for(y = 0; y < h; y++) {	992	for(y = 0; y < h; y++) {
987	for(x = 0; x < w; x++)	993	for(x = 0; x < w; x++)
988	quality += q[x];	994	quality += q[x];
Lines 1079-1085 static mp_image_t decode(sh_video_t sh Link Here
1079	swap_palette(mpi->planes[1]);	1085	swap_palette(mpi->planes[1]);
1080	#endif	1086	#endif
1081	/* to comfirm with newer lavc style */	1087	/* to comfirm with newer lavc style */
		1088	#if LIBAVUTIL_VERSION_MICRO >= 100
1082	mpi->qscale = av_frame_get_qp_table(pic, &mpi->qstride, &mpi->qscale_type);	1089	mpi->qscale = av_frame_get_qp_table(pic, &mpi->qstride, &mpi->qscale_type);
		1090	#else
		1091	mpi->qscale =pic->qscale_table;
		1092	mpi->qstride=pic->qstride;
		1093	mpi->qscale_type= pic->qscale_type;
		1094	#endif
1083	mpi->pict_type=pic->pict_type;	1095	mpi->pict_type=pic->pict_type;
1084	mpi->fields = MP_IMGFIELD_ORDERED;	1096	mpi->fields = MP_IMGFIELD_ORDERED;
1085	if(pic->interlaced_frame) mpi->fields \|= MP_IMGFIELD_INTERLACED;	1097	if(pic->interlaced_frame) mpi->fields \|= MP_IMGFIELD_INTERLACED;

Return to bug 525070