diff options
| author | wm4 <wm4@nowhere> | 2015-04-23 22:06:14 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-04-23 22:06:14 +0200 |
| commit | 1419aac22aa4b1ce34ee7962822ae0d52fbf454c (patch) | |
| tree | 7b768bebc4fdde51ee0c8b3d8beb625e65eba817 | |
| parent | 994438dee5704c18d86671c62b8497457a3a00af (diff) | |
| download | mpv-1419aac22aa4b1ce34ee7962822ae0d52fbf454c.tar.bz2 mpv-1419aac22aa4b1ce34ee7962822ae0d52fbf454c.tar.xz | |
mp_image: remove some unused interlacing flags
MP_IMGFIELD_TOP/MP_IMGFIELD_BOTTOM were completely unused, and
MP_IMGFIELD_ORDERED was always set (even though vf_vdpaupp.c strangely
checked for the latter).
| -rw-r--r-- | video/filter/vf_vdpaupp.c | 4 | ||||
| -rw-r--r-- | video/mp_image.c | 3 | ||||
| -rw-r--r-- | video/mp_image.h | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/video/filter/vf_vdpaupp.c b/video/filter/vf_vdpaupp.c index 4db6ab9186..26c1eef5ca 100644 --- a/video/filter/vf_vdpaupp.c +++ b/video/filter/vf_vdpaupp.c @@ -92,9 +92,7 @@ static bool output_field(struct vf_instance *vf, int pos) frame->field = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME; if (p->opts.deint) { - int top_field_first = 1; - if (mpi->fields & MP_IMGFIELD_ORDERED) - top_field_first = !!(mpi->fields & MP_IMGFIELD_TOP_FIRST); + int top_field_first = !!(mpi->fields & MP_IMGFIELD_TOP_FIRST); frame->field = top_field_first ^ (pos & 1) ? VDP_VIDEO_MIXER_PICTURE_STRUCTURE_BOTTOM_FIELD: VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD; diff --git a/video/mp_image.c b/video/mp_image.c index e97ca1564b..dc305a4b63 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -625,14 +625,13 @@ void mp_image_copy_fields_from_av_frame(struct mp_image *dst, dst->pict_type = src->pict_type; - dst->fields = MP_IMGFIELD_ORDERED; + dst->fields = 0; if (src->interlaced_frame) dst->fields |= MP_IMGFIELD_INTERLACED; if (src->top_field_first) dst->fields |= MP_IMGFIELD_TOP_FIRST; if (src->repeat_pict == 1) dst->fields |= MP_IMGFIELD_REPEAT_FIRST; - } // Copy properties and data of the mp_image into the AVFrame, without taking diff --git a/video/mp_image.h b/video/mp_image.h index f2028c33e6..b0110c1376 100644 --- a/video/mp_image.h +++ b/video/mp_image.h @@ -30,11 +30,8 @@ #define MP_PALETTE_SIZE (256 * 4) -#define MP_IMGFIELD_ORDERED 0x01 #define MP_IMGFIELD_TOP_FIRST 0x02 #define MP_IMGFIELD_REPEAT_FIRST 0x04 -#define MP_IMGFIELD_TOP 0x08 -#define MP_IMGFIELD_BOTTOM 0x10 #define MP_IMGFIELD_INTERLACED 0x20 // Describes image parameters that usually stay constant. |