RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

video: remove things forgotten in previous commit 

Oops.
This commit is contained in:
wm4 2014-12-03 23:11:29 +01:00
parent 185e95ee3d
commit 44edb13443
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
video/mp_image.c
View File

@ -225,12 +225,6 @@ struct mp_image *mp_image_new_copy(struct mp_image *img)
return NULL; return NULL;
mp_image_copy(new, img); mp_image_copy(new, img);
mp_image_copy_attributes(new, img); mp_image_copy_attributes(new, img);
// Normally these are covered by the reference to the original image data
// (like the AVFrame in vd_lavc.c), but we can't manage it on our own.
new->qscale = NULL;
new->qstride = 0;
return new; return new;
} }
@ -363,7 +357,6 @@ void mp_image_copy_attributes(struct mp_image *dst, struct mp_image *src)
{ {
dst->pict_type = src->pict_type; dst->pict_type = src->pict_type;
dst->fields = src->fields; dst->fields = src->fields;
dst->qscale_type = src->qscale_type;
dst->pts = src->pts; dst->pts = src->pts;
dst->params.stereo_in = src->params.stereo_in; dst->params.stereo_in = src->params.stereo_in;
dst->params.stereo_out = src->params.stereo_out; dst->params.stereo_out = src->params.stereo_out;
@ -635,9 +628,6 @@ void mp_image_copy_fields_from_av_frame(struct mp_image *dst,
if (src->repeat_pict == 1) if (src->repeat_pict == 1)
dst->fields |= MP_IMGFIELD_REPEAT_FIRST; dst->fields |= MP_IMGFIELD_REPEAT_FIRST;
#if HAVE_AVUTIL_QP_API
dst->qscale = av_frame_get_qp_table(src, &dst->qstride, &dst->qscale_type);
#endif
} }
// Not strictly related, but was added in a similar timeframe. // Not strictly related, but was added in a similar timeframe.

3
video/mp_image.h
View File

@ -91,11 +91,8 @@ typedef struct mp_image {
uint8_t *planes[MP_MAX_PLANES]; uint8_t *planes[MP_MAX_PLANES];
int stride[MP_MAX_PLANES]; int stride[MP_MAX_PLANES];
char * qscale;
int qstride;
int pict_type; // 0->unknown, 1->I, 2->P, 3->B int pict_type; // 0->unknown, 1->I, 2->P, 3->B
int fields; int fields;
int qscale_type; // 0->mpeg1/4/h263, 1->mpeg2
/* redundant */ /* redundant */
int chroma_width; int chroma_width;

6
wscript
View File

@ -404,12 +404,6 @@ Libav libraries ({0}). Aborting.".format(" ".join(libav_pkg_config_checks))
'func': check_statement('libavcodec/avcodec.h', 'func': check_statement('libavcodec/avcodec.h',
'int x = AVCOL_SPC_BT2020_NCL', 'int x = AVCOL_SPC_BT2020_NCL',
use='libav') use='libav')
}, {
'name': 'avutil-qp-api',
'desc': 'libavutil QP API',
'func': check_statement('libavutil/frame.h',
'av_frame_get_qp_table(NULL, NULL, NULL)',
use='libav')
}, { }, {
'name': 'avcodec-vdpau-alloc-context', 'name': 'avcodec-vdpau-alloc-context',
'desc': 'libavcodec vdpau non-sense', 'desc': 'libavcodec vdpau non-sense',