summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2013-01-17 14:14:05 +0200
committerPetri Hintukainen <phintuka@users.sourceforge.net>2013-01-17 14:14:05 +0200
commitd341968faf9cfa917fa4a39173085ce687f96f3d (patch)
tree8555811149b66dedd300a81fb9ae33663d4bd26f /src
parent79fe3a7e9b9d4e22123a788d44458d17eaaeb36f (diff)
downloadxine-lib-d341968faf9cfa917fa4a39173085ce687f96f3d.tar.gz
xine-lib-d341968faf9cfa917fa4a39173085ce687f96f3d.tar.bz2
ffmpeg mpeg1/2: copy progressive and top_field_first flags
(merged from https://github.com/huceke/xine-lib-vaapi)
Diffstat (limited to 'src')
-rw-r--r--src/combined/ffmpeg/ff_video_decoder.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index c15e3cfd1..7d87a6b7b 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -1337,6 +1337,10 @@ static void ff_handle_mpeg12_buffer (ff_video_decoder_t *this, buf_element_t *bu
free_img = 0;
}
+ /* transfer some more frame settings for deinterlacing */
+ img->progressive_frame = !this->av_frame->interlaced_frame;
+ img->top_field_first = this->av_frame->top_field_first;
+
/* get back reordered pts */
img->pts = ff_untag_pts (this, this->av_frame->reordered_opaque);
ff_check_pts_tagging (this, this->av_frame->reordered_opaque);