summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-03 23:11:29 +0100
committerwm4 <wm4@nowhere>2014-12-03 23:12:22 +0100
commit44edb134439efed7813fd0d985db54ca0eecd388 (patch)
treeef2903227058abeaa6a7e3307c3b0c7048ecd473 /video
parent185e95ee3d4436e03255759495d783a944e6dfbb (diff)
downloadmpv-44edb134439efed7813fd0d985db54ca0eecd388.tar.bz2
mpv-44edb134439efed7813fd0d985db54ca0eecd388.tar.xz
video: remove things forgotten in previous commit
Oops.
Diffstat (limited to 'video')
-rw-r--r--video/mp_image.c10
-rw-r--r--video/mp_image.h3
2 files changed, 0 insertions, 13 deletions
diff --git a/video/mp_image.c b/video/mp_image.c
index 440e3ff5dc..66a046c52f 100644
--- a/video/mp_image.c
+++ b/video/mp_image.c
@@ -225,12 +225,6 @@ struct mp_image *mp_image_new_copy(struct mp_image *img)
return NULL;
mp_image_copy(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;
}
@@ -363,7 +357,6 @@ void mp_image_copy_attributes(struct mp_image *dst, struct mp_image *src)
{
dst->pict_type = src->pict_type;
dst->fields = src->fields;
- dst->qscale_type = src->qscale_type;
dst->pts = src->pts;
dst->params.stereo_in = src->params.stereo_in;
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)
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.
diff --git a/video/mp_image.h b/video/mp_image.h
index 24e9b8d885..03d7e70c9b 100644
--- a/video/mp_image.h
+++ b/video/mp_image.h
@@ -91,11 +91,8 @@ typedef struct mp_image {
uint8_t *planes[MP_MAX_PLANES];
int stride[MP_MAX_PLANES];
- char * qscale;
- int qstride;
int pict_type; // 0->unknown, 1->I, 2->P, 3->B
int fields;
- int qscale_type; // 0->mpeg1/4/h263, 1->mpeg2
/* redundant */
int chroma_width;