aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2016-09-27 14:48:33 -0300
committerJames Almer <jamrial@gmail.com>2016-09-27 20:30:11 -0300
commit29b6c2be291eaa604a409daf7fd8cc4fb8a762cb (patch)
tree8c2bc1fcb6960de77917526739c89d2d970e8bed
parent8c83062acb222055a972bdf60b5add7f3c42b937 (diff)
downloadffmpeg-29b6c2be291eaa604a409daf7fd8cc4fb8a762cb.tar.gz
avformat/matroskadec: set AVCodecParameters.field_order on progressive video
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavformat/matroskadec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 7ee1c7aef4..32b24579e6 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2281,6 +2281,8 @@ static int matroska_parse_tracks(AVFormatContext *s)
if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED)
st->codecpar->field_order = mkv_field_order(track->video.field_order);
+ else if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_PROGRESSIVE)
+ st->codecpar->field_order = AV_FIELD_PROGRESSIVE;
if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB)
mkv_stereo_mode_display_mul(track->video.stereo_mode, &display_width_mul, &display_height_mul);