virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a'

Browse Source 
* commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a':
  vc1_parser: Set field_order.
  mpegvideo_parser: Set field_order.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-03 12:58:52 +02:00
commit 9fd5e75bdf
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpegvideo_parser.c
View File

@ -118,6 +118,14 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
s->repeat_pict = 2;
}
}
if (!pc->progressive_sequence) {
if (top_field_first)
s->field_order = AV_FIELD_TT;
else
s->field_order = AV_FIELD_BB;
} else
s->field_order = AV_FIELD_PROGRESSIVE;
}
break;
}

5
libavcodec/vc1_parser.c
View File

@ -88,6 +88,11 @@ static void vc1_extract_headers(AVCodecParserContext *s, AVCodecContext *avctx,
}
}
if (vpc->v.broadcast && vpc->v.interlace && !vpc->v.psf)
s->field_order = vpc->v.tff ? AV_FIELD_TT : AV_FIELD_BB;
else
s->field_order = AV_FIELD_PROGRESSIVE;
break;
}
}